obitum-rails_admin 0.0.1 → 0.0.2

data/app/controllers/rails_admin/main_controller.rb

@@ -1,31 +1,30 @@
 module RailsAdmin
 
   class MainController < RailsAdmin::ApplicationController
-            
+
     include ActionView::Helpers::TextHelper
     include RailsAdmin::MainHelper
     include RailsAdmin::ApplicationHelper
-    
+
     layout "rails_admin/application"
-    
+
     before_filter :get_model, :except => RailsAdmin::Config::Actions.all(:root).map(&:action_name)
     before_filter :get_object, :only => RailsAdmin::Config::Actions.all(:member).map(&:action_name)
     before_filter :check_for_cancel
-    
+
     RailsAdmin::Config::Actions.all.each do |action|
       class_eval %{
         def #{action.action_name}
-          @action = RailsAdmin::Config::Actions.find('#{action.action_name}'.to_sym, {:controller => self, :abstract_model => @abstract_model, :object => @object})
-          
-          @authorization_adapter.try(:authorize, @action.authorization_key, @abstract_model, @object)
+          action = RailsAdmin::Config::Actions.find('#{action.action_name}'.to_sym)
+          @authorization_adapter.try(:authorize, action.authorization_key, @abstract_model, @object)
+          @action = action.with({:controller => self, :abstract_model => @abstract_model, :object => @object})
           @page_name = wording_for(:title)
-          @page_type = @abstract_model && @abstract_model.pretty_name.downcase || "dashboard"
-          
+
           instance_eval &@action.controller
         end
       }
     end
-    
+
     def bulk_action
       self.send(params[:bulk_action]) if params[:bulk_action].in?(RailsAdmin::Config::Actions.all(:controller => self, :abstract_model => @abstract_model).select(&:bulkable?).map(&:route_fragment))
     end
@@ -34,12 +33,12 @@ module RailsAdmin
       scope = @authorization_adapter && @authorization_adapter.query(auth_scope_key, model_config.abstract_model)
       scope = model_config.abstract_model.scoped.merge(scope)
       scope = scope.instance_eval(&additional_scope) if additional_scope
-      
+
       get_collection(model_config, scope, pagination)
     end
 
     private
-    
+
     def back_or_index
       params[:return_to].presence && params[:return_to].include?(request.host) && (params[:return_to] != request.fullpath) ? params[:return_to] : index_path
     end
@@ -71,7 +70,6 @@ module RailsAdmin
       {:sort => column, :sort_reverse => (params[:sort_reverse] == reversed_sort.to_s)}
     end
 
-
     def get_attributes
       attributes = params[@abstract_model.to_param.gsub('~','_')] || {}
       attributes.each do |key, value|
@@ -82,7 +80,7 @@ module RailsAdmin
       end
       attributes
     end
-    
+
     def redirect_to_on_success
       notice = t("admin.flash.successful", :name => @model_config.label, :action => t("admin.actions.#{@action.key}.done"))
       if params[:_add_another]
@@ -118,7 +116,8 @@ module RailsAdmin
       options = options.merge(:page => (params[:page] || 1).to_i, :per => (params[:per] || model_config.list.items_per_page)) if pagination
       options = options.merge(:include => associations) unless associations.blank?
       options = options.merge(get_sort_hash(model_config)) unless params[:associated_collection]
-      options = options.merge(model_config.abstract_model.get_conditions_hash(model_config, params[:query], params[:f])) if (params[:query].present? || params[:f].present?)
+      options = options.merge(:query => params[:query]) if params[:query].present?
+      options = options.merge(:filters => params[:f]) if params[:f].present?
       options = options.merge(:bulk_ids => params[:bulk_ids]) if params[:bulk_ids]
 
       objects = model_config.abstract_model.all(options, scope)
@@ -127,7 +126,7 @@ module RailsAdmin
     def get_association_scope_from_params
       return nil unless params[:associated_collection].present?
       source_abstract_model = RailsAdmin::AbstractModel.new(to_model_name(params[:source_abstract_model]))
