blacklight-spotlight 5.0.0.pre.alpha2 → 5.0.0

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" data-bs-toggle="tab" class="nav-link active"><%= t(:'.overview.heading') %></a>
+      <a href="#overview" aria-controls="overview" role="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" data-bs-toggle="tab" class="nav-link"><%= t(:'.download.heading') %></a>
+      <a href="#download" aria-controls="download" role="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" data-bs-toggle="tab" class="nav-link"><%= t(:'.upload.heading') %></a>
+      <a href="#upload" aria-controls="upload" role="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 float-end">
+    <div class="float-end">
       <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), 
           data: { method: :post, turbo_method: :post },
           class: 'btn btn-outline-primary' %>

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

@@ -1 +1 @@
-<%= 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]  %>
+<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: '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 visually-hidden">
+      <span data-checkboxsubmit-target="span" class="visually-hidden">
         <%= document.private?(current_exhibit) ? t('.make_public') : t('.make_private') %>
       </span>
     </label>

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

@@ -5,7 +5,7 @@
 <%= curation_page_title %>
 
 <%= render 'admin_header' %>
-<%= render 'search_header' %>
+<%= render blacklight_config.view_config(document_index_view_type).search_header_component.new %>
 
 <%- if @response.empty? %>
   <%= render "zero_results" %>

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

@@ -5,7 +5,7 @@
 
 <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 visually-hidden' if index > 0}" %>
+    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'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 visually-hidden" %>
+      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} 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

@@ -5,7 +5,7 @@
 
 <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 visually-hidden' if index > 0}" %>
+    <%= f.label field.slug, field.label, namespace: "f#{index}", class: "col-form-label #{label_col if inline} #{'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 visually-hidden" %>
+      <%= f.label field.slug, field.label, class: "col-form-label #{label_col if inline} 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/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 bg-warning unpublished"><%= t('.unpublished') %></div>
+        <div class="badge 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/_languages.html.erb

@@ -35,7 +35,7 @@
                     <td><%= t("locales.#{language.locale}") %></td>
                     <td class='text-center'>
                       <div class='checkbox'>
-                        <%= languages.label :public, class: 'sr-only visually-hidden' %>
+                        <%= languages.label :public, class: '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" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab.blank? %>"><%= t(:'.basic_settings.heading') %></a>
+      <a href="#basic" aria-controls="basic" role="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" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'language' %>"><%= t(:'spotlight.exhibits.languages.heading') %></a>
+        <a href="#language" aria-controls="language" role="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" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'filter' %>"><%= t(:'spotlight.exhibits.filter.heading') %></a>
+        <a href="#filter" aria-controls="filter" role="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" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.import.heading') %></a>
+        <a href="#import" aria-controls="import" role="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" data-bs-toggle="tab" class="nav-link <%= 'active' if @tab == 'import' %>"><%= t(:'spotlight.exhibits.export.heading') %></a>
+        <a href="#export" aria-controls="export" role="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" data-bs-toggle="tab" class="nav-link"><%= t(:'spotlight.exhibits.delete.heading') %></a>
+        <a href="#delete" aria-controls="delete" role="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" data-bs-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-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" data-bs-toggle="tab" class="nav-link"><%= t('.unpublished') %></a></li>
+      <li role="presentation" class="nav-item"><a href="#unpublished" aria-controls="unpublished" role="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" data-bs-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
+      <li role="presentation" class="nav-item"><a href="#user" aria-controls="user" role="tab" data-bs-toggle="tab" class="nav-link"><%= t('.user') %></a></li>
     <% end %>
   </ul>
 <% end %>

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

@@ -14,7 +14,7 @@
       <auto-complete id="<%= form_prefix(f) %>-auto-complete" for="<%= form_prefix(f) %>-auto-complete-popup" fetch-on-empty>
         <%= text_field_tag(:document_title, (document_presenter(f.object.document).heading if f.object.document), class: "form-control", data: { input_select_target: "##{form_prefix(f)}_source_exhibit", 'behavior': 'autocomplete', featured_image_typeahead: true, target_panel: "##{form_prefix(f)}-target-panel", :'id-field' => "##{form_prefix(f)}_document_global_id" }) %>
         <ul id="<%= form_prefix(f) %>-auto-complete-popup"></ul>
