rails_admin 3.0.0.beta2 → 3.0.0.rc3

data/app/views/layouts/rails_admin/{pjax.html.erb → content.html.erb}

@@ -1,19 +1,21 @@
 <title>
   <%= "#{@abstract_model.try(:pretty_name) || @page_name} | #{[_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' ')}" %>
 </title>
-<div class="page-header" data-model="<%= @abstract_model.to_param %>">
+<header class="py-2 m-2 border-bottom" data-model="<%= @abstract_model.to_param %>">
   <h1>
     <%= @page_name %>
   </h1>
-</div>
+</header>
 <% flash && flash.each do |key, value| %>
   <div class="<%= flash_alert_class(key) %> alert alert-dismissible">
-    <button class="close" data-dismiss="alert" type="button">&times;</button>
     <%= value %>
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
   </div>
 <% end %>
-<%= breadcrumb %>
-<ul class="nav nav-tabs">
+<nav aria-label="breadcrumb">
+  <%= breadcrumb %>
+</nav>
+<ul class="nav nav-tabs mb-3">
   <%= menu_for((@abstract_model ? (@object.try(:persisted?) ? :member : :collection) : :root), @abstract_model, @object) %>
   <%= content_for :contextual_tabs %>
 </ul>

data/app/views/layouts/rails_admin/modal.js.erb

@@ -1,7 +1,7 @@
 <% flash && flash.each do |key, value| %>
   <div class="<%= flash_alert_class(key) %> alert alert-dismissible">
-    <button class="close" data-dismiss="alert" type="button">&times;</button>
     <%= value %>
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
   </div>
 <% end %>
 <%= yield %>

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

@@ -23,7 +23,7 @@
           <% label = o.send(abstract_model.config.object_label_method) %>
           <% if show_action = action(:show, abstract_model, o) %>
             <td>
-              <%= link_to(label, url_for(action: show_action.action_name, model_name: abstract_model.to_param, id: o.id), class: 'pjax') %>
+              <%= link_to(label, url_for(action: show_action.action_name, model_name: abstract_model.to_param, id: o.id)) %>
             </td>
           <% else %>
             <td>

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

@@ -5,7 +5,7 @@
   </span>
   <% wording = object.send(@model_config.object_label_method) %>
   <% if show_action = action(:show, @abstract_model, object) %>
-    <%= link_to(wording, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: object.id), class: 'pjax') %>
+    <%= link_to(wording, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: object.id)) %>
   <% else %>
     <%= wording %>
   <% end %>
@@ -19,7 +19,7 @@
           <%= humanized_association.singularize %>
           <% wording = child.send(child_config.object_label_method) %>
           <% if child.id && (show_action = action(:show, child_config.abstract_model, child)) %>
-            <%= link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id), class: 'pjax') %>
+            <%= link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id)) %>
           <% else %>
             <%= wording %>
           <% end %>

data/app/views/rails_admin/main/_form_boolean.html.erb

@@ -1,16 +1,14 @@
 <% if field.nullable? %>
-  <div class="btn-group" data-toggle="buttons">
-    <% {'1': true, '0': false, '': nil}.each do |text, value| %>
-      <label class="<%= [field.css_classes[value], ("active" if field.form_value == value)].compact.join(' ') %> btn btn-default">
-        <%= form.radio_button field.method_name, text, field.html_attributes.reverse_merge({ checked: field.form_value == value, required: field.required}) %>
+  <div class="btn-group" role="group">
+    <% {'1': [true, 'btn-outline-success'], '0': [false, 'btn-outline-danger'], '': [nil, 'btn-outline-secondary']}.each do |text, (value, btn_class)| %>
+      <%= form.radio_button field.method_name, text, field.html_attributes.reverse_merge({ checked: field.form_value == value, required: field.required, class: 'btn-check' }) %>
+      <label for="<%= form.object_name %>_<%= field.method_name %>_<%= text %>" class="<%= field.css_classes[value] %> btn <%= btn_class %>">
         <%= field.labels[value].html_safe %>
       </label>
     <% end %>
   </div>
 <% else %>
-  <div class="checkbox">
-    <label style="display: block;">
-      <%= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), required: field.required}) %>
-    </label>
+  <div class="col-form-label">
+    <%= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), required: field.required, class: 'form-check-input' }) %>
   </div>
 <% end %>

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

