rails_admin 0.7.0 → 0.8.1

data/app/assets/javascripts/rails_admin/rails_admin.js

@@ -4,9 +4,8 @@
 //=  require 'jquery-ui/effect'
 //=  require 'jquery-ui/sortable'
 //=  require 'jquery-ui/autocomplete'
-//=  require 'jquery-ui/datepicker'
-//=  require 'rails_admin/jquery.ui.timepicker'
-//=  require 'rails_admin/ra.datetimepicker'
+//=  require 'rails_admin/moment-with-locales'
+//=  require 'rails_admin/bootstrap-datetimepicker'
 //=  require 'rails_admin/jquery.colorpicker'
 //=  require 'rails_admin/ra.filter-box'
 //=  require 'rails_admin/ra.filtering-multiselect'

data/app/assets/stylesheets/rails_admin/base/theming.scss

@@ -8,7 +8,7 @@ $avatar-size: 30px;
 body.rails_admin {
 
   .thumbnail {
-    display:inline-block;
+    display: inline-block;
   }
 
   /* room for upper navbar */
@@ -58,6 +58,10 @@ body.rails_admin {
     }
   }
 
+  label.input-group-addon {
+    cursor: pointer;
+  }
+
   /* fat labels in forms */
   .label.form-label {
     padding: 7px 7px 8px 7px;
@@ -127,11 +131,6 @@ body.rails_admin {
       display:block;
     }
 
-    /* Put form controls above siblings to make them accessible */
-    .controls {
-      z-index: 1;
-    }
-
     /* nested forms */
     .tab-content {
       clear: both;
@@ -336,7 +335,7 @@ body.rails_admin {
       position: fixed;
       top: $navbar-height;
       bottom: 0;
-      overflow-y: scroll;
+      overflow-y: auto;
     }
   }
 }

data/app/assets/stylesheets/rails_admin/custom/mixins.scss

@@ -1,12 +1,11 @@
 /*
   Customize Sass mixins from Twitter-Bootstrap/RailsAdmin theme or add new ones for your own use.
-  Copy this file to your app/assets/rails_admin/custom/mixins.css.scss, leave this one untouched
+  Copy this file to your app/assets/rails_admin/custom/mixins.scss, leave this one untouched
   Don't require it in your application.rb
 
   Available mixins to use/override:
 
-  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/mixins.css.scss
-  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.css.scss
+  https://github.com/twbs/bootstrap-sass/tree/master/assets/stylesheets/bootstrap/mixins
+  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.scss
   Plus the ones from your theme.
 */
-

data/app/assets/stylesheets/rails_admin/custom/theming.scss

@@ -1,13 +1,13 @@
 /*
   Customize RailsAdmin theme here.
-  Copy this file to your app/assets/stylesheets/rails_admin/custom/theming.css.scss, leave this one untouched
+  Copy this file to your app/assets/stylesheets/rails_admin/custom/theming.scss, leave this one untouched
   Don't require it in your application.rb
 
   Look at the markup in RailsAdmin and go there to get inspiration from:
 
-  http://getbootstrap.com/2.3.2/
+  http://getbootstrap.com
 
-  Test me: (actual color should be the one defined in variables.css.scss if you did)
+  Test me: (actual color should be the one defined in variables.scss if you did)
 
-  body{ background-color: $linkColor; }
+  body { background-color: $link-color; }
 */

data/app/assets/stylesheets/rails_admin/custom/variables.scss

@@ -1,15 +1,15 @@
 /*
   Customize Sass variables from Twitter-Bootstrap/RailsAdmin theme or add new ones for your own use.
-  Copy this file to your app/assets/rails_admin/custom/variables.css.scss, leave this one untouched
+  Copy this file to your app/assets/rails_admin/custom/variables.scss, leave this one untouched
   Don't require it in your application.rb
 
   Available variables to use/override:
 
-  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/_variables.scss
-  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.css.scss
+  https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_variables.scss
+  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.scss
   Plus the ones from your themes.
 
   Test me: pink links
 
-  $linkColor: #F0F;
+  $link-color: #F0F;
 */

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

