rails_admin 3.0.0.beta2 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7a579fb503fcea63df297aa31f1ee3d427a1d46ccf412f767edbc2a43fb0f4
-  data.tar.gz: 9619b18103416b2c1283345687ffb14a0eb82a1839c298f03f882541b258afd9
+  metadata.gz: 5ed0d71c0798b98c4a0afdff5fa2ed48ffd05d1e0124d52ccdb371012d117479
+  data.tar.gz: ed51dc928885ae4c57e9f02a9e40cf7689731570a78efc7d1bdfbe3afbd7e298
 SHA512:
-  metadata.gz: 1bd4e2e9bc8fac24b64ffdac07f7f1270626ee74a1532d04232d52a96dba1ec6a63c6a57986505b15e1af243e2bf92baa5adc95afa1cb0e1b138f265b24a7351
-  data.tar.gz: 331c69272d8b682b3a1c9974725f3bc1785bc55fd4c0efb43140b9430e0d13a6ea3c4e32396612b611a88a2f9e49b82fb34bde543dc7acf9bb664a4561412d00
+  metadata.gz: ff6f4ff15d8722cb44f4bbfeb8375c6c68c24be7cfadaa1e0b2dcf323f43321bc40296c60cdbcd2a9ecc28685261ca5ef00b046481394044d3f6f3970e6ddf86
+  data.tar.gz: a23d415f1987f61dd8d5bf7dcac7d2d7307e602a0afe3d16c94d8a639ad952135154cc31728bd1f41e181e0f1a829d39afb8898c6fc1a301a75fa64649b117d7

data/README.md