@@ -1 +1,5 @@
-<%= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({class: 'form-control', value: field.form_value}) %>
+<div class="row">
+  <div class="col-sm-2">
+    <%= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({class: 'form-control', value: field.form_value}) %>
+  </div>
+</div>

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

@@ -1,9 +1,10 @@
-<div class="form-inline">
-  <div class="input-group">
-    <%= form.hidden_field(field.method_name, id: nil, value: field.form_value) %>
-    <%= form.text_field field.method_name, field.html_attributes.reverse_merge({class: 'form-control', data: {datetimepicker: true, options: field.datepicker_options.to_json}, name: nil, value: nil}) %>
-    <%= form.label(field.method_name, class: 'input-group-addon') do %>
-      <i class="fa fa-fw fa-calendar"></i>
-    <% end %>
+<div class="row">
+  <div class="col-sm-4">
+    <div class="input-group">
+      <%= form.text_field field.method_name, field.html_attributes.reverse_merge({autocomplete: 'off', class: 'form-control', data: {datetimepicker: true, options: field.datepicker_options.to_json}, value: field.form_value}) %>
+      <%= form.label(field.method_name, class: 'input-group-text') do %>
+        <i class="fa fa-fw fa-calendar"></i>
+      <% end %>
+    </div>
   </div>
 </div>

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

@@ -1,5 +1,9 @@
 <% unless field.multiple? %>
-  <%= form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search') }) %>
+  <div class="row">
+    <div class="col-sm-4">
+      <%= form.select field.method_name, field.enum, { include_blank: true }.reverse_merge({ selected: field.form_value }), field.html_attributes.reverse_merge({ data: { enumeration: true }, placeholder: t('admin.misc.search') }) %>
+    </div>
+  </div>
 <% else %>
   <%
     js_data = {

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

@@ -2,7 +2,7 @@
 <% if field.cache_method %>
   <%= form.hidden_field(field.cache_method, value: field.cache_value) %>
 <% end %>
-<div class="toggle" style="<%= ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1') %>">
+<div class="toggle mb-2" style="<%= ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1') %>">
   <% if value = field.pretty_value %>
     <%= value %>
   <% end %>

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

@@ -1,13 +1,8 @@
 <%
-  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
-    selected = form.object.send(field.name)
-  end
+  selected = form.object.send(field.name)
   selected_ids = selected.map{|s| s.send(field.associated_primary_key)}
 
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
@@ -39,11 +34,16 @@
     }
   }
 %>
-<input name="<%= form.dom_name(field) %>" type="hidden"></input>
-<% selected_ids = (hdv = field.form_default_value).nil? ? selected_ids : hdv %>
-<%= form.select field.method_name, collection, { selected: selected_ids, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true}) %>
-<% if authorized?(:new, config.abstract_model) && field.inline_add %>
-  <% path_hash = { model_name: config.abstract_model.to_param, modal: true } %>
-  <% path_hash.merge!({ associations: { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of %>
-  <%= link_to "<i class=\"fas fa-plus\"></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' %>
-<% end %>
+<div class="row">
+  <div class="col-auto">
+    <input name="<%= form.dom_name(field) %>" type="hidden" />
+    <% selected_ids = (hdv = field.form_default_value).nil? ? selected_ids : hdv %>
+    <%= form.select field.method_name, collection, { selected: selected_ids, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true}) %>
+  </div>
+  <% if authorized?(:new, config.abstract_model) && field.inline_add %>
+    <div class="col-sm-4 modal-actions">
+      <% path_hash = { model_name: config.abstract_model.to_param, modal: true }.merge!(field.associated_prepopulate_params) %>
+      <%= link_to "<i class=\"fas fa-plus\"></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' %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,24 +1,14 @@
 <%
   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.send(field.associated_primary_key)
-    selected_name = selected.send(field.associated_object_label_method)
-  else
-    selected_id = field.selected_id
-    selected_name = field.formatted_value
-  end
-
   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(field.associated_object_label_method), o.send(field.associated_primary_key)] }