@@ -35,10 +35,10 @@
 
 /***  Variables  ***/
 
+@import "rails_admin/custom/variables";
 @import "rails_admin/bootstrap/variables";
 @import "rails_admin/base/variables";
 @import "rails_admin/themes/<%= theme %>/variables";
-@import "rails_admin/custom/variables";
 
 /***  Mixins  ***/
 
@@ -52,12 +52,12 @@
 /***  Libraries  ***/
 
 @import "rails_admin/aristo/jquery-ui-1.8.7.custom";
-@import "rails_admin/jquery.ui.timepicker";
-@import "rails_admin/ra.calendar-additions";
+@import "rails_admin/bootstrap-datetimepicker-build";
 @import "rails_admin/ra.filtering-multiselect";
 @import "rails_admin/ra.widgets";
 @import "rails_admin/jquery.colorpicker";
 
+
 /*** Font-awesome ***/
 
 @import 'font-awesome';

data/app/assets/stylesheets/rails_admin/themes/default/mixins.scss

@@ -3,6 +3,6 @@
 
   Available mixins to use/override:
 
-  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/mixins.css.scss
-  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.css.scss
+  https://github.com/twbs/bootstrap-sass/tree/master/assets/stylesheets/bootstrap/mixins
+  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/mixins.scss
 */

data/app/assets/stylesheets/rails_admin/themes/default/theming.scss

@@ -3,9 +3,9 @@
 
   Look at the markup in RailsAdmin and go there to get inspiration from:
 
-  http://getbootstrap.com/2.3.2/
+  http://getbootstrap.com
 
-  Test me: (actual color should be the one defined in variables.css.scss if you did)
+  Test me: (actual color should be the one defined in variables.scss if you did)
 
-  body{ background-color: $linkColor; }
+  body { background-color: $link-color; }
 */

data/app/assets/stylesheets/rails_admin/themes/default/variables.scss

@@ -3,10 +3,10 @@
 
   Available variables to use/override:
 
-  https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/vendor/assets/stylesheets/bootstrap/variables.css.scss
-  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.css.scss
+  https://github.com/twbs/bootstrap-sass/blob/master/assets/stylesheets/bootstrap/_variables.scss
+  https://github.com/sferik/rails_admin/blob/master/app/assets/stylesheets/rails_admin/base/variables.scss
 
   Test me: pink links
 
-  $linkColor: #F0F;
+  $link-color: #F0F;
 */

data/app/controllers/rails_admin/application_controller.rb

@@ -11,8 +11,6 @@ module RailsAdmin
   end
 
   class ApplicationController < Config.parent_controller.constantize
-    newrelic_ignore if defined?(NewRelic)
-
     before_filter :_authenticate!
     before_filter :_authorize!
     before_filter :_audit!

data/app/controllers/rails_admin/main_controller.rb

@@ -34,7 +34,6 @@ module RailsAdmin
         scope = scope.merge(auth_scope)
       end
       scope = scope.instance_eval(&additional_scope) if additional_scope
-
       get_collection(model_config, scope, pagination)
     end
 
@@ -51,12 +50,10 @@ module RailsAdmin
     def get_sort_hash(model_config)
       abstract_model = model_config.abstract_model
       params[:sort] = params[:sort_reverse] = nil unless model_config.list.fields.collect { |f| f.name.to_s }.include? params[:sort]
-
       params[:sort] ||= model_config.list.sort_by.to_s
       params[:sort_reverse] ||= 'false'
 
       field = model_config.list.fields.detect { |f| f.name.to_s == params[:sort] }
-
       column = begin
         if field.nil? || field.sortable == true # use params[:sort] on the base table
           "#{abstract_model.table_name}.#{params[:sort]}"
@@ -88,11 +85,15 @@ module RailsAdmin
       end
     end
 
+    def visible_fields(action, model_config = @model_config)
+      model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
+    end
+
     def sanitize_params_for!(action, model_config = @model_config, target_params = params[@abstract_model.param_key])
       return unless target_params.present?