@@ -1,17 +1,15 @@
 # RailsAdmin
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
-[![Build Status](https://img.shields.io/github/workflow/status/sferik/rails_admin/Test)][ghactions]
-[![Coverage Status](https://img.shields.io/coveralls/sferik/rails_admin.svg)][coveralls]
-[![Inline docs](http://inch-ci.org/github/sferik/rails_admin.svg)][inch]
-[![Code Climate](https://codeclimate.com/github/sferik/rails_admin.svg)][codeclimate]
+[![Build Status](https://img.shields.io/github/workflow/status/railsadminteam/rails_admin/Test)][ghactions]
+[![Coverage Status](https://img.shields.io/coveralls/railsadminteam/rails_admin.svg)][coveralls]
+[![Code Climate](https://codeclimate.com/github/railsadminteam/rails_admin.svg)][codeclimate]
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver)][semver]
 
 [gem]: https://rubygems.org/gems/rails_admin
 [ghactions]: https://github.com/railsadminteam/rails_admin/actions
-[coveralls]: https://coveralls.io/r/sferik/rails_admin
-[inch]: http://inch-ci.org/github/sferik/rails_admin
-[codeclimate]: https://codeclimate.com/github/sferik/rails_admin
+[coveralls]: https://coveralls.io/r/railsadminteam/rails_admin
+[codeclimate]: https://codeclimate.com/github/railsadminteam/rails_admin
 [semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
@@ -47,7 +45,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.beta2', '< 4']`
+1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc3', '< 4']`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked
@@ -103,7 +101,6 @@ If you think you found a bug in RailsAdmin, you can [submit an issue](https://gi
 
 This library aims to support and is [tested against][ghactions] the following Ruby implementations:
 
-- Ruby 2.5
 - Ruby 2.6
 - Ruby 2.7
 - Ruby 3.0

data/Rakefile

@@ -22,3 +22,14 @@ rescue LoadError
 end
 
 task default: %i[spec rubocop]
+
+namespace :vendorize do
+  desc 'Tasks for vendorizing assets'
+
+  task :flatpickr do
+    Dir.chdir(__dir__)
+    flatpickr = File.read('node_modules/flatpickr/dist/flatpickr.js')
+    locales = Dir.glob('node_modules/flatpickr/dist/l10n/*.js').map { |f| File.read(f) }
+    File.write('vendor/assets/javascripts/rails_admin/flatpickr-with-locales.js', ([flatpickr] + locales).join("\n"))
+  end
+end

data/app/assets/javascripts/{rails_admin.js → rails_admin/application.js}

@@ -1,13 +1,13 @@
 //=  require 'rails-ujs'
+//=  require 'turbo'
 //=  require 'rails_admin/jquery3'
-//=  require 'rails_admin/jquery.pjax'
 //=  require 'jquery_nested_form'
 //=  require 'rails_admin/jquery-ui/effect'
 //=  require 'rails_admin/jquery-ui/widgets/sortable'
 //=  require 'rails_admin/jquery-ui/widgets/autocomplete'
-//=  require 'rails_admin/moment-with-locales'
-//=  require 'rails_admin/bootstrap-datetimepicker'
-//=  require 'rails_admin/bootstrap/bootstrap'
+//=  require 'rails_admin/flatpickr-with-locales'
+//=  require 'rails_admin/popper'
+//=  require 'rails_admin/bootstrap'
 
 //=  require 'rails_admin/filter-box'
 //=  require 'rails_admin/filtering-multiselect'

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

@@ -0,0 +1,31 @@
+@charset "UTF-8";
+
+/***  Variables  ***/
+
+@import "rails_admin/custom/variables";
+@import "rails_admin/styles/base/variables";
+
+/***  Mixins  ***/
+
+@import "rails_admin/styles/base/mixins";
+@import "rails_admin/custom/mixins";
+
+/***  Bootstrap ***/
+
+@import "rails_admin/bootstrap/bootstrap";
+
+/***  Libraries  ***/
+
+@import "rails_admin/flatpickr";
+@import "rails_admin/styles/filtering-select";
+@import "rails_admin/styles/filtering-multiselect";
+@import "rails_admin/styles/widgets";
+
+/*** Font-awesome ***/
+
+@import "rails_admin/font-awesome";
+
+/***  RailsAdmin Theming  ***/
+
+@import "rails_admin/styles/base/theming";
+@import "rails_admin/custom/theming";

data/app/controllers/rails_admin/application_controller.rb

@@ -32,7 +32,7 @@ module RailsAdmin
     end
 
     def get_object
-      raise RailsAdmin::ObjectNotFound unless (@object = @abstract_model.get(params[:id]))
+      raise RailsAdmin::ObjectNotFound unless (@object = @abstract_model.get(params[:id], @model_config.scope))
     end
 
     def to_model_name(param)

data/app/controllers/rails_admin/main_controller.rb

@@ -4,20 +4,17 @@ module RailsAdmin
     include RailsAdmin::MainHelper
     include RailsAdmin::ApplicationHelper
 
-    layout :get_layout
-
     before_action :check_for_cancel
 
     def bulk_action
       get_model
-      process(params[:bulk_action]) if params[:bulk_action].in?(RailsAdmin::Config::Actions.all(controller: self, abstract_model: @abstract_model).select(&:bulkable?).collect(&:route_fragment))
+      process(params[:bulk_action]) if params[:bulk_action].in?(RailsAdmin::Config::Actions.all(:bulkable, controller: self, abstract_model: @abstract_model).collect(&:route_fragment))
     end
 
     def list_entries(model_config = @model_config, auth_scope_key = :index, additional_scope = get_association_scope_from_params, pagination = !(params[:associated_collection] || params[:all] || params[:bulk_ids]))
-      scope = model_config.abstract_model.scoped
-      if auth_scope = @authorization_adapter&.query(auth_scope_key, model_config.abstract_model)
-        scope = scope.merge(auth_scope)
-      end
+      scope = model_config.scope
+      auth_scope = @authorization_adapter&.query(auth_scope_key, model_config.abstract_model)
+      scope = scope.merge(auth_scope) if auth_scope
       scope = scope.instance_eval(&additional_scope) if additional_scope
       get_collection(model_config, scope, pagination)
     end
@@ -49,33 +46,27 @@ module RailsAdmin
     end
 
     def respond_to_missing?(sym, include_private)
-      if RailsAdmin::Config::Actions.find(name.to_sym)
+      if RailsAdmin::Config::Actions.find(sym)
         true
       else
         super
       end
     end
 
-    def get_layout
-      "rails_admin/#{request.headers['X-PJAX'] ? 'pjax' : 'application'}"
-    end
-
     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
 
     def get_sort_hash(model_config)
       abstract_model = model_config.abstract_model
-      params[:sort] = params[:sort_reverse] = nil unless model_config.list.fields.collect { |f| f.name.to_s }.include? params[:sort]
-      params[:sort] ||= model_config.list.sort_by.to_s
-      params[:sort_reverse] ||= 'false'
-
       field = model_config.list.fields.detect { |f| f.name.to_s == params[:sort] }
+
       column =
-        if field.nil? || field.sortable == true # use params[:sort] on the base table
-          "#{abstract_model.table_name}.#{params[:sort]}"
-        elsif field.sortable == false # use default sort, asked field is not sortable
+        if field.nil? || field.sortable == false # use default sort, asked field does not exist or is not sortable
+          field = model_config.list.possible_fields.detect { |f| f.name == model_config.list.sort_by.to_sym }
           "#{abstract_model.table_name}.#{model_config.list.sort_by}"
+        elsif field.sortable == true # use the given field
+          "#{abstract_model.table_name}.#{field.name}"
         elsif (field.sortable.is_a?(String) || field.sortable.is_a?(Symbol)) && field.sortable.to_s.include?('.') # just provide sortable, don't do anything smart
           field.sortable
         elsif field.sortable.is_a?(Hash) # just join sortable hash, don't do anything smart
@@ -86,8 +77,8 @@ module RailsAdmin
           "#{abstract_model.table_name}.#{field.sortable}"
         end
 
-      reversed_sort = (field ? field.sort_reverse? : model_config.list.sort_reverse?)
-      {sort: column, sort_reverse: (params[:sort_reverse] == reversed_sort.to_s)}
+      params[:sort_reverse] ||= 'false'
+      {sort: column, sort_reverse: (params[:sort_reverse] == (field&.sort_reverse&.to_s || 'true'))}
     end
 
     def redirect_to_on_success

data/app/helpers/rails_admin/application_helper.rb

@@ -20,17 +20,24 @@ module RailsAdmin
     end
 
     def edit_user_link
-      return nil unless _current_user.respond_to?(:email)
-      return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
-
-      content = [
-        RailsAdmin::Config.show_gravatar && _current_user.email.present? && image_tag("#{request.ssl? ? 'https://secure' : 'http://www'}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: ''),
-        content_tag(:span, _current_user.email),
-      ].compact.join.html_safe
-      if (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
-        link_to content, rails_admin.url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main')
+      return nil unless _current_user.try(:email).present?
+      return nil unless (abstract_model = RailsAdmin.config(_current_user.class).abstract_model)
+
+      edit_action = action(:edit, abstract_model, _current_user)
+      authorized = edit_action.try(:authorized?)
+      content = edit_user_link_label
+
+      if authorized
+        edit_url = rails_admin.url_for(
+          action_name: edit_action.action_name,
+          model_name: abstract_model.to_param,
+          controller: 'rails_admin/main',
+          id: _current_user.id,
+        )
+
+        link_to content, edit_url, class: 'nav-link'
       else
-        content_tag :span, content
+        content_tag :span, content, class: 'nav-link'
       end
     end
 
@@ -87,7 +94,7 @@ module RailsAdmin
           url = rails_admin.url_for(action: node.action_name, controller: 'rails_admin/main')
           nav_icon = node.link_icon ? %(<i class="#{node.link_icon}"></i>).html_safe : ''
           content_tag :li do
-            link_to nav_icon + " " + wording_for(:menu, node), url, class: "pjax"
+            link_to nav_icon + " " + wording_for(:menu, node), url, class: "nav-link"
           end
         end.join.html_safe
         label ||= t('admin.misc.root_navigation')
@@ -98,7 +105,7 @@ module RailsAdmin
 
     def static_navigation
       li_stack = RailsAdmin::Config.navigation_static_links.collect do |title, url|
-        content_tag(:li, link_to(title.to_s, url, target: '_blank', rel: 'noopener noreferrer'))
+        content_tag(:li, link_to(title.to_s, url, target: '_blank', rel: 'noopener noreferrer', class: 'nav-link'))
       end.join
 
       label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
@@ -114,7 +121,7 @@ module RailsAdmin
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
         li = content_tag :li, data: {model: model_param} do
-          link_to nav_icon + node.label_plural, url, class: "pjax#{level_class}"
+          link_to nav_icon + node.label_plural, url, class: "nav-link#{level_class}"
         end
         child_nodes = parent_groups[abstract_model.model_name]
         child_nodes ? li + navigation(parent_groups, child_nodes, level + 1) : li
@@ -130,11 +137,11 @@ module RailsAdmin
         parent_actions.collect do |a|
           am = a.send(:eval, 'bindings[:abstract_model]')
           o = a.send(:eval, 'bindings[:object]')
-          content_tag(:li, class: current_action?(a, am, o) && 'active') do
+          content_tag(:li, class: ['breadcrumb-item', current_action?(a, am, o) && 'active']) do
             if current_action?(a, am, o)
               wording_for(:breadcrumb, a, am, o)
             elsif a.http_methods.include?(:get)
-              link_to rails_admin.url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
+              link_to rails_admin.url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)) do
                 wording_for(:breadcrumb, a, am, o)
               end
             else
@@ -151,11 +158,10 @@ module RailsAdmin
       actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) && a.show_in_menu }
       actions.collect do |action|
         wording = wording_for(:menu, action)
-        li_class = ['icon', "#{action.key}_#{parent}_link"].
-                   concat(current_action?(action) ? ['active'] : []).
+        li_class = ['nav-item', 'icon', "#{action.key}_#{parent}_link"].
                    concat(action.enabled? ? [] : ['disabled'])
         content_tag(:li, {class: li_class}.merge(only_icon ? {title: wording, rel: 'tooltip'} : {})) do
-          label = content_tag(:i, '', {class: action.link_icon}) + content_tag(:span, wording, (only_icon ? {style: 'display:none'} : {}))
+          label = content_tag(:i, '', {class: action.link_icon}) + ' ' + content_tag(:span, wording, (only_icon ? {style: 'display:none'} : {}))
           if action.enabled? || !only_icon
             href =
               if action.enabled?
@@ -163,7 +169,7 @@ module RailsAdmin
               else
                 'javascript:void(0)'
               end
-            content_tag(:a, label, {href: href, target: action.link_target}.merge(action.pjax? ? {class: ['pjax']} : {}))
+            content_tag(:a, label, {href: href, target: action.link_target, class: ['nav-link', current_action?(action) && 'active', !action.enabled? && 'disabled'].compact})
           else
             content_tag(:span, label)
           end
@@ -175,12 +181,12 @@ module RailsAdmin
       actions = actions(:bulkable, abstract_model)
       return '' if actions.empty?
 
-      content_tag :li, class: 'dropdown', style: 'float:right' do
-        content_tag(:a, class: 'dropdown-toggle', data: {toggle: 'dropdown'}, href: '#') { t('admin.misc.bulk_menu_title').html_safe + ' ' + '<b class="caret"></b>'.html_safe } +
+      content_tag :li, class: 'nav-item dropdown dropdown-menu-end' do
+        content_tag(:a, class: 'nav-link dropdown-toggle', data: {'bs-toggle': 'dropdown'}, href: '#') { t('admin.misc.bulk_menu_title').html_safe + ' ' + '<b class="caret"></b>'.html_safe } +
           content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
             actions.collect do |action|
               content_tag :li do
-                link_to wording_for(:bulk_link, action, abstract_model), '#', class: 'bulk-link', data: {action: action.action_name}
+                link_to wording_for(:bulk_link, action, abstract_model), '#', class: 'dropdown-item bulk-link', data: {action: action.action_name}
               end
             end.join.html_safe
           end
@@ -207,5 +213,20 @@ module RailsAdmin
       end
       raise e
     end
+
+  private
+
+    def edit_user_link_label
+      [
+        RailsAdmin::Config.show_gravatar &&
+          image_tag(gravatar_url(_current_user.email), alt: ''),
+
+        content_tag(:span, _current_user.email),
+      ].filter(&:present?).join.html_safe
+    end
+
+    def gravatar_url(email)
+      "https://secure.gravatar.com/avatar/#{Digest::MD5.hexdigest email}?s=30"
+    end
   end
 end

data/app/helpers/rails_admin/form_builder.rb

@@ -43,9 +43,9 @@ module RailsAdmin
       # do not show nested field if the target is the origin
       return if nested_field_association?(field, nested_in)
 
-      @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
+      @template.content_tag(:div, class: "control-group row mb-3 #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
         if field.label
-          label(field.method_name, field.label, class: 'col-sm-2 control-label') +
+          label(field.method_name, field.label, class: 'col-sm-2 col-form-label text-md-end') +
             (field.nested_form ? field_for(field) : input_for(field))
         else
           field.nested_form ? field_for(field) : input_for(field)
@@ -68,7 +68,7 @@ module RailsAdmin
     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(:div, field.help, class: 'form-text') : ''.html_safe
     end
 
     def field_for(field)

data/app/helpers/rails_admin/main_helper.rb

@@ -52,7 +52,7 @@ module RailsAdmin
           when :enum
             options[:select_options] = options_for_select(field.with(object: @abstract_model.model.new).enum, filter_hash['v'])
           when :date, :datetime, :time
-            options[:datetimepicker_format] = field.momentjs_format
+            options[:datetimepicker_options] = field.datepicker_options
           end
           options[:label] = field.label
           options[:name]  = field.name

data/app/views/kaminari/ra-twitter-bootstrap/_gap.html.erb

@@ -1,5 +1,5 @@
-<li class="disabled">
-  <a href="#">
+<li class="page-item disabled">
+  <a href="#" class="page-link">
     <%= raw(t 'admin.pagination.truncate') %>
   </a>
 </li>

data/app/views/kaminari/ra-twitter-bootstrap/_next_page.html.erb

@@ -1,9 +1,9 @@
 <% if current_page.last? %>
-  <li class="next disabled">
-    <%= link_to raw(t 'admin.pagination.next'), '#' %>
+  <li class="page-item next disabled">
+    <%= link_to raw(t 'admin.pagination.next'), '#', class: 'page-link' %>
   </li>
 <% else %>
-  <li class="next">
-    <%= link_to raw(t 'admin.pagination.next'), url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item next">
+    <%= link_to raw(t 'admin.pagination.next'), url, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/_page.html.erb

@@ -1,9 +1,9 @@
 <% if page.current? %>
-  <li class="active">
-    <%= link_to page, url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item active">
+    <%= link_to page, url, class: 'page-link' %>
   </li>
 <% else %>
-  <li>
-    <%= link_to page, url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item">
+    <%= link_to page, url, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/_paginator.html.erb

@@ -1,13 +1,15 @@
 <%= paginator.render do %>
-  <ul class="pagination">
-    <%= prev_page_tag %>
-    <% each_page do |page| %>
-      <% if page.left_outer? or page.right_outer? or page.inside_window? %>
-        <%= page_tag page %>
-      <% elsif !page.was_truncated? %>
-        <%= gap_tag %>
+  <nav aria-label="Page navigation">
+    <ul class="pagination">
+      <%= prev_page_tag %>
+      <% each_page do |page| %>
+        <% if page.left_outer? or page.right_outer? or page.inside_window? %>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? %>
+          <%= gap_tag %>
+        <% end %>
       <% end %>
-    <% end %>
-    <%= next_page_tag %>
-  </ul>
+      <%= next_page_tag %>
+    </ul>
+  </nav>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/_prev_page.html.erb

@@ -1,9 +1,9 @@
 <% if current_page.first? %>
-  <li class="prev disabled">
-    <%= link_to raw(t 'admin.pagination.previous'), '#' %>
+  <li class="page-item prev disabled">
+    <%= link_to raw(t 'admin.pagination.previous'), '#', class: 'page-link' %>
   </li>
 <% else %>
-  <li class="prev">
-    <%= link_to raw(t 'admin.pagination.previous'), url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item prev">
+    <%= link_to raw(t 'admin.pagination.previous'), url, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_next_page.html.erb

@@ -1,9 +1,9 @@
 <% if current_page.last? %>
-  <li class="next disabled">
-    <%= link_to raw(t 'admin.pagination.next'), '#' %>
+  <li class="page-item next disabled">
+    <%= link_to raw(t 'admin.pagination.next'), '#', class: 'page-link' %>
   </li>
 <% else %>
-  <li class="next">
-    <%= link_to raw(t 'admin.pagination.next'), url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item next">
+    <%= link_to raw(t 'admin.pagination.next'), url, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_paginator.html.erb

@@ -1,6 +1,8 @@
 <%= paginator.render do %>
-  <ul class="pagination">
-    <%= prev_page_tag if !current_page.first? %>
-    <%= next_page_tag %>
-  </ul>
+  <nav aria-label="Page navigation">
+    <ul class="pagination">
+      <%= prev_page_tag if !current_page.first? %>
+      <%= next_page_tag %>
+    </ul>
+  </nav>
 <% end %>

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_prev_page.html.erb

@@ -1,9 +1,9 @@
 <% if current_page.first? %>
-  <li class="prev disabled">
-    <%= link_to raw(t 'admin.pagination.previous'), '#' %>
+  <li class="page-item prev disabled">
+    <%= link_to raw(t 'admin.pagination.previous'), '#', class: 'page-link' %>
   </li>
 <% else %>
-  <li class="prev">
-    <%= link_to raw(t 'admin.pagination.previous'), url, class: (remote ? 'pjax' : '') %>
+  <li class="page-item prev">
+    <%= link_to raw(t 'admin.pagination.previous'), url, class: 'page-link' %>
   </li>
 <% end %>

data/app/views/layouts/rails_admin/_head.html.erb

@@ -9,8 +9,8 @@
   <%= javascript_pack_tag "rails_admin", async: true %>
 <% when :webpack, :sprockets %>
   <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin.css", media: :all %>
-    <%= javascript_include_tag "rails_admin.js", async: true %>
+    <%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
+    <%= javascript_include_tag "rails_admin/application.js", async: true %>
   <% end %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"

data/app/views/layouts/rails_admin/_navigation.html.erb

@@ -1,20 +1,16 @@
 <div class="container-fluid">
-  <div class="navbar-header">
-    <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#secondary-navigation">
-      <span class="sr-only">
-        <%= t('admin.toggle_navigation') %>
-      </span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-    <a class="navbar-brand pjax" href="<%= dashboard_path %>">
-      <%= _get_plugin_name[0] || 'Rails' %>
-      <small>
-        <%= _get_plugin_name[1] || 'Admin' %>
-      </small>
-    </a>
-  </div>
+  <a class="navbar-brand" href="<%= dashboard_path %>">
+    <%= _get_plugin_name[0] || 'Rails' %>
+    <small>
+      <%= _get_plugin_name[1] || 'Admin' %>
+    </small>
+  </a>
+  <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#secondary-navigation">
+    <span class="sr-only">
+      <%= t('admin.toggle_navigation') %>
+    </span>
+    <span class="navbar-toggler-icon"></span>
+  </button>
   <div class="collapse navbar-collapse" id="secondary-navigation">
     <%= render partial: 'layouts/rails_admin/secondary_navigation' %>
   </div>

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

@@ -1,23 +1,23 @@
-<ul class="nav navbar-nav navbar-right root_links">
+<ul class="navbar-nav ms-auto root_links">
   <% actions(:root).select(&:show_in_navigation).each do |action| %>
-    <li class="<%= action.action_name %>_root_link">
-      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : "" %>
+    <li class="nav-item <%= action.action_name %>_root_link">
+      <%= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: ['nav-link'] %>
     </li>
   <% end %>
   <% if main_app_root_path = (main_app.root_path rescue false) %>
-    <li>
-      <%= link_to t('admin.home.name'), main_app_root_path %>
+    <li class="nav-item">
+      <%= link_to t('admin.home.name'), main_app_root_path, class: 'nav-link' %>
     </li>
   <% end %>
   <% if _current_user %>
     <% if user_link = edit_user_link %>
-      <li class="edit_user_root_link">
+      <li class="nav-item edit_user_root_link">
         <%= user_link %>
       </li>
     <% end %>
     <% if logout_path.present? %>
-      <li>
-        <%= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-danger'), logout_path, method: logout_method %>
+      <li class="nav-item">
+        <%= link_to t('admin.misc.log_out'), logout_path, method: logout_method, class: 'nav-link label label-danger' %>
       </li>
     <% end %>
   <% end %>

data/app/views/layouts/rails_admin/_sidebar_navigation.html.erb

@@ -1,9 +1,5 @@
-<ul class="nav nav-pills nav-stacked">
+<ul class="col-sm-3 col-md-2 btn-toggle-nav list-unstyled bg-light">
   <%= main_navigation %>
-</ul>
-<ul class="nav nav-pills nav-stacked">
   <%= root_navigation %>
-</ul>
-<ul class="nav nav-pills nav-stacked">
   <%= static_navigation %>
 </ul>

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

@@ -5,20 +5,17 @@
   </head>
   <body class="rails_admin">
     <div data-i18n-options="<%= I18n.t("admin.js").to_json %>" id="admin-js"></div>
-    <div class="label label-warning" id="loading" style="display:none; position:fixed; right:20px; bottom:20px; z-index:100000">
-      <%= t('admin.loading') %>
-    </div>
-    <nav class="navbar navbar-default navbar-fixed-top">
+    <nav class="navbar navbar-expand-md fixed-top navbar-dark bg-primary border-bottom">
       <%= render "layouts/rails_admin/navigation" %>
     </nav>
     <div class="container-fluid">
       <div class="row">
-        <div class="col-sm-3 col-md-2 sidebar-nav">
+        <div class="col-sm-3 col-md-2 flex-wrap p-0">
           <%= render "layouts/rails_admin/sidebar_navigation" %>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2">
-          <div class="content" data-pjax-container="<%= true %>">
-            <%= render template: 'layouts/rails_admin/pjax' %>
+          <div class="container">
+            <%= render template: 'layouts/rails_admin/content' %>
           </div>
         </div>
       </div>