+  collection = xhr ? [[field.formatted_value, field.selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
 
   js_data = {
     xhr: xhr,
@@ -26,13 +16,18 @@
   }
 %>
 
-<% selected_id = (hdv = field.form_default_value).nil? ? selected_id : hdv %>
-<%= form.select field.method_name, collection, { selected: selected_id, include_blank: true }, field.html_attributes.reverse_merge({ data: { filteringselect: true, options: js_data.to_json }, placeholder: t('admin.misc.search'), style: "float: left" }) %>
-<% if authorized?(:new, config.abstract_model) && field.inline_add %>
-  <% path_hash = { model_name: config.abstract_model.to_param, modal: true } %>
-  <% path_hash.merge!({ associations: { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of %>
-  <%= link_to "<i class=\"fas fa-plus\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "btn btn-info create", style: 'margin-left:10px' %>
-<% end %>
-<% if edit_url.present? && field.inline_edit %>
-  <%= link_to "<i class=\"fas fa-pencil-alt\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', data: { link: edit_url }, class: "btn btn-info update #{field.value.nil? && 'disabled'}", style: 'margin-left:10px' %>
-<% end %>
+<div class="row">
+  <div class="col-sm-4">
+    <% selected_id = (hdv = field.form_default_value).nil? ? field.selected_id : hdv %>
+    <%= form.select field.method_name, collection, { selected: selected_id, include_blank: true }, field.html_attributes.reverse_merge({ data: { filteringselect: true, options: js_data.to_json }, placeholder: t('admin.misc.search') }) %>
+  </div>
+  <div class="col-sm-8 mt-2 mt-md-0 modal-actions">
+    <% if authorized?(:new, config.abstract_model) && field.inline_add %>
+      <% path_hash = { model_name: config.abstract_model.to_param, modal: true }.merge!(field.associated_prepopulate_params) %>
+      <%= link_to "<i class=\"fas fa-plus\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "btn btn-info create" %>
+    <% end %>
+    <% if edit_url.present? && field.inline_edit %>
+      <%= link_to "<i class=\"fas fa-pencil-alt\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', data: { link: edit_url }, class: "btn btn-info update ms-2#{' disabled' if field.value.nil?}" %>
+    <% end %>
+  </div>
+</div>

data/app/views/rails_admin/main/_form_multiple_file_upload.html.erb

@@ -1,5 +1,5 @@
 <% field.attachments.each_with_index do |attachment, i| %>
-  <div class="<%= field.reorderable? ? 'sortables' : '' %> toggle">
+  <div class="<%= field.reorderable? ? 'sortables' : '' %> toggle mb-2">
     <%= attachment.pretty_value %>
     <% if field.delete_method || field.keep_method %>
       <a class="btn btn-info btn-remove-image" data-toggle="button" href="#" role="button">

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

@@ -1,6 +1,6 @@
 <div class="controls col-sm-10" data-nestedmany="true">
   <div class="btn-group">
-    <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-target="<%= form.jquery_namespace(field) %> > .tab-content, <%= form.jquery_namespace(field) %> > .controls > .nav" data-toggle="button">
+    <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-bs-target="<%= form.jquery_namespace(field) %> .collapse" data-bs-toggle="collapse" role="button">
       <i class="fas"></i>
     </a>
     <% unless field.nested_form[:update_only] || !field.inline_add %>
@@ -9,12 +9,12 @@
   </div>
   <%= form.errors_for(field) %>
   <%= form.help_for(field) %>
-  <ul class="nav nav-tabs"></ul>
+  <ul class="nav nav-tabs collapse"></ul>
 </div>
-<div class="tab-content">
+<div class="tab-content collapse">
   <%= form.fields_for field.name do |nested_form| %>
     <% if field.nested_form[:allow_destroy] || nested_form.options[:child_index] == "new_#{field.name}" %>
-      <%= nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="fas fa-trash"></i></span>'.html_safe %>
+      <%= nested_form.link_to_remove '<span class="btn btn-danger"><i class="fas fa-trash"></i></span>'.html_safe %>
     <% end %>
     <%= nested_form.generate({action: :nested, model_config: field.associated_model_config, nested_in: field }) %>
   <% end %>

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

@@ -1,7 +1,7 @@
 <div class="controls col-sm-10" data-nestedone="true">
-  <ul class="nav" style="margin-bottom:0px; display:none"></ul>
+  <ul class="nav collapse"></ul>
   <div class="btn-group">
-    <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-target="<%= form.jquery_namespace(field) %> > .tab-content">
+    <a class="<%= (field.active? ? 'active' : '') %> btn btn-info toggler" data-bs-target="<%= form.jquery_namespace(field) %> .collapse" data-bs-toggle="collapse" role="button">
       <i class="fas"></i>
     </a>
     <% unless field.nested_form[:update_only] || !field.inline_add %>
@@ -11,10 +11,10 @@
   <%= form.errors_for(field) %>
   <%= form.help_for(field) %>
 </div>
-<div class="tab-content">
+<div class="tab-content collapse">
   <%= form.fields_for field.name do |nested_form| %>
     <% if field.nested_form[:allow_destroy] %>
-      <%= nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="fas fa-trash"></i></span>'.html_safe %>
+      <%= nested_form.link_to_remove '<span class="btn btn-danger"><i class="fas fa-trash"></i></span>'.html_safe %>
     <% end %>
     <%= nested_form.generate({action: :nested, model_config: field.associated_model_config, nested_in: field }) %>
   <% end %>

data/app/views/rails_admin/main/_form_polymorphic_association.html.erb

@@ -18,10 +18,15 @@
     })
   end
 %>
-<div class="form-inline">
-  <% js_data.each do |model, value| %>
-    <div data-options="<%= value.to_json %>" id="<%= model %>-js-options"></div>
-  <% end %>
-  <%= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-control", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }, style: "float: left; margin-right: 10px;" %>
-  <%= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control", data: { filteringselect: true, options: js_data[selected_type.try(:downcase)] || default_options }, placeholder: 'Search' %>
+
+<div class="row">
+  <div class="col-sm-3">
+    <% js_data.each do |model, value| %>
+      <div data-options="<%= value.to_json %>" id="<%= model %>-js-options"></div>
+    <% end %>
+    <%= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-select", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }, style: "float: left; margin-right: 10px;" %>
+  </div>
+  <div class="col-sm-4">
+    <%= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control", data: { filteringselect: true, options: js_data[selected_type.try(:downcase)] || default_options }, placeholder: 'Search' %>
+  </div>
 </div>

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

@@ -1,22 +1,22 @@
-<div class="form-group form-actions">
-  <div class="col-sm-offset-2 col-sm-10">
-    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>"></input>
-    <button class="btn btn-primary" data-disable-with="<%= t("admin.form.save") %>" name="_save" type="submit">
+<div class="form-actions row justify-content-end my-3">
+  <div class="col-sm-10">
+    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
+    <button class="btn btn-primary" data-disable-with="<%= t("admin.form.save") %>" name="_save" type="submit"<%= ' disabled' unless @action.enabled? %>>
       <i class="fas fa-check"></i>
       <%= t("admin.form.save") %>
     </button>
     <span class="extra_buttons">
-      <% if authorized? :new, @abstract_model %>
+      <% if @action.enabled? && authorized?(:new, @abstract_model) %>
         <button class="btn btn-info" data-disable-with="<%= t("admin.form.save_and_add_another") %>" name="_add_another" type="submit">
           <%= t("admin.form.save_and_add_another") %>
         </button>
       <% end %>
-      <% if authorized? :edit, @abstract_model %>
-        <button class="btn btn-info" data-disable-with="<%= t("admin.form.save_and_edit") %>" name="_add_edit" type="submit">
+      <% if @action.enabled? && authorized?(:edit, @abstract_model) %>
+        <button class="btn btn-info" data-disable-with="<%= t("admin.form.save_and_edit") %>" name="_add_edit" type="submit"<%= ' disabled' unless @action.enabled? %>>
           <%= t("admin.form.save_and_edit") %>
         </button>
       <% end %>
-      <button class="btn btn-default" data-disable-with="<%= t("admin.form.cancel") %>" formnovalidate="<%= true %>" name="_continue" type="submit">
+      <button class="btn btn-light" data-disable-with="<%= t("admin.form.cancel") %>" formnovalidate="<%= true %>" name="_continue" type="submit">
         <i class="fas fa-times"></i>
         <%= t("admin.form.cancel") %>
       </button>

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

@@ -6,7 +6,7 @@
 </ul>
 <%= form_tag bulk_delete_path(model_name: @abstract_model.to_param, bulk_ids: @objects.map(&:id)), method: :delete do %>
   <div class="form-actions">
-    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>"></input>
+    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
     <button class="btn btn-danger" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
       <i class="fas fa-check"></i>
       <%= t("admin.form.confirmation") %>

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

@@ -24,7 +24,7 @@
             <% active = last_created.try(:today?) %>
             <td>
               <span class="show">
-                <%= link_to abstract_model.config.label_plural, index_path, class: 'pjax' %>
+                <%= link_to abstract_model.config.label_plural, index_path %>
               </span>
             </td>
             <td>
@@ -35,8 +35,8 @@
             <td>
               <% count = @count[abstract_model.model.name] %>
               <% percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1 %>
-              <div class="progress-<%= get_indicator(percent) %> <%= active && 'active progress-striped' %> progress" style="margin-bottom:0px">
-                <div class="progress-bar-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= ([1.0, percent].max.to_i * 20) %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
+              <div class="<%= active ? 'active progress-bar-striped ' : '' %>progress" style="margin-bottom:0px">
+                <div class="bg-<%= get_indicator(percent) %> progress-bar animate-width-to" data-animate-length="<%= ([1.0, percent].max.to_i * 20) %>" data-animate-width-to="<%= [2.0, percent].max.to_i %>%" style="width:2%">
                   <%= @count[abstract_model.model.name] %>
                 </div>
               </div>
@@ -52,7 +52,7 @@
     </tbody>
   </table>
 <% end %>
-<% if @auditing_adapter && authorized?(:history_index) %>
+<% if @history && authorized?(:history_index) %>
   <div class="block" id="block-tables">
     <div class="content">
       <h2>

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

@@ -7,7 +7,7 @@
   <%= render partial: "delete_notice", object: @object %>
 </ul>
 <%= form_for(@object, url: delete_path(model_name: @abstract_model.to_param, id: @object.id), html: {method: "delete"}) do %>
-  <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>"></input>
+  <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
   <div class="form-actions">
     <button class="btn btn-danger" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
       <i class="fas fa-check"></i>

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

@@ -1,3 +1,3 @@
-<%= 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| %>
+<%= rails_admin_form_for @object, url: edit_path(@abstract_model, @object.id), as: @abstract_model.param_key, html: { method: "put", multipart: true, class: "main", data: { title: @page_name } } do |form| %>
   <%= form.generate action: :update %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <% 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, controller: self.controller).visible_fields %>
-<%= form_tag export_path(params.merge(all: true)), method: 'post', class: 'form-horizontal' do %>
-  <input name="send_data" type="hidden" value="true">/</input>
-  <fieldset id="fields_to_export">
+<%= form_tag export_path(params.merge(all: true)), method: 'post', class: "main", data: {turbo: false} do %>
+  <input name="send_data" type="hidden" value="true" />
+  <fieldset id="fields_to_export" class="mb-3">
     <legend>
       <i class="fas fa-chevron-down"></i>
       <%= t('admin.export.select') %>
@@ -19,18 +19,18 @@
         </div>
       </div>
     </div>
-    <div class="form-group control-group">
+    <div class="control-group row">
       <div class="col-sm-12">
-        <div class="well well-sm reverse-selection" rel="tooltip" style="margin: 0; cursor: pointer;" title="<%= t('admin.export.click_to_reverse_selection') %>">
-          <b>
-            <%= t('admin.export.fields_from', name: @model_config.label_plural.downcase) %>
-          </b>
+        <div class="card bg-light my-2 reverse-selection" rel="tooltip" role="button" title="<%= t('admin.export.click_to_reverse_selection') %>">
+          <div class="card-body p-2">
+            <b><%= t('admin.export.fields_from', name: @model_config.label_plural.downcase) %></b>
+          </div>
         </div>
         <div class="controls">
           <div class="row">
             <% visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field| %>
               <% list = field.virtual? ? 'methods' : 'only' %>
-              <div class="checkbox col-sm-3">
+              <div class="checkbox col-sm-3 my-1">
                 <% 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}" } %>
@@ -55,18 +55,18 @@
     </div>
     <% 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? } %>
-      <div class="form-group control-group">
+      <div class="control-group row">
         <div class="col-sm-12">
-          <div class="well well-sm reverse-selection" rel="tooltip" style="margin: 0; cursor: pointer;" title="<%= t('admin.export.click_to_reverse_selection') %>">
-            <b>
-              <%= t('admin.export.fields_from_associated', name: field.label.downcase) %>
-            </b>
+          <div class="card bg-light my-2 reverse-selection" rel="tooltip" role="button" title="<%= t('admin.export.click_to_reverse_selection') %>">
+            <div class="card-body p-2">
+              <b><%= t('admin.export.fields_from_associated', name: field.label.downcase) %></b>
+            </div>
           </div>
           <div class="controls">
             <div class="row">
               <% fields.each do |associated_model_field| %>
                 <% list = associated_model_field.virtual? ? 'methods' : 'only' %>
-                <div class="checkbox col-sm-3">
+                <div class="checkbox col-sm-3 my-1">
                   <label 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_field.label %>
@@ -84,49 +84,52 @@
       <i class="fas fa-chevron-down"></i>
       <%= t('admin.export.options_for', name: 'csv') %>
     </legend>
-    <div class="form-group control-group">
+    <div class="control-group row">
       <% guessed_encoding = @abstract_model.encoding %>
