active_list 6.0.1 → 6.1.0

data/lib/active_list.rb

@@ -3,11 +3,10 @@ require 'action_dispatch'
 require 'rails'
 # require 'compass-rails'
 require 'code_string'
+require 'i18n-complements'
 
 module ActiveList
 
-  CSV = ::CSV
-
   # Build and returns a short UID
   def self.new_uid
     @@last_uid ||= 0
@@ -22,7 +21,6 @@ module ActiveList
   autoload :Renderers,  'active_list/renderers'
   autoload :Exporters,  'active_list/exporters'
   autoload :Generator,  'active_list/generator'
-  autoload :ActionPack, 'active_list/action_pack'
 
   mattr_reader :renderers
   @@renderers = {}
@@ -58,4 +56,4 @@ unless "string".respond_to? :dig
 end
 
 
-require 'active_list/rails/engine'
+require 'active_list/rails'

data/lib/active_list/definition/action_column.rb

@@ -6,25 +6,68 @@ module ActiveList
     class ActionColumn < AbstractColumn
       include ActiveList::Helpers
 
+      USE_MODES = [:none, :single, :many, :both]
+
+      def initialize(table, name, options = {})
+        super(table, name, options)
+        @use_mode = (@options.delete(:on) || :single).to_sym
+        unless USE_MODES.include?(@use_mode)
+          raise "Invalid use mode: #{@use_mode.inspect}"
+        end
+        if @name.to_s == "destroy" and !@options.has_key?(:method)
+          @options[:method] = :delete 
+        end
+        if @name.to_s == "destroy" and !@options.has_key?(:confirm)
+          @options[:confirm] ||= :are_you_sure_you_want_to_delete 
+        end
+        @options[:if] ||= :destroyable? if @name.to_s == "destroy"
+        @options[:if] ||= :editable?    if @name.to_s == "edit"
+        @options[:confirm] = :are_you_sure if @options[:confirm].is_a?(TrueClass)
+      end
+
+      def use_single?
+        @use_mode == :single or @use_mode == :both
+      end
+
+      def use_many?
+        @use_mode == :many or @use_mode == :both
+      end
+
+      def use_none?
+        @use_mode == :none
+      end
+
+      def global?
+        self.use_none? or self.use_many?
+      end
+
       def header_code
         "''".c
       end
 
+      def default_url(use_mode = :many)
+        url = @options[:url] ||= {}
+        url[:controller] ||= (@options[:controller] || table.model.name.tableize)
+        url[:action] ||= @name.to_s
+        if @options.has_key? :format
+          url[:format] = @options[:format]
+        end
+        if use_many? and use_mode == :many
+          url[:id] ||= "##IDS##"
+        end
+        return url
+      end
+
       def operation(record = 'record_of_the_death')
-        @options[:method] = :delete if @name.to_s == "destroy" and !@options.has_key?(:method)
-        @options[:confirm] ||= :are_you_sure_you_want_to_delete if @name.to_s == "destroy" and !@options.has_key?(:confirm)
-        @options[:if] ||= :destroyable? if @name.to_s == "destroy"
-        @options[:if] ||= :editable? if @name.to_s == "edit"
-        @options[:confirm] = :are_you_sure if @options[:confirm].is_a?(TrueClass)
         link_options = ""
         if @options[:confirm]
           link_options << ", 'data-confirm' => #{(@options[:confirm]).inspect}.t(scope: 'labels')"
         end
-        if @options['data-method'] or @options[:method]
-          link_options << ", :method => h('#{(@options['data-method']||@options[:method])}')"
+        if @options[:method]
+          link_options << ", method: :#{@options[:method].to_s.underscore}"
         end
         action = @name
-        format = @options[:format] ? ", :format => '#{@options[:format]}'" : ""
+        format = @options[:format] ? ", format: '#{@options[:format]}'" : ""
         if @options[:remote]
           raise StandardError, "Sure to use :remote ?"
           # remote_options = @options.dup
@@ -39,6 +82,9 @@ module ActiveList
           # code += ", {title: #{action.inspect}.tl}"
           # code += ")"
         elsif @options[:actions]
+          unless use_single?
+            raise StandardError, "Only compatible with single actions"
+          end
           unless @options[:actions].is_a? Hash
             raise StandardError, "options[:actions] have to be a Hash."
           end
@@ -58,8 +104,8 @@ module ActiveList
           url[:id] ||= "RECORD.id".c
           url.delete_if{|k, v| v.nil?}
           url = "{" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ")+format+"}"
