obitum-rails_admin 0.0.1 → 0.0.2

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

@@ -1,6 +1,41 @@
-= form.fields_for field.name do |nested_form|
-  %blockquote
-    = nested_form.link_to_remove t('admin.misc.remove'), :class => 'label notice'
-    = nested_form.generate({:action => :create, :model_config => field.associated_model_config, :nested_in => field.name })
-    %hr
-= form.link_to_add t('admin.misc.add_new'), field.name, :class => 'label notice'
+.controls
+  .btn-group
+    %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", :class => (field.active? ? 'active' : '')}
+      %i.icon-white
+    = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { :class => 'btn btn-info' }
+  = form.errors_for(field)
+  = form.help_for(field)
+  %ul.nav.nav-tabs{ :style => 'margin-top:5px' }
+.tab-content
+  = form.fields_for field.name do |nested_form|
+    = nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="icon-trash icon-white"></i></span>'.html_safe
+    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
+
+= form.javascript_for(field) do
+  :plain
+    var field = $("#{form.jquery_namespace(field)}");
+    var nav = field.find('> .controls > .nav');
+    var content = field.find('> .tab-content');
+    var toggler = field.find('> .controls > .btn-group > .toggler');
+
+    // add each nested field to a tab-pane and reference it in the nav
+    content.children(".fields").addClass('tab-pane').each(function(){
+      nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>');
+    });
+
+    // init first tab, toggler and content/tabs visibility
+    nav.find("> li > a[data-toggle='tab']:first").tab('show');
+    if(nav.children().length == 0) {
+      nav.hide(); content.hide();
+      toggler.addClass('disabled').removeClass('active').children('i').addClass('icon-chevron-right')
+    } else {
+      if (toggler.hasClass('active')) {
+        nav.show(); content.show();
+        toggler.children('i').addClass('icon-chevron-down')
+      } else {
+        nav.hide(); content.hide();
+        toggler.children('i').addClass('icon-chevron-right')
+      }
+    }
+
+    // dynamic behaviour is in nested-form-hooks

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

@@ -1,6 +1,35 @@
+.controls
+  %ul.nav{:style => 'margin-bottom:0px; display:none'}
+  %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content", :class => (field.active? ? 'active' : '') }
+  = form.errors_for(field)
+  = form.help_for(field)
+
 - form.object.send("build_#{field.name}") unless form.object.send(field.name)
-= form.fields_for field.name do |nested_form|
-  %blockquote
-    = nested_form.link_to_remove t('admin.misc.remove'), :class => 'label notice'
-    = nested_form.generate({:action => :create, :model_config => field.associated_model_config, :nested_in => field.name })
-    %hr
+.tab-content
+  = form.fields_for field.name do |nested_form|
+    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
+
+= form.javascript_for(field) do
+  :plain
+    var field = $("#{form.jquery_namespace(field)}");
+    var nav = field.find("> .controls > .nav");
+    var content = field.find("> .tab-content");
+    var toggler = field.find('> .controls > .toggler');
+
+    content.children(".fields").addClass('tab-pane').each(function(){
+      nav.append('<li><a data-toggle="tab" href="#' + this.id + '">' + $(this).children('.object-infos').data('object-label') + '</a></li>');
+    });
+
+    var first_tab = nav.find("> li > a[data-toggle='tab']:first");
+
+    first_tab.tab('show');
+    field.find("> .controls > [data-target]:first").html('<i class="icon-white"></i> ' + first_tab.html());
+
+    if (toggler.hasClass('active')) {
+      toggler.children('i').addClass('icon-chevron-down');
+      content.show()
+    } else {
+      toggler.children('i').addClass('icon-chevron-right');
+      content.hide()
+    }
+

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

@@ -1,9 +1,9 @@
-= form.send field.view_helper, field.method_name, field._html_attributes
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge((hdv = field.html_default_value).nil? ? {} : { :value => hdv })
 
 - if field.ckeditor
   = javascript_tag do
-    var CKEDITOR_BASEPATH = '/javascripts/ckeditor/';
-  = javascript_include_tag "/javascripts/ckeditor/ckeditor.js"
+    var CKEDITOR_BASEPATH = '/assets/ckeditor/';
+  = javascript_include_tag "/assets/ckeditor/ckeditor.js"
   = form.javascript_for(field, :modal => false) do
     :plain
       CKEDITOR.replace('#{form.dom_id(field)}', { customConfig : '#{field.ckeditor_config_js.html_safe}' });

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