-      <label class="col-sm-2 control-label" for="csv_options_encoding_to">
+      <label class="col-sm-2 col-form-label text-md-end" for="csv_options_encoding_to">
         <%= t('admin.export.csv.encoding_to') %>
       </label>
       <div class="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(Encoding.name_list.sort), include_blank: true, placeholder: t('admin.misc.search'), :'data-enumeration' => true %>
-        <p class="help-block">
+        <div class="w-50">
+          <%= select_tag 'csv_options[encoding_to]', options_for_select(Encoding.name_list.sort), include_blank: true, placeholder: t('admin.misc.search'), :'data-enumeration' => true %>
+        </div>
+        <p class="form-text">
           <%= t('admin.export.csv.encoding_to_help', name: guessed_encoding) %>
         </p>
       </div>
     </div>
-    <div class="form-group control-group">
-      <label class="col-sm-2 control-label" for="csv_options_skip_header">
+    <div class="control-group row">
+      <label class="col-sm-2 col-form-label text-md-end" for="csv_options_skip_header">
         <%= t('admin.export.csv.skip_header') %>
       </label>
       <div class="col-sm-10 controls">
-        <div class="checkbox">
-          <label style="display: block;">
+        <div class="col-form-label">
+          <label>
             <%= check_box_tag 'csv_options[skip_header]', 'true' %>
           </label>
         </div>