-      source_model_config = RailsAdmin.config(source_abstract_model)
+      source_model_config = source_abstract_model.config
       source_object = source_abstract_model.get(params[:source_object_id])
       action = params[:current_action].in?(['create', 'update']) ? params[:current_action] : 'edit'
       association = source_model_config.send(action).fields.find{|f| f.name == params[:associated_collection].to_sym }.with(:controller => self, :object => source_object)

data/app/helpers/rails_admin/application_helper.rb

@@ -8,22 +8,19 @@ module RailsAdmin
     def authorized?(*args)
       @authorization_adapter.nil? || @authorization_adapter.authorized?(*args)
     end
-    
-    def current_action?(action)
-      @action.custom_key == action.custom_key
+
+    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(:id) == object.try(:id)
     end
-    
+
     def action(key, abstract_model = nil, object = nil)
-      action = RailsAdmin::Config::Actions.find(key, { :controller => self.controller, :abstract_model => abstract_model, :object => object })
-      action && authorized?(action.authorization_key, (action.collection? || action.member?) && abstract_model || nil, action.member? && object || nil) ? action : nil
+      RailsAdmin::Config::Actions.find(key, { :controller => self.controller, :abstract_model => abstract_model, :object => object })
     end
-    
+
     def actions(scope = :all, abstract_model = nil, object = nil)
-      RailsAdmin::Config::Actions.all(scope, { :controller => self.controller, :abstract_model => abstract_model, :object => object }).select do |action|
-        authorized?(action.authorization_key, (action.collection? || action.member?) && abstract_model || nil, action.member? && object || nil)
-      end
+      RailsAdmin::Config::Actions.all(scope, { :controller => self.controller, :abstract_model => abstract_model, :object => object })
     end
-    
+
     def edit_user_link
       return nil unless authorized?(:edit, _current_user.class, _current_user) && _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
@@ -31,58 +28,87 @@ module RailsAdmin
       link_to _current_user.email, url_for(:action => edit_action.action_name, :model_name => abstract_model.to_param, :id => _current_user.id, :controller => 'rails_admin/main')
     end
 
-    
     def wording_for(label, action = @action, abstract_model = @abstract_model, object = @object)
-      
-      model_config = abstract_model && RailsAdmin.config(abstract_model)
+      model_config = abstract_model.try(:config)
       object = abstract_model && object.is_a?(abstract_model.model) ? object : nil
       action = RailsAdmin::Config::Actions.find(action.to_sym) if (action.is_a?(Symbol) || action.is_a?(String))
-      
-      I18n.t("admin.actions.#{action.i18n_key}.#{label}", 
-        :model_label => model_config.try(:label), 
-        :model_label_plural => model_config.try(:label_plural), 
+
+      I18n.t("admin.actions.#{action.i18n_key}.#{label}",
+        :model_label => model_config.try(:label),
+        :model_label_plural => model_config.try(:label_plural),
         :object_label => model_config && object.try(model_config.object_label_method)
       )
     end
-    
+
+    def main_navigation
+      nodes_stack = RailsAdmin::Config.visible_models(:controller => self.controller)      
+      nodes_stack.group_by(&:navigation_label).map do |navigation_label, nodes|
+
+        %{<li class='nav-header'>#{navigation_label || t('admin.misc.navigation')}</li>}.html_safe +
+        nodes.select{|n| n.parent.nil? || !n.parent.to_s.in?(nodes_stack.map{|c| c.abstract_model.model_name }) }.map do |node|
+          %{
+            <li#{' class="active"' if node == @model_config }>
+              <a href="#{url_for(:action => :index, :controller => 'rails_admin/main', :model_name => node.abstract_model.to_param)}">#{node.label_plural}</a>
+            </li>
+            #{navigation(nodes_stack, nodes_stack.select{|n| n.parent.to_s == node.abstract_model.model_name}, 1)}
+          }.html_safe
+        end.join.html_safe
+      end.join.html_safe
+    end
+
+    def navigation nodes_stack, nodes, level
+      nodes.map do |node|
+        %{
+          <li#{' class="active"' if node == @model_config }>
+            <a class="nav-level-#{level}" href="#{url_for(:action => :index, :controller => 'rails_admin/main', :model_name => node.abstract_model.to_param)}">#{node.label_plural}</a>
+          </li>
+          #{navigation(nodes_stack, nodes_stack.select{ |n| n.parent.to_s == node.abstract_model.model_name}, level + 1)}
+        }.html_safe
+      end.join
+    end
+
     def breadcrumb action = @action, acc = []
-      
-      acc << content_tag(:li, :class => "#{"active" if current_action?(action)}") do
-        if action.http_methods.include?(:get)
-          link_to wording_for(:breadcrumb, action), { :action => action.action_name, :controller => 'rails_admin/main' }
-        else
-          content_tag(:span, wording_for(:breadcrumb, action))
-        end
-      end
+      begin
+        (parent_actions ||= []) << action
+      end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent))
+      parent_actions << action(:dashboard) if parent_actions.last.key != :dashboard # in case chain is interrupted
 