-        <div id="<%= form_prefix(f) %>-auto-complete-feedback" class="sr-only visually-hidden"></div>
+        <div id="<%= form_prefix(f) %>-auto-complete-feedback" class="visually-hidden"></div>
       </auto-complete>
       <div id="<%= form_prefix(f) %>-target-panel" style="display:none">
         <div class="card-header">

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 float-end btn btn-primary',
+<%= exhibit_edit_link @page, spotlight.edit_exhibit_home_page_path(@page.exhibit), class: 'edit-button float-end btn btn-primary',
                       data: { turbolinks: false, turbo: false } %>

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

@@ -1,4 +1,4 @@
 <p class="alert alert-warning alert-lock">
-  <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>
+  <button type="button" class="close btn-close" data-bs-dismiss="alert"><span class="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/pages/_edit_page_link.html.erb

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

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

@@ -19,15 +19,15 @@
   <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" data-bs-toggle="tab"><%= t(:'.page_content') %></a>
+        <a href="#page-content" class="nav-link active" aria-controls="page-content" role="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" data-bs-toggle="tab"><%= t(:'.page_options') %></a>
+        <a href="#page-options" class="nav-link" aria-controls="page-options" role="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" data-bs-toggle="tab"><%= t(:'.page_thumbnail') %></a>
+        <a href="#page-thumbnail" class="nav-link" aria-controls="page-thumbnail" role="tab" data-bs-toggle="tab"><%= t(:'.page_thumbnail') %></a>
       </li>
       <% end %>
     </ul>
@@ -35,11 +35,11 @@
     <div class="tab-content">
       <div role="tabpanel" class="tab-pane active" id="page-content">
         <div class="form-group mb-3">
-          <%= f.label :title, class: 'sr-only visually-hidden' %>
+          <%= f.label :title, class: 'visually-hidden' %>
           <%= f.text_field_without_bootstrap :title, class: 'form-control form-control-lg', placeholder: t(:'.title_placeholder') %>
         </div>
         <div class="form-group mb-3">
-          <%= f.label :content, class: 'sr-only visually-hidden' %>
+          <%= f.label :content, class: '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, 'alt-text-settings': SirTrevorRails::Block.custom_block_type_alt_text_settings } %>
         </div>
       </div>

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

@@ -13,7 +13,7 @@
         <% end %>
       </ol>
     </div>
-    <div class="form-actions float-right float-end">
+    <div class="form-actions 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>

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

@@ -1,7 +1,7 @@
 <% views = blacklight_view_config_for_search_block(block) %>
 <% if views.length > 1 -%>
 <div class="view-type">
-  <span class="sr-only visually-hidden"><%= t('blacklight.search.view_title') %></span>
+  <span class="visually-hidden"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <% views.each do |key, config| %>
       <%= render Blacklight::Response::ViewTypeButtonComponent.new(key: key, view: config, selected: block_document_index_view_type(block) == key, search_state: search_state) %>

data/app/views/spotlight/resources/_external_resources_form.html.erb

@@ -11,7 +11,6 @@
               "#external_resource_tab_#{i}",
               class: "nav-link #{"active" if i == 0}",
               role: 'tab',
-              'data-toggle' => 'tab',
               'data-bs-toggle' => 'tab',
               'aria-controls' => "external_resource_tab_#{i}"
             )

data/app/views/spotlight/resources/new.html.erb

@@ -12,7 +12,6 @@
                     "##{tab_name}",
                     role: 'tab',
                     class: "nav-link #{"active" if @tab == tab_name}",
-                    'data-toggle' => 'tab',
                     'data-bs-toggle' => 'tab',
                     'aria-controls' => "#{tab_name}" %>
       </li>

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