-        <p class="help-block">
+        <p class="form-text">
           <%= t('admin.export.csv.skip_header_help') %>
         </p>
       </div>
     </div>
-    <div class="form-group control-group">
-      <label class="col-sm-2 control-label" for="csv_options_generator_col_sep">
+    <div class="control-group row">
+      <label class="col-sm-2 col-form-label text-md-end" for="csv_options_generator_col_sep">
         <%= t('admin.export.csv.col_sep') %>
       </label>
       <div class="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'" }), placeholder: t('admin.misc.search'), :'data-enumeration' => true %>
-        <p class="help-block">
+        <div class="w-50">
+          <%= select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" }), placeholder: t('admin.misc.search'), :'data-enumeration' => true %>
+        </div>
+        <p class="form-text">
           <%= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep')) %>
         </p>
       </div>
     </div>
   </fieldset>
-  <div class="form-group form-actions">
+  <div class="form-actions row justify-content-end mb-3">
     <div class="col-sm-offset-2 col-sm-10">
-      <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>"></input>
+      <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>" />
       <button class="btn btn-primary" name="csv" type="submit">
         <i class="fas fa-check"></i>
         <%= t("admin.export.confirmation", name: 'csv') %>
@@ -137,7 +140,7 @@
       <button class="btn btn-info" name="xml" type="submit">
         <%= t("admin.export.confirmation", name: 'xml') %>
       </button>
-      <button class="btn" name="_continue" type="submit">
+      <button class="btn btn-light" name="_continue" type="submit">
         <i class="fas fa-times"></i>
         <%= t("admin.form.cancel") %>
       </button>