-      fields = model_config.send(action).with(controller: self, view: view_context, object: @object).visible_fields
+      fields = visible_fields(action, model_config)
       allowed_methods = fields.collect(&:allowed_methods).flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
-      fields.each { |f| f.parse_input(target_params) }
+      fields.each { |field|  field.parse_input(target_params) }
       target_params.slice!(*allowed_methods)
       target_params.permit! if target_params.respond_to?(:permit!)
       fields.select(&:nested_form).each do |association|

data/app/helpers/rails_admin/application_helper.rb

@@ -1,8 +1,8 @@
-require 'rails_admin/i18n_support'
+require 'rails_admin/support/i18n'
 
 module RailsAdmin
   module ApplicationHelper
-    include RailsAdmin::I18nSupport
+    include RailsAdmin::Support::I18n
 
     def capitalize_first_letter(wording)
       return nil unless wording.present? && wording.is_a?(String)
@@ -156,7 +156,7 @@ module RailsAdmin
       actions = actions(:bulkable, abstract_model)
       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(: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

data/app/helpers/rails_admin/main_helper.rb

@@ -35,5 +35,50 @@ module RailsAdmin
       end
       sets
     end
+
+    def filterable_fields
+      @filterable_fields ||= @model_config.list.fields.select(&:filterable?)
+    end
+
+    def ordered_filters
+      return @ordered_filters if @ordered_filters.present?
+      @index = 0
+      @ordered_filters = (params[:f] || @model_config.list.filters).inject({}) do |memo, filter|
+        field_name = filter.is_a?(Array) ? filter.first : filter
+        (filter.is_a?(Array) ? filter.last : {(@index += 1) => {'v' => ''}}).each do |index, filter_hash|
+          if filter_hash['disabled'].blank?
+            memo[index] = {field_name => filter_hash}
+          else
+            params[:f].delete(field_name)
+          end
+        end
+        memo
+      end.to_a.sort_by(&:first)
+    end
+
+    def ordered_filter_string
+      @ordered_filter_string ||= ordered_filters.map do |duplet|
+        options = {index: duplet[0]}
+        filter_for_field = duplet[1]
+        filter_name = filter_for_field.keys.first
+        filter_hash = filter_for_field.values.first
+        unless (field = filterable_fields.find { |f| f.name == filter_name.to_sym })
+          fail "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
+        end
+        case field.type
+        when :enum
+          options[:select_options] = options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
+        when :date, :datetime, :time
+          options[:datetimepicker_format] = field.parser.to_momentjs
+        end
+        options[:label] = field.label
+        options[:name]  = field.name
+        options[:type]  = field.type
+        options[:value] = filter_hash['v']
+        options[:label] = field.label
+        options[:operator] = filter_hash['o']
+        %{$.filters.append(#{options.to_json});}
+      end.join("\n").html_safe if ordered_filters
+    end
   end
 end

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

@@ -1,5 +1,5 @@
 !!! 5
-%html
+%html{lang: I18n.locale}
   %head
     %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
@@ -9,7 +9,7 @@
     = javascript_include_tag "rails_admin/rails_admin.js"
     -# Initialize JS simple i18n
     :javascript
-      RailsAdmin.I18n.init(JSON.parse("#{j I18n.t("admin.js").to_json}"))
+      RailsAdmin.I18n.init('#{I18n.locale}', 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')
     %nav.navbar.navbar-default.navbar-fixed-top

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

@@ -6,8 +6,8 @@
 .page-header
   %h1= @page_name
 - flash && flash.each do |key, value|
-  .alert{class: flash_alert_class(key)}
-    %a.close{href: '#', :'data-dismiss' => "alert"} ×
+  .alert.alert-dismissible{class: flash_alert_class(key)}
+    %button.close{type: 'button', :'data-dismiss' => "alert"} ×
     = value
 = breadcrumb
 %ul.nav.nav-tabs

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

@@ -1,2 +1,5 @@
 .form-inline
-  = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, 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, class: 'form-control', data: {datetimepicker: true, options: field.datepicker_options.to_json}})
+    = form.label(field.method_name, class: 'input-group-addon') do
+      %i.fa.fa-fw.fa-calendar

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

@@ -26,6 +26,7 @@
     :'edit-url' => (authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, id: '__ID__') : ''),
     remote_source: index_path(config.abstract_model, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true),
     sortable: !!field.orderable,
+    removable: !!field.removable,
     cacheAll: !!field.associated_collection_cache_all,
     regional: {
       chooseAll: t("admin.misc.chose_all"),

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

@@ -11,6 +11,6 @@
       - if authorized? :edit, @abstract_model
         %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
           = t("admin.form.save_and_edit")
-      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel"), :formnovalidate => true}
+      %button.btn.btn-default{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel"), :formnovalidate => true}
         %i.icon-remove
         = t("admin.form.cancel")

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

@@ -8,38 +8,38 @@
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
-    .form-group.control-group
+    .form-group.control-group.col-sm-12
       .controls
-        .col-sm-2
-        %label.col-sm-10.checkbox{for: 'check_all'}
+        .col-sm-12
+        %label.col-sm-12.checkbox{for: 'check_all'}
           = check_box_tag 'all', 'all', true, { id: 'check_all' }
           = t('admin.export.select_all_fields')
-    .form-group.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
+    .form-group.control-group.col-sm-12
+      %label.col-sm-12.well.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-11.col-sm-offset-1.controls
         - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
           - list = field.virtual? ? 'methods' : 'only'
           - if field.association? && field.association.polymorphic?
-            %label.checkbox{for: "schema_#{list}_#{field.method_name}"}
+            %label.checkbox.col-sm-3{for: "schema_#{list}_#{field.method_name}"}
               = check_box_tag "schema[#{list}][]", field.method_name, true, { id: "schema_#{list}_#{field.method_name}" }
               = field.label + " [id]"
             - polymorphic_type_column_name = @abstract_model.properties.detect {|p| field.association.foreign_type == p.name }.name
-            %label.checkbox{for: "schema_#{list}_#{polymorphic_type_column_name}"}
+            %label.checkbox.col-sm-3{for: "schema_#{list}_#{polymorphic_type_column_name}"}
               = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
               = capitalize_first_letter(field.label) + " [type]"
           - else
-            %label.checkbox{for: "schema_#{list}_#{field.name}"}
+            %label.checkbox.col-sm-3{for: "schema_#{list}_#{field.name}"}
               = check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
               = capitalize_first_letter(field.label)
 
     - 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? }
-      .form-group.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_associated', name: field.label.downcase)
-        .col-sm-10.controls
+      .form-group.control-group.col-sm-12
+        %label.col-sm-12.well.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-11.col-sm-offset-1.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}"}
+            %label.checkbox.col-sm-3{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
               = check_box_tag "schema[include][#{field.name}][#{list}][]", associated_model_field.name, true, { id: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}" }
               = capitalize_first_letter(associated_model_field.label)
 

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

@@ -1,5 +1,4 @@
 :ruby
-  require 'rails_admin/config/fields/types/datetime.rb'
   query = params[:query]
   params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export, :_pjax)
   params.delete(:query) if params[:query].blank?
@@ -7,95 +6,48 @@
   sort_reverse = params[:sort_reverse]
   sort = params[:sort]
   params.delete(:sort) if params[:sort] == @model_config.list.sort_by.to_s
-
   export_action = RailsAdmin::Config::Actions.find(:export, { controller: self.controller, abstract_model: @abstract_model })
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
-
   description = RailsAdmin.config(@abstract_model.model_name).description
   properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).visible_fields
   # columns paginate