@@ -27,7 +27,7 @@
         <tr data-show-for="<%= r.object.id %>" class="<%= 'invite-pending' if r.object.user.invite_pending? %>">
           <td>
             <%= r.object.user.to_s %>
-            <span class='badge badge-warning bg-warning pending-label'><%= t('.invite_pending') %></span>
+            <span class='badge bg-warning pending-label'><%= t('.invite_pending') %></span>
           </td>
           <td><%= r.object.role.humanize %></td>
           <td>

data/app/views/spotlight/search_configurations/_default_per_page.html.erb

@@ -1,4 +1,4 @@
-<%= f.form_group :default_per_page, label: { text: t(:'.label'), class: 'pt-0 col-md-3 text-md-right text-md-end' } do %>
+<%= f.form_group :default_per_page, label: { text: t(:'.label'), class: 'pt-0 col-md-3 text-md-end' } do %>
   <% @blacklight_configuration.default_blacklight_config.per_page.each do |key| %>
     <%= f.radio_button :default_per_page, key, label: key.to_s %>
   <% end %>

data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb

@@ -1,4 +1,4 @@
-<%= f.form_group :document_index_view_types, label: { text: t(:'.label'), class: 'pt-0 col-md-3 text-md-right text-md-end' } do %>
+<%= f.form_group :document_index_view_types, label: { text: t(:'.label'), class: 'pt-0 col-md-3 text-md-end' } do %>
   <%= f.fields_for :document_index_view_types, @blacklight_configuration.document_index_view_types_selected_hash do |vt| %>
     <% @blacklight_configuration.default_blacklight_config.view.select { |_k, v| v.if != false }.each do |key, view| %>
       <div class="row">

data/app/views/spotlight/search_configurations/_facets.html.erb

@@ -15,7 +15,7 @@
                 <% end %>
               </div>
             <% when :additional_options  %>
-              <div class="facet-metadata mr-3 me-3">
+              <div class="facet-metadata me-3">
                 <%= render partial: 'facet_metadata', locals: { blacklight_config: @blacklight_configuration.blacklight_config, field_config: config, metadata: metadata } %>
               </div>
             <% else %>

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

@@ -8,13 +8,13 @@
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href="#options" aria-controls="options" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.tab.options') %></a>
+        <a href="#options" aria-controls="options" role="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.tab.options') %></a>
       </li>
       <li role="presentation" class="nav-item">
-        <a href="#facets" aria-controls="facets" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.facets') %></a>
+        <a href="#facets" aria-controls="facets" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.facets') %></a>
       </li>
       <li role="presentation" class="nav-item">
-        <a href="#results" aria-controls="results" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.results') %></a>
+        <a href="#results" aria-controls="results" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.tab.results') %></a>
       </li>
     </ul>
     <div class="tab-content">

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

@@ -13,19 +13,19 @@
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href="#search-description" aria-controls="search-description" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.search_description') %></a>
+        <a href="#search-description" aria-controls="search-description" role="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.search_description') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#search-group" aria-controls="search-group" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_group') %></a>
+        <a href="#search-group" aria-controls="search-group" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_group') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#search-masthead" aria-controls="search-masthead" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_masthead') %></a>
+        <a href="#search-masthead" aria-controls="search-masthead" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_masthead') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#search-thumbnail" aria-controls="search-thumbnail" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_thumbnail') %></a>
+        <a href="#search-thumbnail" aria-controls="search-thumbnail" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.search_thumbnail') %></a>
       </li>
     </ul>
 

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

@@ -15,11 +15,11 @@
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href="#browse-categories" aria-controls="browse-categories" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.categories_header') %></a>
+        <a href="#browse-categories" aria-controls="browse-categories" role="tab" data-bs-toggle="tab" class="nav-link active"><%= t(:'.categories_header') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
-        <a href="#browse-groups" aria-controls="browse-groups" role="tab" data-toggle="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.groups_header') %></a>
+        <a href="#browse-groups" aria-controls="browse-groups" role="tab" data-bs-toggle="tab" class="nav-link"><%= t(:'.groups_header') %></a>
       </li>
     </ul>
     <div class="tab-content">
@@ -40,7 +40,7 @@
             </ol>
           </div>
 
-          <div class="float-right float-end">
+          <div class="float-end">
             <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
           </div>
         <% end %>
@@ -57,7 +57,7 @@
             </ol>
           </div>
 
-          <div class="float-right float-end">
+          <div class="float-end">
             <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
           </div>
         <% end %>

data/app/views/spotlight/shared/_dd3_item.html.erb

@@ -22,7 +22,7 @@
           <div class="flex-grow-1 align-self-center">
             <h3 class="h6 card-title mb-0">
               <%= field.hidden_field :weight, value: index, 'data-property' => 'weight' %>
-              <%= field.check_box_without_bootstrap enabled_method, class: 'mr-3 me-3', checked: field.object.public_send(enabled_method), hide_label: true, title: label %>
+              <%= field.check_box_without_bootstrap enabled_method, class: 'me-3', checked: field.object.public_send(enabled_method), hide_label: true, title: label %>
               <span class="d-inline-block w-75" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
                 <a href="#edit-in-place" class="field-label edit-in-place"><%= label %></a>
                 <%= field.hidden_field label_method, value: label, class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true', default_value: default_value } %>
@@ -42,7 +42,7 @@
 
       <% if additional_content.present? %>
         <div class="d-flex">
-          <button class="btn btn-link collapse-toggle collapsed" type="button" data-toggle="collapse" data-bs-toggle="collapse" data-target="#<%= id.parameterize %>_options" data-bs-target="#<%= id.parameterize %>_options" aria-expanded="false" aria-controls="<%= id.parameterize %>_options">
+          <button class="btn btn-link collapse-toggle collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<%= id.parameterize %>_options" aria-expanded="false" aria-controls="<%= id.parameterize %>_options">
             Options
           </button>
           <span class="collapse-chevron">❯</span>

data/app/views/spotlight/shared/_exhibit_sidebar.html.erb

@@ -1,4 +1,4 @@
-<h2 class="sr-only visually-hidden"><%= t(:'.header') %></h2>
+<h2 class="visually-hidden"><%= t(:'.header') %></h2>
 <ul class="nav sidenav top-level flex-column">
   <%= nav_link t(:'spotlight.curation.sidebar.dashboard'), spotlight.exhibit_dashboard_path(current_exhibit) %>
   <% if current_exhibit.analytics_provider&.enabled? %>

data/app/views/spotlight/shared/_locale_picker.html.erb

@@ -1,6 +1,6 @@
 <% if current_exhibit && current_exhibit.languages.accessible_by(current_ability).any? %>
   <li class="nav-item dropdown">
-    <a class="nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+    <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
       <%= Spotlight::Language.new(locale: I18n.locale).to_native %>
     </a>
     <ul class="dropdown-menu">

data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb

@@ -4,7 +4,7 @@
       <div class="d-flex flex-column flex-md-row py-2">
         <div class="d-flex justify-content-between align-items-baseline">
           <h2 class="m-0"><%= group.title %></h2>
-          <div class="pl-3 ps-3">
+          <div class="ps-3">
             <%= link_to t(:'.view_all'), exhibit_browse_groups_path(current_exhibit, group) %>
           </div>
         </div>

data/app/views/spotlight/sir_trevor/blocks/_heading_block.html.erb

@@ -1 +1 @@
-<h2><%= sir_trevor_markdown heading_block.text %></h2>
+<%= sir_trevor_markdown "## #{heading_block.text}" %>

data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb

@@ -1,5 +1,5 @@
-<div class="content-block item-text row d-block clearfix">
-  <div class="<%= 'col-md-6' if oembed_block.text? %> col-12 <%= oembed_block.content_align == 'right' ? 'float-right float-end' : 'float-left float-start' %> oembed-block">
+<div class="content-block items-block row d-block clearfix">
+  <div class="items-col <%= oembed_block.text? ? 'col-md-6' : 'col-md-12' %> <%= oembed_block.content_align == 'right' ? 'float-end' : 'float-start' %> oembed-block">
     <%= render_oembed_tag oembed_block.url %>
   </div>
 

data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb

@@ -11,13 +11,13 @@
       <% views = blacklight_view_config_for_search_block(search_results_block) %>
       <% if views.length > 1 -%>
       <div id="sortAndPerPage" class="clearfix my-3" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label', default: 'Results navigation')%>">
-        <div class="search-widgets float-right float-end">
+        <div class="search-widgets float-end">
           <%= render partial: 'view_type_group', locals: { block: search_results_block } %>
         </div>
       </div>
       <% end %>
 
-      <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
+      <h2 class="visually-hidden"><%= t('blacklight.search.search_results') %></h2>
       <%= render_document_index_with_view(block_document_index_view_type(search_results_block), response.documents) %>
       <%= render 'results_pagination' %>
   <%- end %>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb

@@ -3,7 +3,7 @@
 <div class="content-block items-block row d-block clearfix">
   <% if solr_documents_block.documents? %>
 
-    <div class="items-col spotlight-flexbox <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_block.content_align == 'right' ? 'float-right float-end' : 'float-left float-start' %>">
+    <div class="items-col spotlight-flexbox <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_block.content_align == 'right' ? 'float-end' : 'float-start' %>">
       <% solr_documents_block.each_document do |block_options, document| %>
         <% doc_presenter = document_presenter(document) %>
         <div class="box" data-id="<%= document.id %>">

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb

@@ -29,7 +29,7 @@
         </div>
       </div>
       <% indicators << capture do %>
-        <li data-target="#<%= html_id %>" data-bs-target="#<%= html_id %>" data-slide-to="<%= index %>" data-bs-slide-to="<%= index %>" class="<%= 'active' if index == 0 %>"></li>
+        <li data-bs-target="#<%= html_id %>" data-bs-slide-to="<%= index %>" class="<%= 'active' if index == 0 %>"></li>
       <% end %>
     <% end %>
     </div>
@@ -40,10 +40,10 @@
     </ol>
 
     <!-- Controls -->
-    <a class="left carousel-control-prev" href="#<%= html_id %>" data-slide="prev" data-bs-slide="prev">
+    <a class="left carousel-control-prev" href="#<%= html_id %>" data-bs-slide="prev">
       <%= blacklight_icon('arrow_back_ios') %>
     </a>
-    <a class="right carousel-control-next" href="#<%= html_id %>" data-slide="next" data-bs-slide="next">
+    <a class="right carousel-control-next" href="#<%= html_id %>" data-bs-slide="next">
       <%= blacklight_icon('arrow_forward_ios') %>
     </a>
   </div>

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb

@@ -3,7 +3,7 @@
 <div class="content-block items-block row d-block clearfix">
 
   <% if solr_documents_embed_block.documents? %>
-    <div class="items-col <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_embed_block.content_align == 'right' ? 'float-right float-end' : 'float-left float-start' %>">
+    <div class="items-col <%= solr_documents_embed_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_embed_block.content_align == 'right' ? 'float-end' : 'float-start' %>">
       <% unless solr_documents_embed_block.text? %>
         <% unless solr_documents_embed_block.title.blank? %>
 

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb

@@ -4,7 +4,7 @@
 
 <div class="content-block carousel-block item-features">
   <% if solr_documents_features_block.documents? %>
-    <div id="<%= html_id %>" class="carousel" data-ride="carousel" data-interval="false">
+    <div id="<%= html_id %>" class="carousel">
       <div class="row">
         <div class="col-sm-6">
           <div class="carousel-inner">
@@ -21,7 +21,7 @@
               </div>
 
               <% indicators << capture do %>
