active-list 4.2.2 → 4.2.3

data/VERSION

@@ -1 +1 @@
-4.2.2
+4.2.3

data/lib/active-list/columns/action_column.rb

@@ -13,7 +13,7 @@ module ActiveList
   class ActionColumn < Column
 
     def header_code
-      "'ƒ'"
+      "''"
     end
 
 
@@ -47,7 +47,7 @@ module ActiveList
         cases = []
         for a in @options[:actions]
           v = a[1][:action].to_s.split('_')[-1]
-          cases << record+"."+@name.to_s+".to_s=="+a[0].inspect+"\nlink_to(::I18n.translate('labels.#{v}')"+
+          cases << record+"."+@name.to_s+".to_s=="+a[0].inspect+"\nlink_to(content_tag(:i) + h(::I18n.translate('labels.#{v}'))"+
             ", {"+(a[1][:controller] ? ':controller=>:'+a[1][:controller].to_s+', ' : '')+":action=>'"+a[1][:action].to_s+"', :id=>"+record+".id"+format+"}"+
             # ", {:id=>'"+@name.to_s+"_'+"+record+".id.to_s"+link_options+"}"+
             ", {:class=>'#{@name}'"+link_options+"}"+
@@ -64,7 +64,7 @@ module ActiveList
         url = "{"+url.collect{|k, v| ":#{k}=>"+(v.is_a?(String) ? v.gsub(/RECORD/, record) : v.inspect)}.join(", ")+format+"}"
         # code = "{:id=>'"+@name.to_s+"_'+"+record+".id.to_s"+link_options+"}"
         code = "{:class=>'#{@name}'"+link_options+"}"
-        code = "link_to(::I18n.translate('labels.#{action}'), "+url+", "+code+")"
+        code = "link_to(content_tag(:i) + h(::I18n.translate('labels.#{action}')), "+url+", "+code+")"
       end
       if @options[:if]
         code = "if (" + (@options[:if].is_a?(Symbol) ? "#{record}.#{@options[:if]}" : @options[:if].to_s.gsub('RECORD', record)) + ")\n" + code + "\n end" 

data/lib/active-list/renderers/simple_renderer.rb

@@ -251,15 +251,15 @@ module ActiveList
         last_page = "#{table.records_variable_name}_last"
 
         pagination << "<div class=\"pagination\">"
-        pagination << "<a href=\"#\" data-list-move-to-page=\"1\" class=\"first-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '>' + ::I18n.translate('list.pagination.first') + '</a>"
-        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} - 1).to_s + '\" class=\"previous-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '>' + ::I18n.translate('list.pagination.previous') + '</a>"
+        pagination << "<a href=\"#\" data-list-move-to-page=\"1\" class=\"first-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.first') + '</a>"
+        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} - 1).to_s + '\" class=\"previous-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.previous') + '</a>"
 
         x = '@@PAGE-NUMBER@@'
         y = '@@PAGE-COUNT@@'
         pagination << "<span class=\"paginator\">'+::I18n.translate('list.page_x_on_y', :default=>'%{x} / %{y}', :x => '#{x}', :y =>'#{y}').html_safe.gsub('#{x}', ('<input type=\"number\" size=\"4\" data-list-move-to-page=\"value\" value=\"'+#{table.records_variable_name}_page.to_s+'\">').html_safe).gsub('#{y}', #{table.records_variable_name}_last.to_s) + '</span>"
 
-        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} + 1).to_s + '\" class=\"next-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '>' + ::I18n.translate('list.pagination.next')+'</a>"
-        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{last_page}).to_s + '\" class=\"last-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '>' + ::I18n.translate('list.pagination.last')+'</a>"
+        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} + 1).to_s + '\" class=\"next-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.next')+'</a>"
+        pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{last_page}).to_s + '\" class=\"last-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.last')+'</a>"
 
         pagination << "<span class=\"separator\"></span>"
 

metadata

@@ -2,7 +2,7 @@
 name: active-list
 version: !ruby/object:Gem::Version
   version: !binary |-
-    NC4yLjI=
+    NC4yLjM=
   prerelease: 
 platform: ruby
 authors: