blacklight-spotlight 3.6.0.beta9 → 4.0.0

data/app/views/spotlight/admin_users/index.html.erb

@@ -13,12 +13,12 @@
           <tr>
             <td class="<%= 'invite-pending' if user.invite_pending? %>">
               <%= user.email %>
-              <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
+              <span class='badge badge-warning bg-warning pending-label'><%= t('.pending') %></span>
             </td>
             <td>
               <%= link_to(t('.destroy'), admin_user_path(user),
                     data: { method: :delete, turbo_method: :delete },
-                    class: 'btn btn-sm btn-danger float-right') unless user == current_user %>
+                    class: 'btn btn-sm btn-danger float-right float-end') unless user == current_user %>
             </td>
           </tr>
         <% end %>
@@ -30,7 +30,7 @@
           <td>
             <div class="form-actions">
               <div class="primary-actions">
-              <%= cancel_link f.object, '#', class: 'btn-sizing', data: { behavior: 'cancel-edit' } %>
+              <%= cancel_link f.object, '#', class: 'btn btn-link', role: 'button', data: { behavior: 'cancel-edit' } %>
               <%= f.submit t('.save'), class: 'btn btn-primary'%>
               </div>
             </div>
@@ -53,7 +53,7 @@
   <div class="mb-4">
     <h3 class="instructions"><%= t :'.admins_curators' %></h3>
     <div id="admins_curators" class="card card-body bg-light">
-      <div class='btn-toolbar float-right'>
+      <div class='btn-toolbar float-right float-end'>
         <button class="btn btn-sm btn-secondary copy-email-addresses" data-clipboard-target="#admins_curators">
             <%= t('.copy') %>
         </button>
@@ -76,12 +76,12 @@
           <tr>
             <td class="<%= 'invite-pending' if user.invite_pending? %>">
               <%= user.email %>
-              <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
+              <span class='badge badge-warning bg-warning pending-label'><%= t('.pending') %></span>
             </td>
             <td class="role">
               <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
             </td>
-            <td class="text-right">
+            <td class="text-right text-end">
               <% if user.superadmin? %>
                 <%= link_to(t('.destroy'), admin_user_path(user),
                       data: { method: :delete, turbo_method: :delete },

data/app/views/spotlight/appearances/edit.html.erb

@@ -20,20 +20,20 @@
     <ul class="nav nav-tabs" role="tablist">
       <% if current_exhibit.themes.many? %>
         <li role="presentation" class="nav-item">
-          <a href="#site-theme" aria-controls="site-theme" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.site_theme.heading') %></a>
+          <a href="#site-theme" aria-controls="site-theme" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.site_theme.heading') %></a>
         </li>
       <% end %>
 
       <li role="presentation" class="nav-item">
-        <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab" class="nav-link <%= 'active' unless current_exhibit.themes.many? %>"><%= t(:'.site_masthead.heading') %></a>
+        <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' unless current_exhibit.themes.many? %>"><%= t(:'.site_masthead.heading') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#site-thumbnail" aria-controls="site-thumbnail" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.site_thumbnail.heading') %></a>
+        <a href="#site-thumbnail" aria-controls="site-thumbnail" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.site_thumbnail.heading') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#main-menu" aria-controls="main-menu" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.main_navigation.menu') %></a>
+        <a href="#main-menu" aria-controls="main-menu" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.main_navigation.menu') %></a>
       </li>
     </ul>
     <div class="tab-content">

data/app/views/spotlight/browse/_search_box.html.erb

@@ -1,14 +1,14 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-form form-horizontal', role: 'search', 'aria-labelledby' => 'browse-search-form' do %>
     <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :exhibit_id, :qt, :page)) %>