-  @filterable_fields = @model_config.list.fields.select(&:filterable?)
   sets = get_column_sets(properties)
   properties = sets[params[:set].to_i] || []
   other_left = ((params[:set].to_i - 1) >= 0) && sets[params[:set].to_i - 1].present?
   other_right = sets[params[:set].to_i + 1].present?
-  @index = 0
-  @ordered_filters = (params[:f] || @model_config.list.filters).inject({}) { |memo, filter|
-    field_name = filter.is_a?(Array) ? filter.first : filter
-  (filter.is_a?(Array) ? filter.last : { (@index += 1) => { "v" => '' } }) .each do |index, filter_hash|
-      unless filter_hash['disabled']
-        memo[index] = { field_name => filter_hash }
-      else
-        params[:f].delete(field_name)
-      end
-    end
-    memo
-  }.to_a.sort_by(&:first)
-
-  @ordered_filter_string = @ordered_filters.map do |duplet|
-    filter_index = duplet[0]
-    filter_for_field = duplet[1]
-    filter_name = filter_for_field.keys.first
-    filter_hash = filter_for_field.values.first
-    field = @filterable_fields.find{ |field| field.name == filter_name.to_sym }
-    unless field
-      fail "#{filter_name} is not currently filterable; filterable fields are #{@filterable_fields.map(&:name).join(', ')}"
-    end
-    field_options = case field.type
-    when :enum
-      options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
-    else
-      ''
-    end
-    %{
-      $.filters.append(#{field.label.to_json}, #{field.name.to_json}, #{field.type.to_json}, #{filter_hash['v'].to_json}, #{filter_hash['o'].to_json}, #{field_options.to_json}, #{filter_index.to_json});
-    }
-  end.join.html_safe if @ordered_filters
 
-
-= content_for :contextual_tabs do
+- content_for :contextual_tabs do
   = bulk_menu
-  - if @filterable_fields.present?
+  - if filterable_fields.present?
     %li.dropdown{style: 'float:right'}
       %a.dropdown-toggle{href: '#', :'data-toggle' => "dropdown"}
         = t('admin.misc.add_filter')
         %b.caret
       %ul.dropdown-menu#filters{style: 'left:auto; right:0;'}
-        - @filterable_fields.each do |field|
+        - filterable_fields.each do |field|
           - field_options = case field.type
           - when :enum
             - options_for_select(field.with(object: @abstract_model.model.new).enum)
           - else
             - ''
           %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => ""}= capitalize_first_letter(field.label)
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
 
-#list
-  %script
-    jQuery(function($) {
-    $.filters.options.regional = {
-    datePicker: {
-    dateFormat: #{raw I18n.t("admin.misc.filter_date_format", default: I18n.t("admin.misc.filter_date_format", locale: :en)).to_json},
-    dayNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.day_names.to_json},
-    dayNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
-    dayNamesMin: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
-    firstDay: "1",
-    monthNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.month_names.to_json},
-    monthNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_month_names.to_json}
-    }
-    }
+:javascript
+  jQuery(function($) {
+  #{ordered_filter_string}
+  });
 
-    = @ordered_filter_string
+%style
+  - properties.select{ |p| p.column_width.present? }.each do |property|
+    = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
+    = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
 
-    });
-  %style
-    - properties.select{ |p| p.column_width.present? }.each do |property|
-      = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
-      = "#list td.#{property.css_class} { max-width: #{property.column_width}px; }"
+#list
   = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
     .well
       %span#filters_box
-      %hr.filters_box{style: "display:#{@ordered_filters.empty? ? 'none' : 'block'}"}
+      %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
       .input-group
         %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
         %span.input-group-btn
@@ -103,7 +55,7 @@
             %i.icon-white.icon-refresh
             = t("admin.misc.refresh")
           %button#remove_filter.btn.btn-info{title: "Reset filters"}
-            %i.icon-white.icon-remove  
+            %i.icon-white.icon-remove
       - 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'
 
@@ -117,7 +69,9 @@
   = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
     = hidden_field_tag :bulk_action
     - if description.present?
-      <b>#{description}</b>
+      %p
+        %strong= description
+
     %table.table.table-condensed.table-striped
       %thead
         %tr
@@ -148,6 +102,7 @@
               %td.other.right= link_to "...", @other_right_link, class: 'pjax'
             %td.last.links
               %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
+
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row
@@ -155,5 +110,6 @@
       .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}"