Permalink
Browse files

Merge branch 'master' of github.com:bogdan/datagrid

  • Loading branch information...
bogdan committed Jan 29, 2013
2 parents 743b63c + aa3147c commit 2b74101c8bf04a259da7ce42ad1e79f2ad06e64a
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/datagrid/renderer.rb
View
@@ -74,11 +74,11 @@ def rows(grid, assets, options = {})
def order_for(grid, column)
@template.content_tag(:div, :class => "order") do
@template.link_to(
- I18n.t("datagrid.table.order.asc", :default => "↑".html_safe),
+ I18n.t("datagrid.table.order.asc", :default => "↑".html_safe).html_safe,
@template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => false)),
:class => "order asc"
) + " " + @template.link_to(
- I18n.t("datagrid.table.order.desc", :default => "↓".html_safe),
+ I18n.t("datagrid.table.order.desc", :default => "↓".html_safe).html_safe,
@template.url_for(grid.param_name => grid.attributes.merge(:order => column.name, :descending => true )),
:class => "order desc"
)

0 comments on commit 2b74101

Please sign in to comment.