-                <li data-target="#<%= html_id %>" data-bs-target="#<%= html_id %>" data-slide-to="<%= index %>" data-bs-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
+                <li data-bs-target="#<%= html_id %>" data-bs-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
                   <% caption_text = solr_documents_features_block.document_caption(doc_presenter, solr_documents_features_block.primary_caption_field, default: Spotlight::PageConfigurations::DOCUMENT_TITLE_KEY) %>
 
                   <a href="#" title="<%= caption_text %>">

data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb

@@ -1,6 +1,6 @@
 <% solr_documents_grid_block.with_solr_helper(self) %>
 <div class="content-block item-grid-block row d-block clearfix">
-  <div class="items-col align-content-start justify-content-between flex-wrap <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %> <%= solr_documents_grid_block.content_align == 'right' ? 'float-right float-end' : 'float-left float-start' %>">
+  <div class="items-col align-content-start justify-content-between flex-wrap <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %> <%= solr_documents_grid_block.content_align == 'right' ? 'float-end' : 'float-start' %>">
     <% if solr_documents_grid_block.documents? %>
         <% solr_documents_grid_block.each_document.each_with_index do |(block_options, document), index| %>
           <% doc_presenter = document_presenter(document) %>

data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb

@@ -1,5 +1,5 @@
 <div class="content-block item-text row d-block clearfix">
-  <div class="items-col spotlight-flexbox <%= uploaded_items_block.text? ? "col-md-6" : "col-md-12" %> <%= uploaded_items_block.content_align == 'right'  ? 'float-right float-end' : 'float-left float-start' %> uploaded-items-block">
+  <div class="items-col spotlight-flexbox <%= uploaded_items_block.text? ? "col-md-6" : "col-md-12" %> <%= uploaded_items_block.content_align == 'right'  ? 'float-end' : 'float-start' %> uploaded-items-block">
     <% if uploaded_items_block.files.present? %>
       <% uploaded_items_block.files.each do |file| %>
         <div class="box" data-id="<%= file[:id] %>">

data/app/views/spotlight/sites/_exhibit.html.erb

@@ -11,8 +11,8 @@
      </div>
 
   </td>
-  <td class="text-right text-end"><%= exhibit.published? ? t(:'.published') : t(:'.unpublished') %></td>
-  <td class="text-right text-end"><%= exhibit.requested_by %></td>
-  <td class="text-right text-end"><%= l exhibit.created_at, format: :long %></td>
-  <td class="text-right text-end"><%= l exhibit.updated_at, format: :long %></td>
+  <td class="text-end"><%= exhibit.published? ? t(:'.published') : t(:'.unpublished') %></td>
+  <td class="text-end"><%= exhibit.requested_by %></td>
+  <td class="text-end"><%= l exhibit.created_at, format: :long %></td>
+  <td class="text-end"><%= l exhibit.updated_at, format: :long %></td>
 </tr>

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

@@ -3,10 +3,10 @@
   <%= bootstrap_form_for @site, url: spotlight.site_path, layout: :horizontal, label_col: 'col-md-2', control_col: 'col-md-10' do |f| %>
     <ul class="nav nav-tabs" role="tablist">
       <li role="presentation" class="nav-item">
-        <a href="#basic" class="active nav-link" aria-controls="basic" role="tab" data-toggle="tab" data-bs-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
+        <a href="#basic" class="active nav-link" aria-controls="basic" role="tab" data-bs-toggle="tab"><%= t(:'.basic_settings.heading') %></a>
       </li>
       <li role="presentation" class="nav-item">
-        <a href="#site-masthead" class="nav-link" aria-controls="site-masthead" role="tab" data-toggle="tab" data-bs-toggle="tab"><%= t(:'.site_masthead.heading') %></a>
+        <a href="#site-masthead" class="nav-link" aria-controls="site-masthead" role="tab" data-bs-toggle="tab"><%= t(:'.site_masthead.heading') %></a>
       </li>
     </ul>
     <div class="tab-content">