-          code = "{class: '#{@name}'"+link_options+"}"
-          code = "link_to(content_tag(:i) + h('#{action}'.t(scope: 'labels')), "+url+", "+code+")"
+          code = "{class: '#{@name}'" + link_options+"}"
+          code = "link_to(content_tag(:i) + h(' ' + '#{action}'.t(scope: 'labels')), " + url + ", " + code + ")"
         end
         if @options[:if]
           code = "if " + recordify!(@options[:if], record) + "\n" + code.dig + "end"

data/lib/active_list/definition/table.rb

@@ -13,6 +13,7 @@ module ActiveList
         @options[:renderer] ||= :simple_renderer
         @options[:per_page] = 20 if @options[:per_page].to_i <= 0
         @options[:page] = 1 if @options[:page].to_i <= 0
+        @selector = @options.delete(:selector)
         @columns = []
         @id = ActiveList.new_uid
       end
@@ -44,6 +45,22 @@ module ActiveList
         @paginate
       end
 
+      def has_many_records_action?
+        many_records_action_columns.any?
+      end
+
+      def many_records_action_columns
+        action_columns.select(&:use_many?)
+      end
+
+      def global_action_columns
+        action_columns.select(&:global?)
+      end
+
+      def selectable?
+        @selector
+      end
+
       # Retrieves all columns in database
       def table_columns
         cols = self.model_columns.map(&:name)
@@ -54,6 +71,10 @@ module ActiveList
         @columns.select{|c| c.is_a? DataColumn}
       end
 
+      def action_columns
+        @columns.select{|c| c.is_a? ActionColumn}
+      end
+
       def hidden_columns
         self.data_columns.select(&:hidden?)
       end

data/lib/active_list/exporters/csv_exporter.rb

@@ -15,13 +15,13 @@ module ActiveList
       def send_data_code
         record = "r"
         code  = generator.select_data_code(paginate: false)
-        code << "data = ActiveList::CSV.generate do |csv|\n"
+        code << "data = ::CSV.generate do |csv|\n"
         code << "  csv << [#{columns_to_array(:header).join(', ')}]\n"
         code << "  for #{record} in #{generator.records_variable_name}\n"
         code << "    csv << [#{columns_to_array(:body, record: record).join(', ')}]\n"
         code << "  end\n"
         code << "end\n"
-        code << "send_data(data, type: #{self.mime_type.to_s.inspect}, disposition: 'inline', filename: #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i,'_') + '.#{self.file_extension}')\n"
+        code << "send_data(data, type: #{self.mime_type.to_s.inspect}, disposition: 'inline', filename: #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i, '_') + '.#{self.file_extension}')\n"
         return code.c
       end
 

data/lib/active_list/exporters/excel_csv_exporter.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Register XCSV format unless is already set
 Mime::Type.register("text/csv", :xcsv) unless defined? Mime::XCSV
 
@@ -21,7 +19,7 @@ module ActiveList
         record = "r"
         code  = generator.select_data_code(paginate: false)
         encoding = "CP1252"
-        code << "data = ActiveList::CSV.generate(:col_sep => ';') do |csv|\n"
+        code << "data = ::CSV.generate(col_sep: ';') do |csv|\n"
         code << "  csv << [#{columns_to_array(:header, encoding: encoding).join(', ')}]\n"
         code << "  for #{record} in #{generator.records_variable_name}\n"
         code << "    csv << [#{columns_to_array(:body, record: record, encoding: encoding).join(', ')}]\n"

data/lib/active_list/rails.rb

@@ -0,0 +1,2 @@
+require 'active_list/rails/integration'
+require 'active_list/rails/engine'

data/lib/active_list/rails/engine.rb

@@ -1,13 +1,15 @@
 module ActiveList
   module Rails
+
     class Engine < ::Rails::Engine
       engine_name "active_list"
       initializer "active_list.integrate_methods" do |app|
-        ::ActionController::Base.send(:include, ActiveList::ActionPack::ActionController)
-        ::ActionView::Base.send(:include, ActiveList::ActionPack::ViewsHelper)
+        ::ActionController::Base.send(:include, ActiveList::Rails::Integration::ActionController)
+        ::ActionView::Base.send(:include, ActiveList::Rails::Integration::ViewsHelper)
         files = Dir[File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "*.yml")]
         ::I18n.load_path.concat(files)
       end
     end