@@ -1,13 +1,15 @@
 %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-.actions
-  %button.btn.primary{:type => "submit", :name => "_save", :'data-disable-with' => t("admin.form.save")}
+.form-actions
+  %button.btn.btn-primary{:type => "submit", :name => "_save", :'data-disable-with' => t("admin.form.save")}
+    %i.icon-white.icon-ok
     = t("admin.form.save")
   %span.extra_buttons
     - if authorized? :new, @abstract_model
-      %button.btn{:type => "submit", :name => "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+      %button.btn.btn-info{:type => "submit", :name => "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
         = t("admin.form.save_and_add_another")
     - if authorized? :edit, @abstract_model
-      %button.btn{:type => "submit", :name => "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
+      %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")}
+      %i.icon-remove
       = t("admin.form.cancel")

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

@@ -1,7 +1,11 @@
 %h4= I18n.t('admin.form.bulk_delete')
 %ul= render :partial => "delete_notice", :collection => @objects
 = form_tag bulk_delete_path(:model_name => @abstract_model.to_param, :bulk_ids => @objects.map(&:id)), :method => :delete do
-  .actions
+  .form-actions
     %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-    %button.btn.danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}= t("admin.form.confirmation")
-    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}= t("admin.form.cancel")
+    %button.btn.btn-danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}
+      %i.icon-white.icon-ok
+      = t("admin.form.confirmation")
+    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
+      %i.icon-remove
+      = t("admin.form.cancel")

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

@@ -1,4 +1,4 @@
-%table.zebra-striped
+%table.table.table-condensed.table-striped
   %thead
     %tr
       %th.shrink.model-name= t "admin.table_headers.model_name"
@@ -13,7 +13,7 @@
 
         %tr{:class => row_class, :"data-link" => index_path}
           %td
-            %span.show= link_to RailsAdmin.config(abstract_model).label_plural, index_path
+            %span.show= link_to abstract_model.config.label_plural, index_path
           %td
             - if (last_used = @most_recent_changes[abstract_model.pretty_name])
               = time_ago_in_words last_used
@@ -21,9 +21,9 @@
           %td
             - count = @count[abstract_model.pretty_name]
             - percent = count > 0 ? (@max < 2.0 ? count : ((Math.log(count) * 100.0) / Math.log(@max))) : -1
-            .label.animate-width-to{:class => 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]
+            .label.animate-width-to{:class => 'label-'+get_indicator(percent), :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent - 1].max.to_i}%", :style => "width:2%"}= @count[abstract_model.pretty_name]
           %td.links
-            %ul.inline= menu_for :collection, abstract_model
+            %ul.inline= menu_for :collection, abstract_model, nil, true
 - if @auditing_adapter && authorized?(:history)
   #block-tables.block
     .content

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

@@ -9,6 +9,10 @@
 %ul= render :partial => "delete_notice", :object => @object
 = form_for(@object, :url => delete_path(:model_name => @abstract_model.to_param, :id => @object.id), :html => {:method => "delete"}) do
   %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-  .actions
-    %button.btn.danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}= t("admin.form.confirmation")
-    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}= t("admin.form.cancel")
+  .form-actions
+    %button.btn.btn-danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}
+      %i.icon-white.icon-ok
+      = t("admin.form.confirmation")
+    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
+      %i.icon-remove
+      = t("admin.form.cancel")

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

@@ -1,2 +1,2 @@
-= rails_admin_form_for @object, :url => edit_path(@abstract_model, @object.id), :as => @abstract_model.param_key, :html => { :method => "put", :multipart => true, :data => { :title => @page_name } } do |form|
+= rails_admin_form_for @object, :url => edit_path(@abstract_model, @object.id), :as => @abstract_model.param_key, :html => { :method => "put", :multipart => true, :class => "form-horizontal denser", :data => { :title => @page_name } } do |form|
   = form.generate :action => :update

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

@@ -1,71 +1,75 @@
 - params = request.params.except(:action, :controller, :utf8, :page, :per_page, :format, :authenticity_token)
 - visible_fields = @model_config.export.with(:view => self, :object => @abstract_model.model.new).visible_fields
 
