Fixed fields render for form tag

Author: Nikolay Moskvin

app/assets/javascripts/rails_admin/ra.filtering-multiselect.js

@@ -48,7 +48,7 @@
 
       this.header = $('<div class="ra-multiselect-header ui-helper-clearfix">');
 
-      this.filter = $('<input type="search" placeholder="' + this.options.regional.search + '" class="ra-multiselect-search"/>');
+      this.filter = $('<input type="search" placeholder="' + this.options.regional.search + '" class="form-control ra-multiselect-search"/>');
 
       this.header.append(this.filter);
 
@@ -68,7 +68,7 @@
 
       this.collection = $('<select multiple="multiple"></select>');
 
-      this.collection.addClass("ra-multiselect-collection");
+      this.collection.addClass("form-control ra-multiselect-collection");
 
       this.addAll = $('<a href="#" class="ra-multiselect-item-add-all"><span class="ui-icon ui-icon-circle-triangle-e"></span>' + this.options.regional.chooseAll + '</a>');
 
@@ -89,7 +89,7 @@
         this.columns.center.append(this.up).append(this.down);
       }
 
-      this.selection = $('<select class="ra-multiselect-selection" multiple="multiple"></select>');
+      this.selection = $('<select class="form-control ra-multiselect-selection" multiple="multiple"></select>');
 
 
 

app/assets/javascripts/rails_admin/ra.filtering-select.js

@@ -42,7 +42,7 @@
       var filtering_select = $('<div class="input-append filtering-select" style="float:left"></div>')
       var input = this.input = $('<input type="text">')
         .val(value)
-        .addClass("ra-filtering-select-input")
+        .addClass("form-control ra-filtering-select-input")
         .attr('style', select.attr('style'))
         .show()
         .autocomplete({

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

@@ -60,7 +60,7 @@ body.rails_admin {
         line-height: 16px;
       }
       .help-block {
-        margin-top: 0px;
+        // margin-top: 0px;
       }
       .input-prepend, .input-append {
         margin-bottom: 0px;
@@ -73,7 +73,7 @@ body.rails_admin {
         padding-top:15px;
       }
       .control-label {
-        width:145px;
+        // width:145px;
       }
       legend {
         margin-bottom:0px;

app/helpers/rails_admin/form_builder.rb

@@ -35,7 +35,8 @@ def field_wrapper_for(field, nested_in)
         # 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))
+            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,7 +45,7 @@ def field_wrapper_for(field, nested_in)
     end
 
     def input_for(field)
-      @template.content_tag(:div, class: 'controls') do
+      @template.content_tag(:div, class: 'col-sm-10 controls') do
         field_for(field) +
         errors_for(field) +
         help_for(field)
@@ -56,7 +57,7 @@ def errors_for(field)
     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)

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'})

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' })

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

@@ -7,15 +7,16 @@
   %fieldset{id: 'fields_to_export'}
     %div.control-group
       %div.controls
-        %label.checkbox{for: 'check_all'}
-          = t('admin.export.select_all_fields')
+        .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')
     %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
+      %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,21 +49,21 @@
       = 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(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
+      %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
+      .col-sm-10.controls
         = 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'))