rails_admin 0.6.5 → 0.6.6

data/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss

@@ -25,3 +25,20 @@
     }
   }
 }
+/* span for disabled cells */
+.ui-timepicker-table td span {
+    width: auto;
+}
+/* anchors for clickable cells */
+.ui-timepicker-table td a {
+    width: auto;
+}
+.input-group {
+  .hasTimepicker {
+    @extend .form-control;
+    width: 65px !important;
+  }
+  .hasDatepicker {
+    @extend .form-control
+  }
+}

data/app/assets/stylesheets/rails_admin/rails_admin.scss.erb

@@ -48,7 +48,7 @@
 @import "rails_admin/custom/mixins";
 
 /*** Reset ***/
-@import "rails_admin/bootstrap/reset";
+<%# @import "rails_admin/bootstrap/reset"; %>
 /***  Libraries  ***/
 
 @import "rails_admin/aristo/jquery-ui-1.8.7.custom";
@@ -65,9 +65,10 @@
 
 /***  Bootstrap Theming  ***/
 
+@import "rails_admin/bootstrap/normalize";
 @import "rails_admin/bootstrap/scaffolding";
 @import "rails_admin/bootstrap/grid";
-@import "rails_admin/bootstrap/layouts";
+<%# @import "rails_admin/bootstrap/layouts"; %>
 @import "rails_admin/bootstrap/type";
 @import "rails_admin/bootstrap/forms";
 @import "rails_admin/bootstrap/tables";
@@ -77,6 +78,7 @@
 @import "rails_admin/bootstrap/close";
 @import "rails_admin/bootstrap/buttons";
 @import "rails_admin/bootstrap/button-groups";
+@import "rails_admin/bootstrap/input-groups";
 @import "rails_admin/bootstrap/alerts";
 @import "rails_admin/bootstrap/navs";
 @import "rails_admin/bootstrap/navbar";
@@ -87,12 +89,14 @@
 @import "rails_admin/bootstrap/tooltip";
 @import "rails_admin/bootstrap/popovers";
 @import "rails_admin/bootstrap/thumbnails";
-@import "rails_admin/bootstrap/labels-badges";
+@import "rails_admin/bootstrap/labels";
+@import "rails_admin/bootstrap/badges";
 @import "rails_admin/bootstrap/progress-bars";
-@import "rails_admin/bootstrap/accordion";
+<%# @import "rails_admin/bootstrap/accordion"; %>
 @import "rails_admin/bootstrap/carousel";
-@import "rails_admin/bootstrap/hero-unit";
+<%# @import "rails_admin/bootstrap/hero-unit"; %>
 @import "rails_admin/bootstrap/utilities";
+@import "rails_admin/bootstrap/responsive-utilities";
 
 /***  RailsAdmin Theming  ***/
 

data/app/helpers/rails_admin/application_helper.rb

@@ -19,8 +19,8 @@ module RailsAdmin
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)
       @action.custom_key == action.custom_key &&
-      abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&
-      (@object.try(:persisted?) ? @object.id == object.try(:id) : !object.try(:persisted?))
+        abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&
+        (@object.try(:persisted?) ? @object.id == object.try(:id) : !object.try(:persisted?))
     end
 
     def action(key, abstract_model = nil, object = nil)
@@ -48,7 +48,7 @@ module RailsAdmin
     end
 
     def logout_method
-      return Devise.sign_out_via if defined?(Devise)
+      return [Devise.sign_out_via].flatten.first if defined?(Devise)
       :delete
     end
 
@@ -70,13 +70,12 @@ module RailsAdmin
       node_model_names = nodes_stack.collect { |c| c.abstract_model.model_name }
 
       nodes_stack.group_by(&:navigation_label).collect do |navigation_label, nodes|
-
         nodes = nodes.select { |n| n.parent.nil? || !n.parent.to_s.in?(node_model_names) }
         li_stack = navigation nodes_stack, nodes
 
         label = navigation_label || t('admin.misc.navigation')
 
-        %(<li class='nav-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
+        %(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
       end.join.html_safe
     end
 
@@ -96,7 +95,6 @@ module RailsAdmin
         url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
-
         li = content_tag :li, 'data-model' => model_param do
           link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
@@ -109,21 +107,24 @@ module RailsAdmin
         (parent_actions ||= []) << action
       end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
 
-      content_tag(:ul, class: 'breadcrumb') do
+      content_tag(:ol, class: 'breadcrumb') do
         parent_actions.collect do |a|
           am = a.send(:eval, 'bindings[:abstract_model]')
           o = a.send(:eval, 'bindings[:object]')
           content_tag(:li, class: current_action?(a, am, o) && 'active') do
             crumb = begin
-              if a.http_methods.include?(:get)
-                link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
-                  wording_for(:breadcrumb, a, am, o)
+              if !current_action?(a, am, o)
+                if a.http_methods.include?(:get)
+                  link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
+                    wording_for(:breadcrumb, a, am, o)
+                  end
+                else
+                  content_tag(:span, wording_for(:breadcrumb, a, am, o))
                 end
               else
-                content_tag(:span, wording_for(:breadcrumb, a, am, o))
+                wording_for(:breadcrumb, a, am, o)
               end
             end
-            crumb += content_tag(:span, '/', class: 'divider') unless current_action?(a, am, o)
             crumb
           end
         end.reverse.join.html_safe
@@ -151,13 +152,13 @@ module RailsAdmin
       return '' if actions.empty?
       content_tag :li, class: 'dropdown', style: 'float:right' do
         content_tag(:a, class: 'dropdown-toggle', :'data-toggle' => 'dropdown', href: '#') { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
-        content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
-          actions.collect do |action|
-            content_tag :li do
-              link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
-            end
-          end.join.html_safe
-        end
+          content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
+            actions.collect do |action|
+              content_tag :li do
+                link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
+              end
+            end.join.html_safe
+          end
       end.html_safe
     end
   end

data/app/helpers/rails_admin/form_builder.rb

@@ -12,10 +12,10 @@ module RailsAdmin
         )
 
         object_infos +
-        visible_groups(options[:model_config], generator_action(options[:action], options[:nested_in])).collect do |fieldset|
-          fieldset_for fieldset, options[:nested_in]
-        end.join.html_safe +
-        (options[:nested_in] ? '' : @template.render(partial: 'rails_admin/main/submit_buttons'))
+          visible_groups(options[:model_config], generator_action(options[:action], options[:nested_in])).collect do |fieldset|
+            fieldset_for fieldset, options[:nested_in]
+          end.join.html_safe +
+          (options[:nested_in] ? '' : @template.render(partial: 'rails_admin/main/submit_buttons'))
       end
     end
 
@@ -34,8 +34,9 @@ module RailsAdmin
       if field.label
         # do not show nested field if the target is the origin
         unless nested_field_association?(field, nested_in)
-          @template.content_tag(:div, class: "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
-            label(field.method_name, capitalize_first_letter(field.label), class: 'control-label') + (field.nested_form ? field_for(field) : input_for(field))
+          @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
+            label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
+              (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       else
@@ -44,19 +45,21 @@ module RailsAdmin
     end
 
     def input_for(field)
-      @template.content_tag(:div, class: 'controls') do
+      css = 'col-sm-10 controls'
+      css += ' has-error' if field.errors.present?
+      @template.content_tag(:div, class: css) do
         field_for(field) +
-        errors_for(field) +
-        help_for(field)
+          errors_for(field) +
+          help_for(field)
       end
     end
 
     def errors_for(field)
-      field.errors.present? ? @template.content_tag(:span, field.errors.to_sentence, class: 'help-inline') : ''.html_safe
+      field.errors.present? ? @template.content_tag(:span, field.errors.to_sentence, class: 'help-inline text-danger') : ''.html_safe
     end
 
     def help_for(field)
-      field.help.present? ? @template.content_tag(:p, field.help, class: 'help-block') : ''.html_safe
+      field.help.present? ? @template.content_tag(:span, field.help, class: 'help-block') : ''.html_safe
     end
 
     def field_for(field)

data/app/views/kaminari/twitter-bootstrap/_paginator.html.haml

@@ -1,10 +1,9 @@
 = paginator.render do
-  .pagination
-    %ul
-      = prev_page_tag
-      - each_page do |page|
-        - if page.left_outer? or page.right_outer? or page.inside_window?
-          = page_tag page
-        - elsif !page.was_truncated?
-          = gap_tag
-      = next_page_tag
+  %ul.pagination
+    = prev_page_tag
+    - each_page do |page|
+      - if page.left_outer? or page.right_outer? or page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag

data/app/views/layouts/rails_admin/_navigation.html.haml

@@ -1,7 +1,7 @@
-.navbar-inner
-  .container-fluid
-    %a.brand.pjax{href: dashboard_path}
+.container-fluid
+  .navbar-header
+    %a.navbar-brand.pjax{href: dashboard_path}
       = _get_plugin_name[0] || 'Rails'
       %small= _get_plugin_name[1] || 'Admin'
-    .nav-collapse
-      = render partial: 'layouts/rails_admin/secondary_navigation'
+  .collapse.navbar-collapse
+    = render partial: 'layouts/rails_admin/secondary_navigation'

data/app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -1,4 +1,4 @@
-%ul.nav.pull-right.root_links
+%ul.nav.navbar-nav.navbar-right.root_links
   - actions(:root).each do |action|
     %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: "pjax"
   - if main_app_root_path = (main_app.root_path rescue false)

data/app/views/layouts/rails_admin/application.html.haml

@@ -1,6 +1,7 @@
 !!! 5
 %html
   %head
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
     %meta{content: "NONE,NOARCHIVE", name: "robots"}
     = csrf_meta_tag
@@ -11,14 +12,14 @@
       RailsAdmin.I18n.init(JSON.parse("#{j I18n.t("admin.js").to_json}"))
   %body.rails_admin
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
-    .navbar.navbar-fixed-top
+    %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"
     .container-fluid
-      .row-fluid
-        .span3
-          .well.sidebar-nav
-            %ul.nav.nav-list= main_navigation
-            %ul.nav.nav-list= static_navigation
-        .span9
-          .row-fluid
+      .row
+        .col-sm-3.col-md-2.reset-left
+          .sidebar-nav
+            %ul.nav.nav-pills.nav-stacked= main_navigation
+            %ul.nav.nav-pills.nav-stacked= static_navigation
+        .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
+          .row
             .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

data/app/views/layouts/rails_admin/pjax.html.haml

@@ -1,13 +1,14 @@
 :javascript
-  $('.nav.nav-list li.active').removeClass('active');
-  $('.nav.nav-list li[data-model="#{@abstract_model.to_param}"]').addClass('active');
+  $('.nav.nav-pills li.active').removeClass('active');
+  $('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
 
 %title= "#{@abstract_model.try(:pretty_name) || @page_name} | #{[_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' ')}"
 .page-header
   %h1= @page_name
 - flash && flash.each do |key, value|
+  - key = 'danger' if key.to_s == 'error'
   .alert{class: "alert-#{key}"}
-    %a.close{href: '#', :'data-dismiss' => "alert"}×
+    %a.close{href: '#', :'data-dismiss' => "alert"} ×
     = value
 = breadcrumb
 %ul.nav.nav-tabs

data/app/views/rails_admin/main/_form_datetime.html.haml

@@ -1 +1,2 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value }).reverse_merge({ data: { datetimepicker: true, options: field.js_plugin_options.to_json } })
+.input-group
+  = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value }).reverse_merge({ data: { datetimepicker: true, options: field.js_plugin_options.to_json } })

data/app/views/rails_admin/main/_form_field.html.haml

@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1'])})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control'})

data/app/views/rails_admin/main/_form_text.html.haml

@@ -1 +1 @@
-= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control' })

data/app/views/rails_admin/main/_submit_buttons.html.haml

@@ -1,4 +1,5 @@
 %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
+%br
 .form-actions
   %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
     %i.icon-white.icon-ok

data/app/views/rails_admin/main/dashboard.html.haml

@@ -24,7 +24,7 @@
               - count = @count[abstract_model.pretty_name]
               - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1
               .progress{style: "margin-bottom:0px", class: "progress-#{get_indicator(percent)} #{active && 'active progress-striped'}"  }
-                .bar.animate-width-to{:'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
+                .progress-bar.animate-width-to{:class => "progress-bar-#{get_indicator(percent)}", :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
                   = @count[abstract_model.pretty_name]
             %td.links
               %ul.inline= menu_for :collection, abstract_model, nil, true

data/app/views/rails_admin/main/export.html.haml

@@ -5,17 +5,18 @@
 
   %input{name: "send_data", type: "hidden", value: "true"}/
   %fieldset{id: 'fields_to_export'}
-    %div.control-group
-      %div.controls
-        %label.checkbox{for: 'check_all'}
-          = t('admin.export.select_all_fields')
-          = check_box_tag 'all', 'all', true, { id: 'check_all' }
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
     .control-group
-      %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
       .controls
+        .col-sm-2
+        %label.col-sm-10.checkbox{for: 'check_all'}
+          = check_box_tag 'all', 'all', true, { id: 'check_all' }
+          = t('admin.export.select_all_fields')
+    .control-group
+      %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
+      .col-sm-10.controls
         - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
           - list = field.virtual? ? 'methods' : 'only'
           - if field.association? && field.association.polymorphic?
@@ -34,8 +35,8 @@
     - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
       - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
       .control-group
-        %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
-        .controls
+        %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
+        .col-sm-10.controls
           - fields.each do |associated_model_field|
             - list = associated_model_field.virtual? ? 'methods' : 'only'
             %label.checkbox{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
@@ -48,24 +49,26 @@
       = t('admin.export.options_for', name: 'csv')
     .control-group
       - guessed_encoding = @abstract_model.encoding
-      %label.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
-      .controls
+      %label.col-sm-2.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
+      .col-sm-10.controls
         -# from http://books.google.com/support/partner/bin/answer.py?answer=30990 :
-        = select_tag 'csv_options[encoding_to]', options_for_select(["", "UTF-8", "UTF-16LE", "UTF-16BE", "UTF-32LE", "UTF-32BE", "UTF-7", "ISO-8859-1", "ISO-8859-15", "IBM-850", "MacRoman", "Windows-1252", "ISO-8859-3", "IBM-852", "ISO-8859-2", "MacCE", "Windows-1250", "IBM-855", "ISO-8859-5", "ISO-IR-111", "KOI8-R", "MacCyrillic", "Windows-1251", "CP-866", "KOI-U", "MacUkranian", "GB2312", "GBK", "GB18030", "HZ", "ISO-2022-CN", "Big5", "Big5-HKSCS", "EUC-TW", "EUC-JP", "ISO-2022-JP", "Shift_JIS", "EUC-KR", "UHC", "JOHAB", "ISO-2022-KR"])
+        = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
     .control-group
-      %label.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
-      .controls
-        = check_box_tag 'csv_options[skip_header]', 'true'
+      %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
+      .col-sm-10.controls
+        %label.checkbox
+          = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
     .control-group
-      %label.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
-      .controls
+      %label.col-sm-2.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
+      .col-sm-10.controls
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
         %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
 
+  %br
   .form-actions
     %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
     %button.btn.btn-primary{type: "submit", name: 'csv'}

data/app/views/rails_admin/main/index.html.haml

@@ -96,10 +96,12 @@
     .well
       %span#filters_box
       %hr.filters_box{style: "display:#{@ordered_filters.empty? ? 'none' : 'block'}"}
-      %input.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
-      %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
-        %i.icon-white.icon-refresh
-        = t("admin.misc.refresh")
+      .input-group
+        %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
+        %span.input-group-btn
+          %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+            %i.icon-white.icon-refresh
+            = t("admin.misc.refresh")
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
 
@@ -108,7 +110,7 @@
       - @model_config.list.scopes.each_with_index do |scope, index|
         - scope = '_all' if scope.nil?
         %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
-          %a{href: index_path(params.merge(scope: scope, page: nil))}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
+          %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
 
   = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
     = hidden_field_tag :bulk_action
@@ -146,8 +148,10 @@
               %ul.inline= menu_for :member, @abstract_model, object, true
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
-      = paginate(@objects, theme: 'twitter-bootstrap', remote: true)
-      = link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
+      .row
+        .col-md-6= paginate(@objects, theme: 'twitter-bootstrap', remote: true)
+      .row
+        .col-md-6= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"
     - else
       .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"