-      unless action.breadcrumb_parent && (parent = action(action.breadcrumb_parent, @abstract_model, @object)) # rec tail
-        content_tag(:ul, :class => "breadcrumb") do
-          acc.reverse.join('<span class="divider">/</span>').html_safe
-        end
-      else
-        breadcrumb parent, acc # rec
+      content_tag(:ul, :class => "breadcrumb") do
+        parent_actions.map do |a|
+          am = a.send(:eval, 'bindings[:abstract_model]')
+          o = a.send(:eval, 'bindings[:object]')
+          content_tag(:li, :class => "#{"active" if current_action?(a, am, o)}") do
+            if a.http_methods.include?(:get)
+              link_to wording_for(:breadcrumb, a, am, o), { :action => a.action_name, :controller => 'rails_admin/main', :model_name => am.try(:to_param), :id => o.try(:id) }
+            else
+              content_tag(:span, wording_for(:breadcrumb, a, am, o))
+            end
+          end
+        end.reverse.join('<span class="divider">/</span>').html_safe
       end
     end
-    
+
     # parent => :root, :collection, :member
-    def menu_for(parent, abstract_model = nil, object = nil) # perf matters here (no action view trickery)
-      actions = actions(parent, abstract_model, object).select{ |action| action.http_methods.include?(:get) }
+    def menu_for(parent, abstract_model = nil, object = nil, only_icon = false) # perf matters here (no action view trickery)
+      actions = actions(parent, abstract_model, object).select{ |a| a.http_methods.include?(:get) }
       actions.map do |action|
+        wording = wording_for(:menu, action)
         %{
-          <li class="#{action.key}_#{parent}_link #{'active' if current_action?(action)}">
+          <li data-original-title="#{wording}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
             <a href="#{url_for({ :action => action.action_name, :controller => 'rails_admin/main', :model_name => abstract_model.try(:to_param), :id => object.try(:id) })}">
-              #{wording_for(:menu, action)}
+              <i class="#{action.link_icon}"></i>
+              <span#{only_icon ? " style='display:none'" : ""}>#{wording}</span>
             </a>
           </li>
         }
       end.join.html_safe
     end
-    
+
     def bulk_menu abstract_model = @abstract_model
       actions = actions(:bulkable, abstract_model)
       return '' if actions.empty?
-      content_tag :li, { :class => 'dropdown', :style => 'float:right', :'data-dropdown' => "dropdown" } do
-        content_tag(:a, { :class => 'dropdown-toggle', :href => '#' }) { t('admin.misc.bulk_menu_title') } +
+      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') do
           actions.map do |action|
             content_tag :li do

data/app/helpers/rails_admin/form_builder.rb

@@ -1,9 +1,9 @@
-ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }
+ActionView::Base.field_error_proc = Proc.new { |html_tag, instance| html_tag }
 
 module RailsAdmin
   class FormBuilder < ::ActionView::Helpers::FormBuilder
     include ::NestedForm::BuilderMixin
-    
+
     def generate(options = {})
       options.reverse_merge!({
         :action => @template.controller.params[:action],
@@ -11,6 +11,8 @@ module RailsAdmin
         :nested_in => false
       })
       groups = options[:model_config].send(options[:nested_in] ? :nested : options[:action]).with(:form => self, :object => @object, :view => @template).visible_groups
+
+      object_infos +
       groups.map do |fieldset|
         fieldset_for fieldset, options[:nested_in]
       end.join.html_safe +
@@ -20,8 +22,11 @@ module RailsAdmin
     def fieldset_for fieldset, nested_in
       if (fields = fieldset.with(:form => self, :object => @object, :view => @template).visible_fields).length > 0
         @template.content_tag :fieldset do
-          @template.content_tag(:legend, fieldset.label.html_safe + (fieldset.help.present? ? @template.content_tag(:small, fieldset.help) : ''), :style => "#{fieldset.label == I18n.translate("admin.form.basic_info") ? 'display:none' : ''}") +
-          fields.map{ |field| field_wrapper_for(field, nested_in) }.join.html_safe
+          contents = []
+          contents << @template.content_tag(:legend, %{<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}}.html_safe, :style => "#{fieldset.label == I18n.translate("admin.form.basic_info") ? 'display:none' : ''}")
+          contents << @template.content_tag(:p, fieldset.help) if fieldset.help.present?
+          contents << fields.map{ |field| field_wrapper_for(field, nested_in) }.join
+          contents.join.html_safe
         end
       end
     end
@@ -32,24 +37,16 @@ module RailsAdmin
       else
         # do not show nested field if the target is the origin
         unless field.inverse_of.presence && field.inverse_of == nested_in