-= form_tag export_path(params.merge(:all => true)), :method => 'post', :class => 'form-stacked' do
+= form_tag export_path(params.merge(:all => true)), :method => 'post', :class => 'form-horizontal denser' do
 
   %input{:name => "send_data", :type => "hidden", :value => "true"}/
-  .row
-    %fieldset
-      %legend= t('admin.export.select')
-      .span5.clearfix
-        .input
-          %ul.inputs-list
-            - visible_fields.select{ |f| !f.association? || f.association[:polymorphic] }.each do |field|
-              %li
-                - list = field.virtual? ? 'methods' : 'only'
-                - if field.association? && field.association[:polymorphic]
-                  %label{:for => "schema_#{list}_#{field.method_name}"}
-                    = check_box_tag "schema[#{list}][]", field.method_name, true, { :id => "schema_#{list}_#{field.method_name}" }
-                    %strong= field.label + " [id]"
-                  - polymorphic_type_column_name = @abstract_model.properties.find {|p| field.association[:foreign_type] == p[:name] }[:name]
-                  %label{:for => "schema_#{list}_#{polymorphic_type_column_name}"}
-                    = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { :id => "schema_#{list}_#{polymorphic_type_column_name}" }
-                    %strong= field.label + " [type]"
-                - else
-                  %label{:for => "schema_#{list}_#{field.name}"}
-                    = check_box_tag "schema[#{list}][]", field.name, true, { :id => "schema_#{list}_#{field.name}" }
-                    %strong= field.label
-      %hr
-      - visible_fields.select{ |f| f.association? && !f.association[:polymorphic] }.each do |field|
-        .span5.clearfix{:style => 'float:left;'}
-          - association = field.association
-          - associated_model = association[:type] == :belongs_to ? association[:parent_model] : association[:child_model]
-          - fields = RailsAdmin.config(associated_model).export.with(:view => self, :object => associated_model.new).visible_fields.select{ |f| !f.association? }
-          %label{:rel => 'twipsy', :'data-original-title' => t('admin.export.click_to_reverse_selection'), :onclick => 'jQuery(this).siblings(".input").find("input").click()'}= t('admin.export.fields_from_associated', :name => field.label.downcase)
-          .input
-            %ul.inputs-list
-              - fields.each do |associated_model_field|
-                - list = associated_model_field.type != 'virtual' ? 'only' : 'methods'
-                %li
-                  %label{:for => "schema_include_#{association[:name]}_#{list}_#{associated_model_field.name}"}
-                    = check_box_tag "schema[include][#{association[:name]}][#{list}][]", associated_model_field.name, true, { :id => "schema_include_#{association[:name]}_#{list}_#{associated_model_field.name}" }
-                    %strong= associated_model.human_attribute_name(associated_model_field.name)
-  .row
-    %fieldset
-      %legend= t('admin.export.options_for', :name => 'csv')
+  %fieldset
+    %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
+        - 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}"}
+              = 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.find {|p| field.association[:foreign_type] == p[:name] }[:name]
+            %label.checkbox{:for => "schema_#{list}_#{polymorphic_type_column_name}"}
+              = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { :id => "schema_#{list}_#{polymorphic_type_column_name}" }
+              = field.label + " [type]"
+          - else
+            %label.checkbox{:for => "schema_#{list}_#{field.name}"}
+              = check_box_tag "schema[#{list}][]", field.name, true, { :id => "schema_#{list}_#{field.name}" }
+              = field.label
+
+    - visible_fields.select{ |f| f.association? && !f.association[:polymorphic] }.each do |field|
+      - fields = field.associated_model_config.export.with(: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
+          - fields.each do |associated_model_field|
+            - list = associated_model_field.type != 'virtual' ? 'only' : 'methods'
+            %label.checkbox{: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}" }
+              = associated_model.human_attribute_name(associated_model_field.name)
+
+  %fieldset
+    %legend
+      %i.icon-chevron-down
+      = t('admin.export.options_for', :name => 'csv')
+    .control-group
       - guessed_encoding = (Rails.configuration.database_configuration[Rails.env]['encoding'].presence rescue 'UTF-8') || 'UTF-8'
-      .clearfix
-        %label{:for => "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
+      %label.control-label{:for => "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
+      .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"])
+        %p.help-block= t('admin.export.csv.encoding_to_help', :name => guessed_encoding)
 
-        %span.help-inline= t('admin.export.csv.encoding_to_help', :name => guessed_encoding)
-      .clearfix
-        %label{:for => "csv_options_skip_header"}= t('admin.export.csv.skip_header')
+    .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'
-        %span.help-inline= t('admin.export.csv.skip_header_help')
-      .clearfix
-        %label{:for => "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
+        %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
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
-        %span.help-inline= t('admin.export.csv.col_sep_help', :value => t('admin.export.csv.default_col_sep'))
+        %p.help-block= t('admin.export.csv.col_sep_help', :value => t('admin.export.csv.default_col_sep'))
 
-  .actions
+  .form-actions
     %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-    %button.btn.primary{:type => "submit", :name => 'csv'}
+    %button.btn.btn-primary{:type => "submit", :name => 'csv'}
+      %i.icon-white.icon-ok
       = t("admin.export.confirmation", :name => 'csv')
-    %button.btn.info{:type => "submit", :name => 'json'}
+    %button.btn.btn-info{:type => "submit", :name => 'json'}
       = t("admin.export.confirmation", :name => 'json')
-    %button.btn.info{:type => "submit", :name => 'xml'}
+    %button.btn.btn-info{:type => "submit", :name => 'xml'}
       = t("admin.export.confirmation", :name => 'xml')
     %button.btn{:type => "submit", :name => "_continue"}
+      %i.icon-remove
       = t("admin.form.cancel")

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

@@ -5,13 +5,13 @@
 - sort_reverse = params[:sort_reverse]
 - path_method = params[:id] ? "history_show_path" : "history_index_path"
 
-= form_tag("", :method => "get", :class => "search") do
-  .row.clearfix
-    .span3
-      %input{:name => "query", :type => "search", :value => query, :placeholder => "#{t("admin.misc.filter")}"}
-    .span3
-      %button.btn.primary{:type => "submit", :'data-disable-with' => t("admin.misc.refresh")}= t("admin.misc.refresh")
-%table#history.zebra-striped
+= form_tag("", :method => "get", :class => "search form-inline") do
+  .well
+    %input{:name => "query", :type => "search", :value => query, :placeholder => "#{t("admin.misc.filter")}", :class => 'input-small'}
+    %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")
+%table#history.table.table-striped.table-condensed
   %thead
     %tr
       - columns = []
@@ -25,7 +25,7 @@
         - selected = (sort == property_name)
         - sort_direction = selected ? (sort_reverse ? "headerSortUp" : "headerSortDown") : nil
         - sort_location = send(path_method, params.except("sort_reverse").merge(:model_name => @abstract_model.to_param, :sort => property_name).merge(selected && sort_reverse != "true" ? {:sort_reverse => "true"} : {}))
-        %th{:class => "header #{column[:css_class]} #{sort_direction if selected}", :'data-link' => sort_location}= column[:link_text]
+        %th{:class => "header #{column[:css_class]} #{sort_direction if selected}", :'data-href' => sort_location}= column[:link_text]
   %tbody
     - @history.each_with_index do |object, index|
       %tr

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

@@ -6,7 +6,7 @@
   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 = export_action && authorized?(export_action.authorization_key, @abstract_model) ? export_action : nil
 
@@ -38,7 +38,7 @@
     field = @filterable_fields.find{ |field| field.name == filter_name.to_sym }
     field_options = case field.type
     when :enum
-      options_for_select(field.with(:object => @abstract_model.model.new).enum, filter_hash['value']).gsub("\n", '')
+      options_for_select(field.with(:object => @abstract_model.model.new).enum, filter_hash['v']).gsub("\n", '')
     else
       ''
     end
@@ -49,8 +49,10 @@
 = content_for :contextual_tabs do
   = bulk_menu
   - if @filterable_fields.present?
-    %li.dropdown{:style => 'float:right', :'data-dropdown' => "dropdown"}
-      %a.dropdown-toggle{:href => '#'}= t('admin.misc.add_filter')
+    %li.dropdown{:style => 'float:right'}
+      %a.dropdown-toggle{:href => '#', :'data-toggle' => "dropdown"}
+        = t('admin.misc.add_filter')
+        %b.caret
       %ul.dropdown-menu#filters
         - @filterable_fields.each do |field|
           - field_options = case field.type
@@ -70,25 +72,24 @@
     - 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; }"
-  = form_tag(index_path(params.except(*%w[page f query])), :method => :get, :class => "pjax-form") do
-    .row
-      .span12
-        #filters_box
-    .row.clearfix
-      .span3
-        %input{:name => "query", :type => "search", :value => query, :placeholder => t("admin.misc.filter")}
-      .span3
-        %button.btn.primary{:type => "submit", :'data-disable-with' => t("admin.misc.refresh")}= t("admin.misc.refresh")
+  = 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'}"}
+      %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")
       - if export_action
-        %span{:style => 'float:right'}=link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), :class => 'btn info'
+        %span{:style => 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), :class => 'btn btn-info'
 
   = form_tag bulk_action_path(:model_name => @abstract_model.to_param), :method => :post, :id => "bulk_form", :class => "form" do
     = hidden_field_tag :bulk_action
-    %table.zebra-striped
+    %table.table.table-condensed.table-striped
       %thead
         %tr
-          %th.first.shrink
-            %input.checkbox.toggle{:type => "checkbox"}
+          %th.shrink
+            %input.toggle{:type => "checkbox"}
           - if other_left
             %th.other.left.shrink= "..."
           - properties.each do |property|
@@ -96,15 +97,15 @@
             - if property.sortable
               - sort_location = index_path params.except('sort_reverse').except('page').merge(:sort => property.name).merge(selected && sort_reverse != "true" ? {:sort_reverse => "true"} : {})
               - sort_direction = selected ? (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown") : nil
-            %th{:class => "pjax #{property.sortable && "header" || nil} #{property.sortable && sort_direction ? sort_direction : nil} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location)}= property.label
+            %th{:class => "#{property.sortable && "header pjax" || nil} #{property.sortable && sort_direction ? sort_direction : nil} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location)}= property.label
           - if other_right
             %th.other.right.shrink= "..."
           %th.last.shrink
       %tbody
         - @objects.each do |object|
           %tr
-            %td.select.action
-              = check_box_tag "bulk_ids[]", object.id, false, :id => "bulk_ids_#{object.id}", :class => "checkbox"
+            %td
+              = check_box_tag "bulk_ids[]", object.id, false
             - if @other_left_link ||= other_left && index_path(params.except('set').merge(params[:set].to_i != 1 ? {:set => (params[:set].to_i - 1)} : {}))
               %td.other.left= link_to "...", @other_left_link, :class => 'pjax'
             - properties.map{ |property| property.bind(:object, object) }.each do |property|
@@ -113,7 +114,7 @@
             - if @other_right_link ||= other_right && index_path(params.merge(:set => (params[:set].to_i + 1)))
               %td.other.right= link_to "...", @other_right_link, :class => 'pjax'
             %td.last.links
-              %ul.inline= menu_for :member, @abstract_model, object
+              %ul.inline= menu_for :member, @abstract_model, object, true
     - unless params[:all]
       - total_count = @objects.total_count
       = paginate(@objects, :theme => 'twitter-bootstrap', :remote => true)

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

@@ -1,2 +1,2 @@
-= rails_admin_form_for @object, :url => new_path(:model_name => @abstract_model.to_param, :id => @object.id), :as => @abstract_model.param_key, :html => { :multipart => true, :data => { :title => @page_name } } do |form|
+= rails_admin_form_for @object, :url => new_path(:model_name => @abstract_model.to_param, :id => @object.id), :as => @abstract_model.param_key, :html => { :multipart => true, :class => "form-horizontal denser", :data => { :title => @page_name } } do |form|
   = form.generate :action => :create

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

@@ -4,8 +4,8 @@
       .fieldset
         %h4
           = fieldset.label
-          - if fieldset.help
-            %small= fieldset.help
+        - if fieldset.help
+          %p= fieldset.help
         %dl
           - fields.each_with_index do |field, index|
             - if !values[index].nil? || !RailsAdmin::config.compact_show_view

data/config/initializers/active_record_extensions.rb

@@ -1,11 +1,11 @@
 if defined?(::ActiveRecord)
   class ActiveRecord::Base
     def self.rails_admin(&block)
-      ActiveSupport::Deprecation.warn("'#{self.name}.rails_admin { }' is deprecated, content is not evaluated anymore, use initializer instead", caller)
+      RailsAdmin::Config.model(self, &block)
     end
 
     def rails_admin_default_object_label_method
-      "#{self.class.to_s} ##{self.try :id}"
+      self.new_record? ? "new #{self.class.to_s}" : "#{self.class.to_s} ##{self.id}"
     end
 
     def safe_send(value)

data/config/initializers/haml.rb

@@ -1,3 +1,2 @@
 require "haml"
 Haml::Template.options[:ugly] = true
-Haml::Template.options[:format] = :xhtml # force closing self-closing tags for now (fix issues with xml parsing through AJAX)

data/config/locales/rails_admin.en.yml

@@ -12,8 +12,8 @@ en:
       filter: "Filter"
       refresh: "Refresh"
       show_all: "Show all"
-      add_filter: "Add filter..."
-      bulk_menu_title: "Selected items..."
+      add_filter: "Add filter"
+      bulk_menu_title: "Selected items"
       remove: "Remove"
       add_new: "Add new"
       chosen: "Chosen %{name}"
@@ -78,7 +78,7 @@ en:
         breadcrumb: "Multiple delete"
         bulk_link: "Delete selected %{model_label_plural}"
       export:
-        title: "Export %{model_label}"
+        title: "Export %{model_label_plural}"
         menu: "Export"
         breadcrumb: "Export"
         link: "Export found %{model_label_plural}"
@@ -106,9 +106,9 @@ en:
       all_of_the_following_related_items_will_be_deleted: "? The following related items may be deleted or orphaned:"
       are_you_sure_you_want_to_delete_the_object: "Are you sure you want to delete this %{model_name}"
       confirmation: "Yes, I'm sure"
-      delete_confirmation: "Delete confirmation"
       bulk_delete: "The following objects will be deleted, which may delete or orphan some of their related dependencies:"
-    export:      
+      new_model: "%{name} (new)"
+    export:
       confirmation: "Export to %{name}"
       select: "Select fields to export"
       fields_from: "Fields from %{name}"

data/lib/generators/rails_admin/templates/initializer.erb

@@ -8,13 +8,13 @@ RailsAdmin.config do |config|
   # I18n.default_locale = :de
 
   config.current_user_method { current_<%= @model_name.underscore %> } # auto-generated
-  
+
   # If you want to track changes on your models:
   # config.audit_with :history, <%= @model_name.classify %>
-  
+
   # Or with a PaperTrail: (you need to install it first)
   # config.audit_with :paper_trail, <%= @model_name.classify %>
-  
+
   # Set the admin name here (optional second array element will appear in a beautiful RailsAdmin red ©)
   config.main_app_name = ['<%= Rails.application.engine_name.titleize.chomp(' Application') %>', 'Admin']
   # or for a dynamic name:
@@ -31,10 +31,10 @@ RailsAdmin.config do |config|
 
   #  ==> Included models
   # Add all excluded models here:
-  # config.excluded_models = [<%= RailsAdmin::AbstractModel.all_models.map(&:name).join(', ') %>]
+  # config.excluded_models = [<%= RailsAdmin::AbstractModel.all.map{|am| am.model.to_s }.join(', ') %>]
 
   # Add models here if you want to go 'whitelist mode':
-  # config.included_models = [<%= RailsAdmin::AbstractModel.all_models.map(&:name).join(', ') %>]
+  # config.included_models = [<%= RailsAdmin::AbstractModel.all.map{|am| am.model.to_s }.join(', ') %>]
 
   # Application wide tried label methods for models' instances
   # config.label_methods << :description # Default is [:name, :title]
@@ -82,11 +82,11 @@ RailsAdmin.config do |config|
 <% RailsAdmin::AbstractModel.all.map do |abstract_model| -%>
   # config.model <%= abstract_model.model.model_name %> do
   #   # Found associations:
-<%= RailsAdmin.config(abstract_model).export.fields.select{|f| f.association?}.map do |field|
+<%= abstract_model.config.export.fields.select{|f| f.association?}.map do |field|
 %{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
 end.join("\n") -%>
   #   # Found columns:
-<%= RailsAdmin.config(abstract_model).export.fields.select{|f| !f.association?}.map do |field|
+<%= abstract_model.config.export.fields.select{|f| !f.association?}.map do |field|
 %{  #     configure #{field.name.inspect}, #{field.type.inspect}#{"         # Hidden" unless field.visible?} }
 end.join("\n") -%>
   #   # Sections: