blocks 1.2.0 → 1.2.1

data/app/views/blocks/_table.html.erb

@@ -24,7 +24,14 @@
 
 <%= table.define :header_columns do |options| %>
   <% table.columns.each do |column| %>
-    <%= content_tag :th, options.merge(column.options)[:header_html] do %>
+    <% header_html = options.merge(column.options)[:header_html] %>
+    <% if options.merge(column.options)[:sortable] %>
+      <% sort_class = params[:order] != column.options[:order].to_s ? "sorting" : (params[:sort_mode] == "desc" ? "sorting_desc" : "sorting_asc") %>  
+      <% header_html[:class] ||= "" %>
+      <% header_html[:class] += " #{sort_class}" %>
+    <% end %>
+    
+    <%= content_tag :th, header_html do %>
       <%= table.use "#{column.name.to_s}_header", options.merge(column.options) %>
     <% end %>
   <% end %>
@@ -47,11 +54,11 @@
 <%= table.define :header_sortable_link do |options| %>
   <% label = (options[:label] ? options[:label] : options[:column].name.to_s.titleize) %>
   <% sort_mode = ((params[:order] != options[:order].to_s or params[:sort_mode] == "desc") ? "asc" : "desc") %>
-  <% ui_icon = sort_mode == "desc" ? "ui-icon-triangle-1-s" : "ui-icon-triangle-1-n" %>
   <% parameters = params.merge({:order => (options[:order] ? options[:order] : options[:column].name), :sort_mode => sort_mode}) %>
+  <% parameters.delete(:action); parameters.delete(:controller) %>
+  <% url = options[:sort_url] ? options[:sort_url] : "" %>
 
-  <%= link_to label, parameters %>
-  <span class="ui-icon <%= ui_icon %>" style="display:<%= params[:order] == options[:order].to_s ? "inline-block" : "none" %>; float:none"></span>
+  <%= link_to label, "#{url}?#{parameters.to_query}" %>
 <% end %>
 
 <%= table.define :tbody do %>

metadata

@@ -2,7 +2,7 @@
 name: blocks
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Andrew Hunter