-          @template.content_tag(:div, :class => "clearfix field #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => "#{dom_id(field)}_field") do
-            label(field.method_name, field.label, :class => (field.nested_form ? 'nester input' : '')) +
-            (field.nested_form ? nested_inputs_for(field) : input_for(field))
+          @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, field.label, :class => 'control-label') +
+            (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       end
     end
-    
-    def nested_inputs_for field
-      @template.content_tag(:div, :class => 'input') do
-        errors_for(field) +
-        help_for(field)
-      end + '<div class="row"></div>'.html_safe +
-      field_for(field)
-    end
 
     def input_for field
-      @template.content_tag(:div, :class => 'input') do
+      @template.content_tag(:div, :class => 'controls') do
         field_for(field) +
         errors_for(field) +
         help_for(field)
@@ -57,11 +54,11 @@ module RailsAdmin
     end
 
     def errors_for field
-      field.errors.present? ? @template.content_tag(:span, "#{field.label} #{field.errors.first}", :class => 'help-inline') : ''.html_safe
+      field.errors.present? ? @template.content_tag(:span, "#{field.label} #{field.errors.to_sentence}", :class => 'help-inline') : ''.html_safe
     end
 
     def help_for field
-      field.help.present? ? @template.content_tag(:span, field.help, :class => 'help-block') : ''.html_safe
+      field.help.present? ? @template.content_tag(:p, field.help, :class => 'help-block') : ''.html_safe
     end
 
     def field_for field
@@ -71,10 +68,16 @@ module RailsAdmin
         field.render
       end
     end
-    
+
+    def object_infos
+      model_config = RailsAdmin.config(object)
+      model_label = model_config.label
+      object_label = (object.new_record? ? I18n.t('admin.form.new_model', :name => model_label) : object.send(model_config.object_label_method).presence || "#{model_config.label} ##{object.id}")
+      %{<span style="display:none" class="object-infos" data-model-label="#{model_label}" data-object-label="#{object_label}"></span>}.html_safe
+    end
+
     def javascript_for(field, options = {}, &block)
-      %{
-        <script type="text/javascript">
+      %{<script type="text/javascript">
           jQuery(function($) {
             if(!$("#{jquery_namespace(field)}").parents(".fields_blueprint").length) {
               if(#{options[:modal] == false ? '!$("#modal").length' : 'true'}) {
@@ -82,25 +85,24 @@ module RailsAdmin
               }
             }
           });
-        </script>
-      }.html_safe
+        </script>}.html_safe
     end
-    
+
     def jquery_namespace field
-      "#{(@template.controller.params[:modal] ? '#modal ' : '')}##{dom_id(field)}_field"
+      %{#{(@template.controller.params[:modal] ? '#modal ' : '')}##{dom_id(field)}_field}
     end
-    
+
     def dom_id field
-      (@dom_id ||= {})[field.name] ||= 
+      (@dom_id ||= {})[field.name] ||=
         [
           @object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, ""),
           options[:index],
           field.method_name
         ].reject(&:blank?).join('_')
     end
-    
+
     def dom_name field
-      (@dom_name ||= {})[field.name] ||= "#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Types::HasManyAssociation) ? '[]' : ''}"
+      (@dom_name ||= {})[field.name] ||= %{#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Types::HasManyAssociation) ? '[]' : ''}}
     end
   end
 end

data/app/helpers/rails_admin/main_helper.rb

@@ -6,20 +6,20 @@ module RailsAdmin
       options = args.extract_options!.reverse_merge(:builder => RailsAdmin::FormBuilder)
       form_for(*(args << options), &block) << after_nested_form_callbacks
     end
-            
+
     def get_indicator(percent)
       return "" if percent < 0          # none
-      return "notice" if percent < 34   # < 1/100 of max
+      return "info" if percent < 34   # < 1/100 of max
       return "success" if percent < 67  # < 1/10 of max
       return "warning" if percent < 84  # < 1/3 of max
       return "important"                # > 1/3 of max
     end
-    
+
     def get_column_sets(properties)
       sets = []
       property_index = 0
       set_index = 0
-      
+
       while (property_index < properties.length)
         current_set_width = 0
         begin

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

@@ -1,11 +1,12 @@
-- actions(:root).each do |action|
-  %li= link_to wording_for(:menu, action), { :action => action.action_name, :controller => 'rails_admin/main' }
-- if main_app_root_path = (main_app.root_path rescue false)
-  %li= link_to t('home.name').capitalize, main_app_root_path
-- if _current_user
-  - if user_link = edit_user_link
-    %li= user_link
-  - if defined?(Devise) && (devise_scope = request.env["warden"].config[:default_scope] rescue false) && (logout_path = main_app.send("destroy_#{devise_scope}_session_path") rescue false)
-    %li= link_to content_tag('span', t('admin.misc.log_out'), :class => 'label important'), logout_path, :method => Devise.sign_out_via
-  - if _current_user.respond_to?(:email)
-    %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", :style => 'padding-top:5px'
+%ul.nav.pull-right
+  - actions(:root).each do |action|
+    %li= link_to wording_for(:menu, action), { :action => action.action_name, :controller => 'rails_admin/main' }
+  - if main_app_root_path = (main_app.root_path rescue false)
+    %li= link_to t('home.name').capitalize, main_app_root_path
+  - if _current_user
+    - if user_link = edit_user_link
+      %li= user_link
+    - if defined?(Devise) && (devise_scope = request.env["warden"].config[:default_scope] rescue false) && (logout_path = main_app.send("destroy_#{devise_scope}_session_path") rescue false)
+      %li= link_to content_tag('span', t('admin.misc.log_out'), :class => 'label label-important'), logout_path, :method => Devise.sign_out_via
+    - if _current_user.respond_to?(:email)
+      %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", :style => 'padding-top:5px'

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

@@ -7,33 +7,33 @@
     = csrf_meta_tag
     = stylesheet_link_tag "rails_admin/rails_admin.css"
     = javascript_include_tag "rails_admin/rails_admin.js"
-  %body.rails_admin{:style => "padding-top: 60px;"}
-    .topbar-wrapper{:style => "z-index: 5;"}
-      .topbar{:'data-dropdown' => 'dropdown'}
-        .topbar-inner
-          .container-fluid
-            %h3
-              = link_to dashboard_path do
-                = _get_plugin_name[0] || 'Rails'
-                %small= _get_plugin_name[1] || 'Admin'
-            %ul.nav.secondary-nav= render :partial => 'layouts/rails_admin/secondary_navigation'
+  %body.rails_admin
+    .navbar.navbar-fixed-top
+      .navbar-inner
+        .container-fluid
+          %a.brand{:href => dashboard_path}
+            = _get_plugin_name[0] || 'Rails'
+            %small= _get_plugin_name[1] || 'Admin'
+          .nav-collapse
+            = render :partial => 'layouts/rails_admin/secondary_navigation'
     .container-fluid
-      .sidebar
-        .well
-          %h3= t "admin.misc.navigation"
-          = render :partial => 'layouts/rails_admin/navigation'
-      .content
-        .page-header
-          %h1= @page_name
-        - flash && flash.each do |key, value|
-          .alert-message.fade.in{:class => key}
-            %a.close{:href => '#'}×
-            %p= value
-        = breadcrumb
-        %ul.tabs
-          = menu_for((@abstract_model ? (@object.try(:id) ? :member : :collection) : :root), @abstract_model, @object)
-          = content_for :contextual_tabs
-        %span.row
-        = yield
-        %footer
-          %p © RailsAdmin 2011
+      .row-fluid
+        .span3
+          .well.sidebar-nav
+            %ul.nav.nav-list= main_navigation
+        .span9
+          .row-fluid
+            .content
+              .page-header
+                %h1= @page_name
+              - flash && flash.each do |key, value|
+                .alert{:class => "alert-#{key}"}
+                  %a.close{:href => '#', :'data-dismiss' => "alert"}×
+                  = value
+              = breadcrumb
+              %ul.nav.nav-tabs
+                = menu_for((@abstract_model ? (@object.try(:id) ? :member : :collection) : :root), @abstract_model, @object)
+                = content_for :contextual_tabs
+              = yield
+              %footer
+                %p © RailsAdmin 2012

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

@@ -1,4 +1,4 @@
-%table.zebra-striped
+%table.table.table-condensed.table-striped
   %thead
     %tr
       %th.shrink.user= t("admin.table_headers.username")

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

@@ -1,17 +1,16 @@
 - object = delete_notice
-- model_config = RailsAdmin.config(@abstract_model)
 
-%li{:style => 'display:block; margin-bottom:10px'}
+%li{:style => 'display:block; margin-top:10px'}
   %span.label= @abstract_model.pretty_name
-  = link_to model_config.with(:object => object).object_label, show_path(:model_name => @abstract_model.to_param, :id => object.id)
+  = link_to @model_config.with(:object => object).object_label, show_path(:model_name => @abstract_model.to_param, :id => object.id)
   %ul
-    - @abstract_model.has_many_associations.each do |association|
+    - @abstract_model.associations.select{|a| a[:type] == :has_many }.each do |association|
       - object.send(association[:name]).each do |child|
         %li
           - child_config = RailsAdmin.config(child)
           = association[:pretty_name]
           = link_to(child_config.with(:object => child).object_label, show_path(:model_name => child_config.abstract_model.to_param, :id => child.id))
-    - @abstract_model.has_one_associations.each do |association|
+    - @abstract_model.associations.select{|a| a[:type] == :has_one }.each do |association|
       - if child = object.send(association[:name])
         %li
           - child_config = RailsAdmin.config(child)

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

@@ -1,4 +1,5 @@
-= form.send field.view_helper, field.method_name, field._html_attributes.reverse_merge({:style => "background-color: #{field.color}"})
+- html_attributes = field.html_attributes.reverse_merge({:style => "background-color: #{field.color}"}).reverse_merge((hdv = field.html_default_value).nil? ? {} : { :value => hdv })
+= form.send field.view_helper, field.method_name, html_attributes
 
 = javascript_include_tag asset_path 'rails_admin/jquery.colorpicker.js'
 = stylesheet_link_tag asset_path 'rails_admin/jquery.colorpicker.css'

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

@@ -1,4 +1,4 @@
-= 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 })
 = form.javascript_for(field) do
   :plain
     $("#{form.jquery_namespace(field)} input").datetimepicker(#{field.js_plugin_options.html_safe});

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

@@ -1,4 +1,4 @@
-= form.select field.method_name, field.enum, {:include_blank => true}, field._html_attributes.reverse_merge({ :placeholder => t('admin.misc.search') })
+= form.select field.method_name, field.enum, { :include_blank => true }.merge((hdv = field.html_default_value).nil? ? {} : { :selected => hdv }), field.html_attributes.reverse_merge({ :placeholder => t('admin.misc.search') })
 = form.javascript_for(field) do
   :plain
     $("#{form.jquery_namespace(field)} select").filteringSelect({});

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

@@ -1 +1 @@
-= 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, :checked => hdv })

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

@@ -3,9 +3,10 @@
 .toggle{:style => ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
     = value
-  = form.file_field(field.name, field._html_attributes)
+  = form.file_field(field.name, field.html_attributes)
 - if field.optional? && field.errors.blank? && file && field.delete_method
-  %a.label.notice{:href => '#', :onclick => "jQuery(this).siblings('[type=checkbox]').click(); jQuery(this).siblings('.toggle').toggle(); jQuery(this).toggleClass('important notice'); return false"}
+  %a.btn.btn-info{:href => '#', :'data-toggle' => 'button', :onclick => "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
+    %i.icon-white.icon-trash
     = I18n.t('admin.actions.delete.menu').capitalize + " #{field.method_name}"
   = form.check_box(field.delete_method, :style => 'display:none;' )
 - if field.cache_method

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

@@ -2,7 +2,7 @@
   related_id = params[:associations] && params[:associations][field.name.to_s]
   config = field.associated_model_config
   source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-  
+
   if form.object.new_record? && related_id.present? && related_id != 'new'
     selected = [config.abstract_model.get(related_id)]
   else
@@ -25,12 +25,14 @@
   end
 
 %input{:name => form.dom_name(field), :type => "hidden", :value => ""}
-= form.select field.method_name, collection, { :selected => selected_ids, :object => form.object }, field._html_attributes.merge({:'data-edit-url' => edit_url, :multiple => true})
+
+- selected_ids = (hdv = field.html_default_value).nil? ? selected_ids : hdv
+= form.select field.method_name, collection, { :selected => selected_ids, :object => form.object }, field.html_attributes.merge({:'data-edit-url' => edit_url, :multiple => true})
 - if authorized? :new, config.abstract_model
   - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
   - path_hash.merge!({ :associations => { field.inverse_of => (form.object.id || 'new') } }) if field.inverse_of
-  = link_to wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "create btn", :style => 'margin-left:10px'  
-  
+  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "create btn btn-info", :style => 'margin-left:10px'
+
 = form.javascript_for(field) do
   :plain
     $("#{form.jquery_namespace(field)} select").filteringMultiselect({

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

@@ -2,7 +2,7 @@
   config = field.associated_model_config
   related_id = params[:associations] && params[:associations][field.name.to_s]
   source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
-  
+
   if form.object.new_record? && related_id.present? && related_id != 'new'
     selected = config.abstract_model.get(related_id)
     selected_id = selected.id
@@ -15,20 +15,21 @@
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
 
   edit_url = authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :modal => true, :id => '__ID__') : ''
-  
+
   xhr = !field.associated_collection_cache_all
 
   collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(config.object_label_method), o.id] }
 
-= form.select field.method_name, collection, { :selected => selected_id, :include_blank => true }, field._html_attributes.reverse_merge({:placeholder => t('admin.misc.search')})
+- selected_id = (hdv = field.html_default_value).nil? ? selected_id : hdv
+= form.select field.method_name, collection, { :selected => selected_id, :include_blank => true }, field.html_attributes.reverse_merge({:placeholder => t('admin.misc.search')})
 
 - if authorized? :new, config.abstract_model
   - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
   - path_hash.merge!({ :associations => { field.inverse_of => (form.object.id || 'new') } }) if field.inverse_of
-  = link_to wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "btn create", :style => 'float:left; margin-left:10px'
+  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "btn btn-info create", :style => 'float:left; margin-left:10px'
 
 - if edit_url.present?
-  = link_to wording_for(:link, :edit, config.abstract_model), '#', :data => { :link => edit_url }, :class => "btn update #{field.value.nil? && 'disabled'}", :style => 'float:left; margin-left:10px'
+  = link_to "<i class=\"icon-pencil icon-white\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', :data => { :link => edit_url }, :class => "btn btn-info update #{field.value.nil? && 'disabled'}", :style => 'float:left; margin-left:10px'
 
 = form.javascript_for(field) do
   :plain