+
   end
 end

data/lib/active_list/rails/integration.rb

@@ -0,0 +1,46 @@
+module ActiveList
+  module Rails
+    module Integration
+
+      module ActionController
+
+        def self.included(base) #:nodoc:
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+
+          # Permits to define and generate methods to manage dynamic
+          # table ActiveList
+          def list(*args, &block)
+            options = args.extract_options!
+            options[:controller] = self
+            args << options
+            generator = ActiveList::Generator.new(*args, &block)
+            class_eval(generator.controller_method_code, __FILE__, __LINE__)
+            ActionView::Base.send(:class_eval, generator.view_method_code, __FILE__, __LINE__)
+          end
+
+        end
+
+      end
+
+      module ViewsHelper
+
+        # Calls the generated view helper
+        def list(*args, &block)
+          options = args.extract_options!
+          name = args.shift
+          kontroller = self.controller.class
+          begin
+            helper_method = "_#{kontroller.controller_name}_#{__method__}_#{name || kontroller.controller_name}_tag".to_sym
+            kontroller = kontroller.superclass
+          end until self.respond_to?(helper_method)
+          return self.send(helper_method, &block)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/active_list/renderers/simple_renderer.rb

@@ -75,25 +75,27 @@ module ActiveList
         code << "end\n"
 
         code << "#{var_name(:tbody)} << '</tbody>'\n"
-        code << "return #{var_name(:tbody)}.html_safe if options[:only] == 'body' or options[:only] == 'tbody'\n"
-
-        code << "html = ''\n"
-        code << "html << '<div id=\"#{table.name}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" class=\"active-list\""
+        code << "return #{var_name(:tbody)}.html_safe if options[:only] == 'table-body'\n"
+        
+        # Build content
+        code << "#{var_name(:content)} = ''\n"
+        code << "#{var_name(:content)} << #{extras}\n" unless extras.blank?
+        code << "#{var_name(:content)} << '<table class=\"list\""
         if table.paginate?
           code << " data-list-current-page=\"' + #{var_name(:page)}.to_s + '\" data-list-page-size=\"' + #{var_name(:limit)}.to_s + '\""
         end
         code << " data-list-sort-by=\"' + #{var_name(:params)}[:sort].to_s + '\" data-list-sort-dir=\"' + #{var_name(:params)}[:dir].to_s + '\""
         code << ">'\n"
-        code << "html << '<table class=\"list\">'\n"
-        code << "html << (#{header})\n"
+        code << "#{var_name(:content)} << (#{header})\n"
         code << "if block_given?\n"
-        code << "  html << '<tfoot>' + capture(" + table.columns.collect{|c| {name: c.name, id: c.id}}.inspect + ", &block).to_s + '</tfoot>'\n"
+        code << "  #{var_name(:content)} << '<tfoot>' + capture(" + table.columns.collect{|c| {name: c.name, id: c.id}}.inspect + ", &block).to_s + '</tfoot>'\n"
         code << "end\n"
-        code << "html << #{var_name(:tbody)}\n"
-        code << "html << '</table>'\n"
-        code << "html << #{extras}\n" if extras
-        code << "html << '</div>'\n"
-        code << "return html.html_safe\n"
+        code << "#{var_name(:content)} << #{var_name(:tbody)}\n"
+        code << "#{var_name(:content)} << '</table>'\n"
+        code << "return #{var_name(:content)}.html_safe if options[:only] == 'content'\n"
+
+        # Build whole
+        code << "return ('<div id=\"#{table.name}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
         return code
       end
 
@@ -104,10 +106,16 @@ module ActiveList
         unless [:body, :children].include?(nature)
           raise ArgumentError, "Nature is invalid"
         end
+        record = options[:record] || 'record_of_the_death'
+        if table.selectable?
+          code << "content_tag(:td, class: 'list-selector') do\n"
+          code << "  tag(:input, type: 'checkbox', value: #{record}.id, data: {list_selector: #{record}.id})\n"
+          code << "end +\n"
+        end
+
         children_mode = !!(nature == :children)
         for column in table.columns
           value_code = ""
-          record = options[:record] || 'record_of_the_death'
           if column.is_a? ActiveList::Definition::EmptyColumn
             value_code = 'nil'
           elsif column.is_a? ActiveList::Definition::StatusColumn