-    <div class="form-group row">
+    <div class="form-group mb-3 row">
       <label id="browse-search-form" class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
       <div class="col-sm-6">
         <div class="input-group">
           <%= text_field_tag :q, params[:q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
             <span class="input-group-btn input-group-append">
               <button class="btn btn-reset btn-sm" type="reset">
-                <span class="sr-only"><%= t(:'.reset') %></span>
+                <span class="sr-only visually-hidden"><%= t(:'.reset') %></span>
                 <%= blacklight_icon('highlight_off') %>
               </button>
               <button type="submit" class="btn btn-primary search-btn" id="browse-search">

data/app/views/spotlight/browse/index.html.erb

@@ -1,6 +1,6 @@
 <% title = current_exhibit.main_navigations.browse.label_or_default %>
 <% set_html_page_title(title) %>
-<h1 class="sr-only"><%= title %></h1>
+<h1 class="sr-only visually-hidden"><%= title %></h1>
 
 <% if @groups.any? # active %>
   <ul class="browse-group-navigation nav nav-pills justify-content-center">

data/app/views/spotlight/browse/show.html.erb

@@ -1,7 +1,7 @@
 <% set_html_page_title @search.title %>
 <% render partial: 'tophat' %>
 
-<%= exhibit_edit_link @search, class: 'edit-button float-right btn btn-primary' if can? :edit, @search %>
+<%= exhibit_edit_link @search, class: 'edit-button float-right float-end btn btn-primary' if can? :edit, @search %>
 <% if resource_masthead? %>
   <% content_for :masthead do %>
     <%= render 'search_title', search: @search %>

data/app/views/spotlight/bulk_updates/_download.html.erb

@@ -3,13 +3,13 @@
 <%= bootstrap_form_with(url: download_template_exhibit_bulk_updates_path, local: true, target: '_blank') do |f| %>
   <div class="row">
     <div class="col col-sm-3">
-      <%= f.form_group(:reference_fields, label: { text: t('.reference_fields.heading'), class: 'font-weight-bold' }) do %>
+      <%= f.form_group(:reference_fields, label: { text: t('.reference_fields.heading'), class: 'font-weight-bold fw-bold mb-3' }) do %>
         <%= f.check_box('reference_fields[item_id]', label: t('.item_id'), checked: true, disabled: true) %>
         <%= f.check_box('reference_fields[item_title]', label: t('.item_title')) %>
       <% end %>
     </div>
     <div class="col col-sm-3">
-      <%= f.form_group(:updatable_fields, label: { text: t('.updatable_fields.heading'), class: 'font-weight-bold' }) do %>
+      <%= f.form_group(:updatable_fields, label: { text: t('.updatable_fields.heading'), class: 'font-weight-bold fw-bold mb-3' }) do %>
         <%= f.check_box('updatable_fields[visibility]', checked: true, label: t('.visibility')) %>
         <%= f.check_box('updatable_fields[tags]', label: t('.tags')) %>
       <% end %>

data/app/views/spotlight/bulk_updates/_upload.html.erb

@@ -1,12 +1,22 @@
-<p class="instructions"><%= t('.instructions') %></p>
+<p class="instructions mb-4"><%= t('.instructions') %></p>
 
-<%= bootstrap_form_with(url: exhibit_bulk_updates_path, method: :patch, multipart: true, layout: :inline) do |f| %>
-  <%= f.label :file, t('.file_label'), class: 'col-form-label col-md-3' %>
-  <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by' => 'bulk-update-form-help' %>
-  <%= f.submit t('.submit'), class: 'btn btn-primary ml-2' %>
+<%= bootstrap_form_with(url: exhibit_bulk_updates_path, method: :patch, html: { multipart: true }) do |f| %>
+  <div class="row">
+    <div class="col-12 col-md-3 text-md-right text-md-end">
+      <%= f.label :file, t('.file_label'), class: 'col-form-label' %>
+    </div>
+    <div class="col-12 col-md-9">
+      <div class="input-group">
+        <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by': 'bulk-update-form-help' %>
+        <div class="input-group-append">
+          <%= f.submit t('.submit'), class: 'btn btn-primary' %>
+        </div>
+      </div>
+    </div>
+  </div>
 <% end %>
 <div class="row">
-  <div class="offset-md-3">
-    <p id="bulk-update-form-help" class="form-text text-muted ml-2"><%= t('.form_help') %></p>
+  <div class="col-12 col-md-9 offset-md-3">
+    <p id="bulk-update-form-help" class="form-text text-muted ml-3"><%= t('.form_help') %></p>
   </div>
 </div>

data/app/views/spotlight/bulk_updates/edit.html.erb

@@ -11,13 +11,13 @@
 <div role="tabpanel">
   <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="nav-item">
-      <a href="#overview" aria-controls="overview" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.overview.heading') %></a>
+      <a href="#overview" aria-controls="overview" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.overview.heading') %></a>
     </li>
     <li role="presentation" class="nav-item">
-      <a href="#download" aria-controls="download" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.download.heading') %></a>
+      <a href="#download" aria-controls="download" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.download.heading') %></a>
     </li>
     <li role="presentation" class="nav-item">
-      <a href="#upload" aria-controls="upload" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.upload.heading') %></a>
+      <a href="#upload" aria-controls="upload" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.upload.heading') %></a>
     </li>
   </ul>
 

data/app/views/spotlight/catalog/_admin_header.html.erb

@@ -3,7 +3,7 @@
     <%= render 'reindex_progress_panel' %>
   </div>
   <div class="add-items-nav clearfix">
-    <div class="float-right">
+    <div class="float-right float-end">
       <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), 
           data: { method: :post, turbo_method: :post },
           class: 'btn btn-secondary' %>