@@ -187,6 +195,7 @@ module ActiveList
             form_name = column.form_name || "'#{table.name}[' + #{record}.id.to_s + '][#{column.name}]'".c
             value_code = (nature == :body ? "text_field_tag(#{form_name.inspect}, #{recordify!(column.options[:value] || column.name, record)}#{column.options[:size] ? ', size: ' + column.options[:size].to_s : ''})" : "nil") # , id: '#{table.name}_'+#{record}.id.to_s + '_#{column.name}'
           elsif column.is_a?(ActiveList::Definition::ActionColumn)
+            next unless column.use_single?
             value_code = (nature == :body ? column.operation(record) : "nil")
           else
             value_code = "'&#160;&#8709;&#160;'.html_safe"
@@ -201,15 +210,16 @@ module ActiveList
         #   code << "content_tag(:td)"
         # end
 
-        code << "content_tag(:td)"
+        code << "''.html_safe"
+        # code << "content_tag(:td)"
         return code.c
       end
 
 
       # Produces main menu code
       def menu_code
-        menu = "<div class=\"list-menu\">"
-        menu << "<a class=\"list-menu-start\"><span class=\"icon\"></span><span class=\"text\">' + h(::I18n.translate('list.menu').gsub(/\'/,'&#39;')) + '</span></a>"
+        menu = "<span class=\"settings\">"
+        menu << "<a class=\"settings-start\"><i></i>' + h('list.menu'.t) + '</a>"
         menu << "<ul>"
         if table.paginate?
           # Per page
@@ -217,18 +227,18 @@ module ActiveList
           list << table.options[:per_page].to_i if table.options[:per_page].to_i > 0
           list = list.uniq.sort
           menu << "<li class=\"parent\">"
-          menu << "<a class=\"pages\"><span class=\"icon\"></span><span class=\"text\">' + ::I18n.translate('list.items_per_page').gsub(/\'/,'&#39;') + '</span></a><ul>"
+          menu << "<a class=\"pages\"><i></i>' + h('list.items_per_page'.t) + '</a><ul>"
           for n in list
-            menu << "<li data-list-change-page-size=\"#{n}\" '+(#{var_name(:params)}[:per_page] == #{n} ? ' class=\"check\"' : '')+'><a><span class=\"icon\"></span><span class=\"text\">'+h(::I18n.translate('list.x_per_page', :count => #{n}))+'</span></a></li>"
+            menu << "<li data-list-change-page-size=\"#{n}\" '+(#{var_name(:params)}[:per_page] == #{n} ? ' class=\"check\"' : '') + '><a><i></i>' + h('list.x_per_page'.t(count: #{n})) + '</a></li>"
           end
           menu << "</ul></li>"
         end
 
         # Column selector
         menu << "<li class=\"parent\">"
-        menu << "<a class=\"columns\"><span class=\"icon\"></span><span class=\"text\">' + ::I18n.translate('list.columns').gsub(/\'/,'&#39;') + '</span></a><ul>"
+        menu << "<a class=\"columns\"><i></i>' + h('list.columns'.t) + '</a><ul>"
         for column in table.data_columns
-          menu << "<li data-list-toggle-column=\"#{column.name}\" class=\"'+(#{var_name(:params)}[:hidden_columns].include?(:#{column.name}) ? 'unchecked' : 'checked')+'\"><a><span class=\"icon\"></span><span class=\"text\">'+h(#{column.header_code})+'</span></a></li>"
+          menu << "<li data-list-toggle-column=\"#{column.name}\" class=\"' + (#{var_name(:params)}[:hidden_columns].include?(:#{column.name}) ? 'unchecked' : 'checked') + '\"><a><i></i>' + h(#{column.header_code}) + '</a></li>"
         end
         menu << "</ul></li>"
 
@@ -236,9 +246,9 @@ module ActiveList
         menu << "<li class=\"separator\"></li>"
         # Exports
         for format, exporter in ActiveList.exporters
-          menu << "<li class=\"export #{exporter.name}\">' + link_to(params.merge(:action => :#{generator.controller_method_name}, :sort => #{var_name(:params)}[:sort], :dir => #{var_name(:params)}[:dir], :format => '#{format}')) { '<span class=\"icon\"></span>'.html_safe + content_tag('span', ::I18n.translate('list.export_as', :exported => ::I18n.translate('list.export.formats.#{format}')).gsub(/\'/,'&#39;'), :class => 'text')} + '</li>"
+          menu << "<li class=\"export export-#{format}\">' + link_to(content_tag(:i) + h('list.export_as'.t(exported: :#{format}.t(scope: 'list.export.formats'))), params.merge(action: :#{generator.controller_method_name}, sort: #{var_name(:params)}[:sort], dir: #{var_name(:params)}[:dir], format: '#{format}')) + '</li>"
         end