data/app/views/spotlight/catalog/_curation_mode_toggle_default.html.erb

@@ -1 +1 @@
-<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>
+<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right float-end btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>

data/app/views/spotlight/catalog/_document_visibility_control.html.erb

@@ -13,7 +13,7 @@
   <div class="checkbox toggle-visibility">
     <label class="toggle-visibility" data-checkboxsubmit-target="label">
       <input type="checkbox" class="toggle-visibility" data-checkboxsubmit-target="checkbox" <%= 'checked="checked"' if document.public?(current_exhibit) %>>
-      <span data-checkboxsubmit-target="span" class="sr-only">
+      <span data-checkboxsubmit-target="span" class="sr-only visually-hidden">
         <%= document.private?(current_exhibit) ? t('.make_public') : t('.make_private') %>
       </span>
     </label>

data/app/views/spotlight/catalog/_edit_default.html.erb

@@ -18,7 +18,7 @@
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]), class: 'btn-sizing' %>
+      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]), class: 'btn btn-link', role: 'button' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
       </div>
   </div>

data/app/views/spotlight/contacts/_form.html.erb

@@ -14,9 +14,9 @@
       <div>
         <%= af.radio_button(:source, :remote, label: t(:'.source.remote.label')) %>
         <%= iiif_upload_tag(af) %>
-        <small class="form-text text-muted">
+        <div class="form-text text-muted mb-3">
           <%= t(:'.source.remote.help') %>
-        </small>
+        </div>
       </div>
 
       <%= iiif_cropper_tags af, initial_crop_selection: Spotlight::Engine.config.contact_square_size %>
@@ -24,7 +24,7 @@
     </div>
   <% end %>
 
-  <div class="form-group primary-actions">
+  <div class="form-group mb-3 primary-actions">
     <%= cancel_link @contact, exhibit_about_pages_path(@contact.exhibit) %>
     <%= f.submit nil, class: 'btn btn-primary' %>
   </div>

data/app/views/spotlight/custom_fields/_form.html.erb

@@ -10,12 +10,12 @@
   <% end %>
 
   <%= f.form_group :field_type, label: { text: t(:'.is_multiple.label') } do %>
-    <%= f.check_box :is_multiple, disabled: @custom_field.persisted? %>
+    <%= f.check_box :is_multiple, layout: :vertical, disabled: @custom_field.persisted? %>
   <% end %>
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit), class: 'btn-sizing' %>
+      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit), class: 'btn btn-link', role: 'button' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/custom_fields/form_group/_text.html.erb

@@ -3,9 +3,9 @@
 <% control_col = f&.control_col %>
 <% offset_col = label_col.sub('col', 'offset') %>
 
-<div class="form-group <%= "row" if inline %>">
+<div class="form-group mb-3 <%= "row" if inline %>">
   <% Array(value || '').each_with_index do |v, index| %>
-    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'sr-only' if index > 0}" %>
+    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'sr-only visually-hidden' if index > 0}" %>
     <div class="mb-3 <%= control_col if inline %>">
       <%= f.text_area_without_bootstrap field.slug, namespace: "f#{index}",multiple: field.is_multiple?, value: v, class: "form-control field-#{field.slug}", readonly: field.readonly_field? %>
     </div>
@@ -13,7 +13,7 @@
 
   <% if field.is_multiple? && !field.readonly_field? %>
     <%= content_tag :template, id: "spotlight-field-template-#{field.slug}" do %>
-      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} sr-only" %>
+      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} sr-only visually-hidden" %>
       <div class="mb-3 <%= "#{offset_col} #{control_col}" if inline %>">
         <%= f.text_area_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>

data/app/views/spotlight/custom_fields/form_group/_vocab.html.erb

@@ -3,9 +3,9 @@
 <% control_col = f&.control_col %>
 <% offset_col = label_col.sub('col', 'offset') %>
 
-<div class="form-group <%= "row" if inline %>">
+<div class="form-group mb-3 <%= "row" if inline %>">
   <% Array(value || '').each_with_index do |v, index| %>
-    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'sr-only' if index > 0}" %>
+    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'sr-only visually-hidden' if index > 0}" %>
     <div class="mb-3 <%= control_col if inline %>">
       <%= f.text_field_without_bootstrap field.slug, namespace: "f#{index}", multiple: field.is_multiple?, value: v, class: "form-control field-#{field.slug}", readonly: field.readonly_field? %>
     </div>
@@ -13,7 +13,7 @@
 
   <% if field.is_multiple? && !field.readonly_field? %>
     <%= content_tag :template, id: "spotlight-field-template-#{field.slug}" do %>
-      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} sr-only" %>
+      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} sr-only visually-hidden" %>
       <div class="mb-3 <%= "#{offset_col} #{control_col}" if inline %>">
         <%= f.text_field_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>

data/app/views/spotlight/custom_search_fields/_form.html.erb

@@ -6,7 +6,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit), class: 'btn-sizing' %>
+      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit), class: 'btn btn-link', role: 'button' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/dashboards/_analytics.html.erb

@@ -21,13 +21,13 @@
     <thead>
       <tr>
         <th><%= t(:".pagetitle") %></th>
-        <th class="text-right"><%= t(:".pageviews") %></th>
+        <th class="text-right text-end"><%= t(:".pageviews") %></th>
       </tr>
     </thead>
     <% page_analytics.each do |p| %>
       <tr>
         <td><%= link_to p.pageTitle, p.pagePath %></td>
-        <td class="text-right"><%= p.pageviews %></td>
+        <td class="text-right text-end"><%= p.pageviews %></td>
       </tr>
     <% end %>
   </table>

data/app/views/spotlight/exhibits/_contact.html.erb

@@ -3,7 +3,7 @@
           <div class="col-md-8<%= ' has-error' if contact.object.errors[:email].present? %>">
             <%= text_field_tag "#{contact.object_name}[email]", contact.object.email, class: 'exhibit-contact form-control', id: "exhibit_contact_email_#{contact.index}", 'aria-label': t('.email_input_aria_label', index: contact.index + 1) %>
             <% if contact.object.errors[:email].present? %>
-              <small class="form-text text-muted"><%=contact.object.errors[:email].join(", ".html_safe) %></small>
+              <div class="form-text text-muted mb-3"><%=contact.object.errors[:email].join(", ".html_safe) %></div>
             <% end %>
             <p>
               <span class="contact-email-delete-error text-danger bg-danger" style="display: none;"><%= t('.email_delete_error') %> <span class="error-msg"></span></span>

data/app/views/spotlight/exhibits/_exhibit_card.html.erb

@@ -9,7 +9,7 @@
     <% end %>
     <div class="card-img-overlay pb-0">
       <% unless exhibit.published? %>
-        <div class="badge badge-warning unpublished"><%= t('.unpublished') %></div>
+        <div class="badge badge-warning bg-warning unpublished"><%= t('.unpublished') %></div>
       <% end %>
 
       <%= content_tag :h2, class: 'card-title h5 text-center', aria: { describedby: "exhibit-description-#{exhibit.to_param}" } do %>

data/app/views/spotlight/exhibits/_form.html.erb

@@ -4,16 +4,16 @@
   <%= f.text_field :subtitle %>
   <%= f.text_area :description %>
   <%= f.text_field :tag_list, value: f.object.tag_list.to_s %>
-  <%= f.form_group(:contact_emails, label: { text: nil, class: nil, for: 'exhibit_contact_email_0' }, help: nil) do %>
-    <%= f.fields_for :contact_emails do |contact| %>
+  <%= f.form_group(:contact_emails, label: { text: nil, class: nil, for: 'exhibit_contact_email_0' }, class: 'form-group mb-3', help: nil) do %>
+    <%= f.fields_for :contact_emails do |contact| %> 
       <%= render partial: 'contact', locals: {exhibit: @exhibit, contact: contact} %>
     <% end %>
     <button id='another-email' class="btn btn-sm btn-info"><%= t('.add_contact_email_button') %></button>
-    <small class="form-text text-muted"><%= t(:'.fields.contact_emails.help_block') %></small>
+    <div class="form-text text-muted mb-3"><%= t(:'.fields.contact_emails.help_block') %></div>
   <% end %>
   <%= f.form_group :published, label: { text: nil, class: 'pt-0' }, help: nil do %>
     <%= f.check_box :published, label: "" %>
-    <small class="form-text text-muted"><%= t(:'.fields.published.help_block') %></small>
+    <div class="form-text text-muted mb-3"><%= t(:'.fields.published.help_block') %></div>
   <% end %>
 
   <div class="form-actions">

data/app/views/spotlight/exhibits/_import.html.erb

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for [:import, current_exhibit], html: { class: 'clearfix', multipart: true } do |f| %>
     <div class="row col-md-12">
       <p class="instructions"><%= t :'.instructions' %></p>
-      <div class="form-group">
+      <div class="form-group mb-3">
         <%= file_field_tag :file, class: 'form-control' %>
         <%= hidden_field_tag :tab, 'import', id: nil %>
       </div>

data/app/views/spotlight/exhibits/_languages.html.erb

@@ -34,7 +34,7 @@
                     <td><%= t("locales.#{language.locale}") %></td>
                     <td class='text-center'>
                       <div class='checkbox'>
-                        <%= languages.label :public, class: 'sr-only' %>
+                        <%= languages.label :public, class: 'sr-only visually-hidden' %>
                         <%= languages.check_box_without_bootstrap :public %>
                       </div>
                       </td>

data/app/views/spotlight/exhibits/edit.html.erb

@@ -6,31 +6,31 @@
 <div role="tabpanel">
   <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="nav-item">
-      <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab.blank? %>"><%= t(:'.basic_settings.heading') %></a>
+      <a href="#basic" aria-controls="basic" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab.blank? %>"><%= t(:'.basic_settings.heading') %></a>
     </li>
     <% if can? :manage, current_exhibit.languages.first_or_initialize %>
       <li role="presentation" class="nav-item">
-        <a href="#language" aria-controls="language" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'language' %>"><%= t(:'spotlight.exhibits.languages.heading') %></a>
+        <a href="#language" aria-controls="language" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'language' %>"><%= t(:'spotlight.exhibits.languages.heading') %></a>
       </li>
     <% end %>
     <% if can? :edit, current_exhibit.filters.first_or_initialize %>
       <li role="presentation" class="nav-item">
-        <a href="#filter" aria-controls="filter" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'filter' %>"><%= t(:'spotlight.exhibits.filter.heading') %></a>
+        <a href="#filter" aria-controls="filter" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'filter' %>"><%= t(:'spotlight.exhibits.filter.heading') %></a>
       </li>
     <% end %>
     <% if can? :import, current_exhibit %>
       <li role="presentation" class="nav-item">
-        <a href="#import" aria-controls="import" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.import.heading') %></a>
+        <a href="#import" aria-controls="import" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.import.heading') %></a>
       </li>
     <% end %>
     <% if can? :export, current_exhibit %>
       <li role="presentation" class="nav-item">
-        <a href="#export" aria-controls="export" role="tab" data-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.export.heading') %></a>
+        <a href="#export" aria-controls="export" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.export.heading') %></a>
       </li>
     <% end %>
     <% if can? :destroy, current_exhibit %>
       <li role="presentation" class="nav-item">
-        <a href="#delete" aria-controls="delete" role="tab" data-toggle="tab" class="nav-link"><%= t(:'spotlight.exhibits.delete.heading') %></a>
+        <a href="#delete" aria-controls="delete" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'spotlight.exhibits.delete.heading') %></a>
       </li>
     <% end %>
   </ul>

data/app/views/spotlight/exhibits/index.html.erb

@@ -1,11 +1,11 @@
 <% if (current_user && current_user.exhibits.any?) || can?(:manage, Spotlight::Exhibit) %>
   <ul class="nav nav-tabs" role="tablist">
-    <li role="presentation" class="nav-item"><a href="#published" aria-controls="published" role="tab" data-toggle="tab" class="nav-link active"><%= t('.published') %></a></li>
+    <li role="presentation" class="nav-item"><a href="#published" aria-controls="published" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t('.published') %></a></li>
     <% if can?(:manage, Spotlight::Exhibit) && @exhibits.unpublished.accessible_by(current_ability).any? %>
-      <li role="presentation" class="nav-item"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab" class="nav-link"><%= t('.unpublished') %></a></li>
+      <li role="presentation" class="nav-item"><a href="#unpublished" aria-controls="unpublished" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t('.unpublished') %></a></li>
     <% end %>
     <% if current_user && current_user.exhibits.any? %>
-      <li role="presentation" class="nav-item"><a href="#user" aria-controls="user" role="tab" data-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
+      <li role="presentation" class="nav-item"><a href="#user" aria-controls="user" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
     <% end %>
   </ul>
 <% end %>

data/app/views/spotlight/featured_images/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-cropper="<%= f.object.model_name.singular_route_key %>" data-form-prefix="<%= form_prefix(f) %>">
 <%= field_set_tag do %>
-  <%= f.check_box(:display) %>
+  <%= f.check_box(:display, layout: :vertical) %>
 <% end if f.object.is_a? Spotlight::Masthead %>
 <%= field_set_tag(t(:'.source.header')) do %>
   <div>
@@ -18,15 +18,15 @@
           <div data-panel-image-pagination="true"></div>
         </div>
       </div>
-      <small class="form-text text-muted"><%= t(:'.source.exhibit.help') %></small>
+      <div class="form-text text-muted mb-3"><%= t(:'.source.exhibit.help') %></div>
     </div>
   </div>
   <div>
     <%= f.radio_button(:source, :remote, label: t(:'.source.remote.label')) %>
     <%= iiif_upload_tag(f) %>
-    <small class="form-text text-muted">
+    <div class="form-text text-muted mb-3">
       <%= t(:'.source.remote.help') %>
-    </small>
+    </div>
   </div>
 <% end %>
 <%= field_set_tag(t(:'.source.remote.header')) do %>

data/app/views/spotlight/featured_images/_upload_form.html.erb

@@ -1,14 +1,14 @@
 <div data-cropper="<%= f.object.model_name.singular_route_key %>" data-form-prefix="<%= form_prefix(f) %>">
 <%= field_set_tag do %>
-  <%= f.check_box(:display) %>
+  <%= f.check_box(:display, layout: :vertical) %>
 <% end if f.object.is_a? Spotlight::Masthead %>
 <%= field_set_tag(t(:'.source.header')) do %>
   <div>
     <%= f.hidden_field(:source, value: :remote, label: t(:'.source.remote.label')) %>
     <%= iiif_upload_tag(f) %>
-    <small class="form-text text-muted">
+    <div class="form-text text-muted mb-3">
       <%= t(:'.source.remote.help') %>
-    </small>
+    </div>
   </div>
 <% end %>
 <%= field_set_tag(t(:'.source.remote.header')) do %>

data/app/views/spotlight/home_pages/_edit_page_link.html.erb

@@ -1,2 +1,2 @@
-<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right btn btn-primary',
+<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-right float-end btn btn-primary',
                       data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/job_trackers/show.html.erb

@@ -6,10 +6,10 @@
 <div data-blacklight-modal="container">
 
   <div class="modal-header border-0">
-    <h2 class="modal-title"><%= job_status_icon(@job_tracker) %> <%= t @job_tracker.job_class, default: @job_tracker.job_class %> <small class="text-monospace font-weight-lighter"><%= @job_tracker.job_id&.truncate(8, omission: '') %></small></h2>
+    <h2 class="modal-title"><%= job_status_icon(@job_tracker) %> <%= t @job_tracker.job_class, default: @job_tracker.job_class %> <small class="text-monospace font-monospace font-weight-lighter fw-lighter"><%= @job_tracker.job_id&.truncate(8, omission: '') %></small></h2>
 
-    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="blacklight-modal-close close btn-close" data-dismiss="modal" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true" class="visually-hidden">&times;</span>
     </button>
   </div>
 

data/app/views/spotlight/locks/_lock.html.erb

@@ -1,4 +1,4 @@
 <p class="alert alert-warning alert-lock">
-  <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+  <button type="button" class="close btn-close" data-dismiss="alert" data-bs-dismiss="alert"><span aria-hidden="true" class="visually-hidden">&times;</span><span class="sr-only visually-hidden">Close</span></button>
   <%= t :'spotlight.pages.edit.locked', user: lock.by, created_at: time_ago_in_words(lock.created_at) + " ago"%>
 </p>

data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb

@@ -8,9 +8,13 @@
         <%= field.hidden_field :label, value: config.display_label, class: 'form-control form-control-sm', data: {:"edit-field-target" => 'true'} %>
        </div>
     </td>
-    <td class="checkbox-cell text-center"><%= field.check_box :show, inline: true, checked: config.show, disabled: !config.immutable.show.nil?, hide_label: true %></td>
+    <td class="checkbox-cell text-center">
+      <%= field.check_box_without_bootstrap :show, checked: config.show, disabled: !config.immutable.show.nil?, hide_label: true %>
+    </td>
     <% available_view_fields.keys.each do |type| %>
-    <td class="checkbox-cell text-center"><%= field.check_box type, inline: true, checked: config.send(type), disabled: !config.immutable.send(type).nil?, hide_label: true %></td>
+      <td class="checkbox-cell text-center">
+        <%= field.check_box_without_bootstrap type, checked: config.send(type), disabled: !config.immutable.send(type).nil?, hide_label: true %>
+      </td>
     <% end %>
   <% end %>
 </tr>

data/app/views/spotlight/pages/_edit_page_link.html.erb

@@ -1,2 +1,2 @@
-<%= exhibit_edit_link @page, class: 'edit-button float-right btn btn-primary',
+<%= exhibit_edit_link @page, class: 'edit-button float-right float-end btn btn-primary',
                       data: { turbolinks: false, turbo: false } %>

data/app/views/spotlight/pages/_form.html.erb

@@ -19,27 +19,27 @@
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href="#page-content" class="nav-link active" aria-controls="page-content" role="tab" data-toggle="tab"><%= t(:'.page_content') %></a>
+        <a href="#page-content" class="nav-link active" aria-controls="page-content" role="tab" data-toggle="tab" data-bs-toggle="tab"><%= t(:'.page_content') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#page-options" class="nav-link" aria-controls="page-options" role="tab" data-toggle="tab"><%= t(:'.page_options') %></a>
+        <a href="#page-options" class="nav-link" aria-controls="page-options" role="tab" data-toggle="tab" data-bs-toggle="tab"><%= t(:'.page_options') %></a>
       </li>
       <% if @page.respond_to? :thumbnail %>
       <li role="presentation" class="nav-item">
-        <a href="#page-thumbnail" class="nav-link" aria-controls="page-thumbnail" role="tab" data-toggle="tab"><%= t(:'.page_thumbnail') %></a>
+        <a href="#page-thumbnail" class="nav-link" aria-controls="page-thumbnail" role="tab" data-toggle="tab" data-bs-toggle="tab"><%= t(:'.page_thumbnail') %></a>
       </li>
       <% end %>
     </ul>
 
     <div class="tab-content">
       <div role="tabpanel" class="tab-pane active" id="page-content">
-        <div class="form-group">
-          <%= f.label :title, class: 'sr-only' %>
+        <div class="form-group mb-3">
+          <%= f.label :title, class: 'sr-only visually-hidden' %>
           <%= f.text_field_without_bootstrap :title, class: 'form-control form-control-lg', placeholder: t(:'.title_placeholder') %>
         </div>
-        <div class="form-group">
-          <%= f.label :content, class: 'sr-only' %>
+        <div class="form-group mb-3">
+          <%= f.label :content, class: 'sr-only visually-hidden' %>
           <%= f.text_area_without_bootstrap :content, value: { data: f.object.content.as_json }.to_json, class: content_editor_class(f.object), data: { 'block-types': SirTrevorRails::Block.custom_block_types } %>
         </div>
       </div>
@@ -61,7 +61,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {}), class: 'btn-sizing') %>
+      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {}), class: 'btn btn-link', role: 'button') %>
       <%= f.submit class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/pages/_order_pages.html.erb

@@ -13,7 +13,7 @@
         <% end %>
       </ol>
     </div>
-    <div class="form-actions float-right">
+    <div class="form-actions float-right float-end">
       <div class="primary-actions">
         <%= button_tag action_label(page_collection_name, :update_all), class: "btn btn-primary", disabled: disable_save_pages_button? %>
       </div>