-        menu << "</ul></div>"
+        menu << "</ul></span>"
         return menu
       end
 
@@ -246,46 +256,71 @@ module ActiveList
       # and pagination management
       def header_code
         code = "'<thead><tr>"
+        if table.selectable?
+          code << "<th class=\"list-selector\"></th>"
+        end
         for column in table.columns
+          next if column.is_a?(ActiveList::Definition::ActionColumn) and !column.use_single?
           code << "<th data-list-column=\"#{column.sort_id}\""
           code << " data-list-column-cells=\"#{column.short_id}\""
           code << " data-list-column-sort=\"'+(#{var_name(:params)}[:sort] != '#{column.sort_id}' ? 'asc' : #{var_name(:params)}[:dir] == 'asc' ? 'desc' : 'asc')+'\"" if column.sortable?
           code << " class=\"#{column_classes(column, true, true)}\""
           code << ">"
-          code << "<span class=\"text\">'+h(#{column.header_code})+'</span>"
-          code << "<span class=\"icon\"></span>"
+          code << "' + h(#{column.header_code}) + '"
+          code << "<i></i>"
           code << "</th>"
         end
-        code << "<th class=\"spe\">#{menu_code}</th>"
+        # code << "<th class=\"spe\">#{menu_code}</th>"
         code << "</tr></thead>'"
         return code
       end
 
       # Produces the code to create bottom menu and pagination
       def extras_code
-        code, pagination = nil, ''
+        code = []
+
+        if table.global_action_columns.any?
+          actioner = ""
+          actioner << "<span class=\"actioner\">'"
+          for column in table.global_action_columns
+            actioner << " + link_to(content_tag(:i) + h(' ' + :#{column.name.to_s}.t(scope: 'labels')), #{column.default_url.inspect}, class: 'btn btn-#{column.name}'#{', style: "display: none"' unless column.use_none?}#{', method: "' + column.options[:method].to_s + '"' if column.options[:method]}, data: {list_actioner: :#{column.use_none? ? 'none' : 'many'}#{', confirm: :' + column.options[:confirm].to_s + '.t(scope: "labels")' if column.options[:confirm]}})"
+          end
+          actioner << " + '</span>"
+          code << "'#{actioner}'"
+        end
+
+        code << "'#{menu_code}'"
 
         if table.paginate?
+          pagination = ""
           current_page = "#{var_name(:page)}"
           last_page = "#{var_name(:last)}"
 
-          pagination << "<div class=\"pagination\">"
-          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>"
+          pagination << "<span class=\"pagination\">"
+          pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + 1), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
+
+          pagination << "<span class=\"paginator\">"
+
+          pagination << "<a href=\"#\" data-list-move-to-page=\"1\" class=\"btn 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=\"btn 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=\"'+#{var_name(:page)}.to_s+'\">').html_safe).gsub('#{y}', #{var_name(:last)}.to_s) + '</span>"
+          # 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=\"'+#{var_name(:page)}.to_s+'\">').html_safe).gsub('#{y}', #{var_name(:last)}.to_s) + '</span>"
+          # pagination << "<input type=\"number\" size=\"4\" data-list-move-to-page=\"value\" value=\"' + #{var_name(:page)}.to_s + '\">"
+
+          pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} + 1).to_s + '\" class=\"btn 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=\"btn last-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.last')+'</a>"
+          pagination << "</span>"
 
-          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>"
 
-          pagination << "<span class=\"separator\"></span>"
 
-          pagination << "<span class=\"status\">'+::I18n.translate('list.pagination.showing_x_to_y_of_total', :x => (#{var_name(:offset)} + 1), :y => ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)}+#{var_name(:limit)}), :total => #{var_name(:count)})+'</span>"
-          pagination << "</div>"
+          code << "'#{pagination}'"
+        end
 
-          code = "(#{var_name(:last)} > 1 ? '<div class=\"extras\">#{pagination}</div>' : '').html_safe"
+        unless code.empty?
+          code = "content_tag(:div, (#{code.join(' + ')}).html_safe, class: 'list-control')"
         end
 
         return code