blacklight-spotlight 5.0.0.pre.alpha1 → 5.0.0.pre.alpha3

data/app/components/spotlight/analytics/dashboard_component.html.erb

@@ -29,13 +29,13 @@
       <thead>
         <tr>
           <th><%= I18n.t("spotlight.dashboards.analytics.pagetitle") %></th>
-          <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.pageviews") %></th>
+          <th class="text-end"><%= I18n.t("spotlight.dashboards.analytics.pageviews") %></th>
         </tr>
       </thead>
       <% page_analytics.rows.each do |p| %>
         <tr>
           <td><%= link_to p.pageTitle, p.pagePath %></td>
-          <td class="text-right text-end"><%= p.screenPageViews %></td>
+          <td class="text-end"><%= p.screenPageViews %></td>
         </tr>
       <% end %>
     </table>
@@ -47,14 +47,14 @@
       <thead>
         <tr>
           <th><%= I18n.t("spotlight.dashboards.analytics.searches.term") %></th>
-          <th class="text-right text-end"><%= I18n.t("spotlight.dashboards.analytics.searches.views") %></th>
+          <th class="text-end"><%= I18n.t("spotlight.dashboards.analytics.searches.views") %></th>
         </tr>
       </thead>
       <% search_analytics.rows.each do |p| %>
         <% if p.searchTerm.present? %>
           <tr>
             <td><%= p.searchTerm %></td>
-            <td class="text-right text-end"><%= p.eventCount %></td>
+            <td class="text-end"><%= p.eventCount %></td>
           </tr>
         <% end %>
       <% end %>

data/app/components/spotlight/bulk_action_component.html.erb

@@ -2,7 +2,7 @@
   <%= button %>
   <div class="dropdown-menu" aria-labelledby="bulk-actions-button">
     <% bulk_actions.each do |key, _config| %>
-      <%= link_to t("spotlight.bulk_actions.#{key}.heading"), '#', class: 'dropdown-item', data: { toggle: "modal", "bs-toggle": "modal", target: "##{key.to_s.dasherize}-modal", "bs-target": "##{key.to_s.dasherize}-modal" } %>
+      <%= link_to t("spotlight.bulk_actions.#{key}.heading"), '#', class: 'dropdown-item', data: { "bs-toggle": "modal", "bs-target": "##{key.to_s.dasherize}-modal" } %>
     <% end %>
   </div>
 </div>

data/app/components/spotlight/bulk_action_component.rb

@@ -13,7 +13,7 @@ module Spotlight
 
     def button
       button_tag t(:'spotlight.bulk_actions.label'), id: 'bulk-actions-button', class: button_classes,
-                                                     data: { toggle: 'dropdown', 'bs-toggle': 'dropdown' },
+                                                     data: { 'bs-toggle': 'dropdown' },
                                                      aria: { haspopup: true, expanded: false }
     end
   end

data/app/components/spotlight/document_component.rb

@@ -15,7 +15,7 @@ module Spotlight
     delegate :current_exhibit, :can?, :add_document_meta_content, to: :helpers
 
     def exhibit_edit_link
-      helpers.exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right float-end btn btn-primary' if can?(:curate, current_exhibit)
+      helpers.exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-end btn btn-primary' if can?(:curate, current_exhibit)
     end
   end
 end

data/app/components/spotlight/exhibit_navbar_component.html.erb

@@ -4,7 +4,7 @@
       <%= link_to(helpers.current_exhibit.title, helpers.spotlight.exhibit_path(helpers.current_exhibit), class: 'navbar-brand') %>
     <% end %>
 
-    <ul class="navbar-nav <%= helpers.resource_masthead? ? 'justify-content-md-end' : 'mr-auto me-auto' %>">
+    <ul class="navbar-nav <%= helpers.resource_masthead? ? 'justify-content-md-end' : 'me-auto' %>">
       <li class="nav-item <%= "active" if helpers.current_page?([helpers.spotlight, helpers.current_exhibit]) %>"><%= link_to t(:'spotlight.curation.nav.home'), [helpers.spotlight, helpers.current_exhibit], class: 'nav-link' %></li>
       <% helpers.current_exhibit.main_navigations.displayable.each do |navigation| %>
         <%= render partial: "shared/#{navigation.nav_type}_navbar", locals: { navigation: navigation } %>

data/app/components/spotlight/save_search_component.html.erb

@@ -5,9 +5,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="save-modal-label"><%= t(:'spotlight.saved_search.label') %></h4>
-        <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>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <%= f.text_field :title, label: t(:'spotlight.saved_search.title') %>
@@ -17,7 +15,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit nil, class: 'btn btn-primary' %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

data/app/components/spotlight/save_search_component.rb

@@ -15,7 +15,7 @@ module Spotlight
 
     def button
       button_tag t(:'spotlight.saved_search.label'), id: 'save-this-search', class: button_classes,
-                                                     data: { toggle: 'modal', 'bs-toggle': 'modal', target: '#save-modal', 'bs-target': '#save-modal' }
+                                                     data: { 'bs-toggle': 'modal', 'bs-target': '#save-modal' }
     end
 
     def form_path

data/app/javascript/spotlight/admin/block_mixins/autocompleteable.js

@@ -35,7 +35,7 @@ import { fetchAutocompleteJSON } from 'spotlight/admin/search_typeahead';
           <auto-complete src="${this.autocomplete_url()}" for="${autocompleteID}-popup" fetch-on-empty>
             <input type="text" name="${autocompleteID}" placeholder="${i18n.t("blocks:autocompleteable:placeholder")}" data-default-typeahead>
             <ul id="${autocompleteID}-popup"></ul>
-            <div id="${autocompleteID}-popup-feedback" class="sr-only visually-hidden"></div>
+            <div id="${autocompleteID}-popup-feedback" class="visually-hidden"></div>
           </auto-complete>
         ` };
       }

data/app/javascript/spotlight/admin/blocks/browse_block.js

@@ -43,7 +43,7 @@ SirTrevor.Blocks.Browse = (function(){
                     <div class="checkbox">
                       <input name="item[${index}][display]" type="hidden" value="false" />
                       <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                      <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                      <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                     </div>
                     <div class="pic">
                       <img class="img-thumbnail" src="${(data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg")))}" />
@@ -52,7 +52,7 @@ SirTrevor.Blocks.Browse = (function(){
                       <div class="title card-title">${(data.full_title || data.title)}</div>
                       <div>${(data.slug || data.id)}</div>
                     </div>
-                    <div class="remove float-right float-end">
+                    <div class="remove float-end">
                       <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                     </div>
                   </div>

data/app/javascript/spotlight/admin/blocks/browse_group_categories_block.js

@@ -14,7 +14,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
       return `<auto-complete src="${this.autocomplete_url()}" for="${autocompleteID}-popup" fetch-on-empty>
         <input type="text" name="${autocompleteID}" placeholder="${i18n.t("blocks:browse_group_categories:autocomplete")}" data-default-typeahead>
         <ul id="${autocompleteID}-popup"></ul>
-        <div id="${autocompleteID}-popup-feedback" class="sr-only visually-hidden"></div>
+        <div id="${autocompleteID}-popup-feedback" class="visually-hidden"></div>
       </auto-complete>`
     },
     autocomplete_template: function(obj) {
@@ -49,7 +49,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
                   <div class="checkbox">
                     <input name="item[${index}][display]" type="hidden" value="false" />
                     <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                    <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                    <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                   </div>
                   <div class="main">
                     <div class="title card-title">${data.title}</div>

data/app/javascript/spotlight/admin/blocks/resources_block.js

@@ -95,7 +95,7 @@ Core.Block.Resources = (function(){
                         <div class="checkbox">
                           <input name="item[${index}][display]" type="hidden" value="false" />
                           <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + data.id)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                          <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
+                          <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + data.id)}">${i18n.t("blocks:resources:panel:display")}</label>
                         </div>
                         <div class="pic">
                           <img class="img-thumbnail" src="${(data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg")))}" />
@@ -110,7 +110,7 @@ Core.Block.Resources = (function(){
                       <div>${(data.slug || data.id)}</div>
                       ${this._altTextFieldsHTML(index, data)}
                     </div>
-                    <div class="remove float-right float-end">
+                    <div class="remove float-end">
                       <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                     </div>
                   </div>
@@ -198,7 +198,7 @@ Core.Block.Resources = (function(){
     altTextHTML: function(index, data) {
       const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
       return `<div class="mt-2 pt-2 d-flex">
-          <div class="me-2 mr-2">
+          <div class="me-2">
             <label class="col-form-label pb-0 pt-1" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
             <div class="form-check mb-1 justify-content-end">
               <input class="form-check-input" type="checkbox"

data/app/javascript/spotlight/admin/blocks/solr_documents_carousel_block.js

@@ -75,10 +75,10 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
       var clickHandler = function (e) {
         var href
         var $this   = $(this)
-        var $target = $($this.attr('data-target') || $this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
+        var $target = $($this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
         if (!$target.hasClass('carousel')) return
         var options = $.extend({}, $target.data(), $this.data())
-        var slideIndex = $this.attr('data-slide-to') || $this.attr('data-bs-slide-to')
+        var slideIndex = $this.attr('data-bs-slide-to')
         if (slideIndex) options.interval = false
 
         $.fn.carousel.call($target, options)
@@ -91,8 +91,8 @@ SirTrevor.Blocks.SolrDocumentsCarousel = (function(){
       }
 
       $(this.inner).find('.carousel')
-        .on('click.bs.carousel.data-api', '[data-slide], [data-bs-slide]', clickHandler)
-        .on('click.bs.carousel.data-api', '[data-slide-to], [data-bs-slide-to]', clickHandler)
+        .on('click.bs.carousel.data-api', '[data-bs-slide]', clickHandler)
+        .on('click.bs.carousel.data-api', '[data-bs-slide-to]', clickHandler)
     }
 
   });

data/app/javascript/spotlight/admin/blocks/solr_documents_features_block.js

@@ -16,10 +16,10 @@ SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
       var clickHandler = function (e) {
         var href
         var $this   = $(this)
-        var $target = $($this.attr('data-target') || $this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
+        var $target = $($this.attr('data-bs-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
         if (!$target.hasClass('carousel')) return
         var options = $.extend({}, $target.data(), $this.data())
-        var slideIndex = $this.attr('data-slide-to') || $this.attr('data-bs-slide-to')
+        var slideIndex =$this.attr('data-bs-slide-to')
         if (slideIndex) options.interval = false
 
         $.fn.carousel.call($target, options)
@@ -32,8 +32,7 @@ SirTrevor.Blocks.SolrDocumentsFeatures = (function(){
       }
 
       $(this.inner).find('.carousel')
-        .on('click.bs.carousel.data-api', '[data-slide], [data-bs-slide]', clickHandler)
-        .on('click.bs.carousel.data-api', '[data-slide-to], [data-bs-slide-to]', clickHandler)
+        .on('click.bs.carousel.data-api', '[data-bs-slide-to]', clickHandler)
     }
 
   });

data/app/javascript/spotlight/admin/blocks/uploaded_items_block.js

@@ -82,24 +82,24 @@ SirTrevor.Blocks.UploadedItems = (function(){
                 <div class="checkbox">
                   <input name="item[${index}][display]" type="hidden" value="false" />
                   <input name="item[${index}][display]" id="${this.formId(this.display_checkbox + '_' + dataId)}" type="checkbox" ${checked} class="item-grid-checkbox" value="true"  />
-                  <label class="sr-only visually-hidden" for="${this.formId(this.display_checkbox + '_' + dataId)}">${i18n.t("blocks:resources:panel:display")}</label>
+                  <label class="visually-hidden" for="${this.formId(this.display_checkbox + '_' + dataId)}">${i18n.t("blocks:resources:panel:display")}</label>
                 </div>
                 <div class="pic">
                   <img class="img-thumbnail" src="${dataUrl}" />
                 </div>
                 <div class="main form-horizontal">
                   <div class="title card-title">${dataTitle}</div>
-                  <div class="field row mr-3 me-3">
+                  <div class="field row me-3">
                     <label for="${this.formId('caption_' + dataId)}" class="col-form-label col-md-3">${i18n.t("blocks:uploaded_items:caption")}</label>
                     <input type="text" class="form-control col" id="${this.formId('caption_' + dataId)}" name="item[${index}][caption]" data-field="caption"/>
                   </div>
-                  <div class="field row mr-3 me-3">
+                  <div class="field row me-3">
                     <label for="${this.formId('link_' + dataId)}" class="col-form-label col-md-3">${i18n.t("blocks:uploaded_items:link")}</label>
                     <input type="text" class="form-control col" id="${this.formId('link_' + dataId)}" name="item[${index}][link]" data-field="link"/>
                   </div>
                   ${this._altTextFieldsHTML(index, data)}
                 </div>
-                <div class="remove float-right float-end">
+                <div class="remove float-end">
                   <a data-item-grid-panel-remove="true" href="#">${i18n.t("blocks:resources:panel:remove")}</a>
                 </div>
               </div>
@@ -149,8 +149,8 @@ SirTrevor.Blocks.UploadedItems = (function(){
     altTextHTML: function(index, data) {
       const { isDecorative, altText, altTextBackup, placeholderAttr, disabledAttr } = this._altTextData(data);
       return `
-      <div class="field row mr-3 me-3">
-        <div class="col-lg-3 ps-md-2 pl-md-2">
+      <div class="field row me-3">
+        <div class="col-lg-3 ps-md-2">
           <label class="col-form-label text-nowrap pb-0 pt-1 justify-content-md-start justify-content-lg-end d-flex" for="${this.formId(this.alt_text_textarea + '_' + data.id)}">${i18n.t("blocks:resources:alt_text:alternative_text")}</label>
           <div class="form-check d-flex justify-content-md-start justify-content-lg-end">
             <input class="form-check-input" type="checkbox"

data/app/javascript/spotlight/admin/users.js

@@ -4,7 +4,7 @@ export default class {
     function edit_user(event) {
       event.preventDefault();
       $(this).closest('tr').hide();
-      const id = $(this).attr('data-target') || $(this).attr('data-bs-target');
+      const id = $(this).attr('data-target');
       const edit_view = $("[data-edit-for='"+id+"']", container).show();
       $.each(edit_view.find('input[type="text"], select'), function() {
         // Cache original values incase editing is canceled
@@ -35,7 +35,7 @@ export default class {
     }
 
     function destroy_user(event) {
-      const id = $(this).attr('data-target') || $(this).attr('data-bs-target');
+      const id = $(this).attr('data-target');
       $("[data-destroy-for='"+id+"']", container).val('1');
     }
 

data/app/javascript/spotlight/controllers/tag_selector_controller.js

@@ -192,9 +192,9 @@ export default class extends Controller {
               type="button"
               data-action="${this.identifier}#deselect"
               data-tag="${tag}"
-              class="btn-close close ms-1 ml-1"
+              class="btn-close close ms-1"
               aria-label="${this.translationsValue.remove} ${tag}"
-            ><span aria-hidden="true" class="visually-hidden">&times;</span></button>
+            ></button>
           </span>
         </li>
       `

data/app/javascript/spotlight/user/zpr_links.js

@@ -1,3 +1,5 @@
+import OpenSeadragon from 'openseadragon';
+
 export default class {
   connect() {
     $('.zpr-link').on('click', function() {
@@ -7,10 +9,10 @@ export default class {
       modalDialog.addClass('modal-xl')
       modalContent.html('<div id="osd-modal-container"></div>');
       var controls = `<div class="controls d-flex justify-content-center justify-content-md-end">
-          <div class="custom-close-controls pr-3 pe-3 pt-3">
-            <button type="button" class="btn btn-dark" data-dismiss="modal" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
+          <div class="custom-close-controls pe-3 pt-3">
+            <button type="button" class="btn btn-dark" data-bs-dismiss="modal" aria-hidden="true">${Spotlight.ZprLinks.close}</button>
           </div>
-          <div class="zoom-controls mb-3 mr-md-3 me-md-3">
+          <div class="zoom-controls mb-3 me-md-3">
             <button id="osd-zoom-in" type="button" class="btn btn-dark">${Spotlight.ZprLinks.zoomIn}</button>
             <button id="osd-zoom-out" type="button" class="btn btn-dark">${Spotlight.ZprLinks.zoomOut}</button>
           </div>

data/app/models/sir_trevor_rails/block.rb

@@ -18,9 +18,7 @@ module SirTrevorRails
       send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
     end
 
-    def supports_alt_text?
-      self.class.supports_alt_text?
-    end
+    delegate :supports_alt_text?, to: :class
 
     # By default we don't support alt text, but some subclasses do
     def self.supports_alt_text?

data/app/services/spotlight/exhibit_import_export_service.rb

@@ -365,7 +365,7 @@ module Spotlight
       (json[:feature_pages] || []).each do |page|
         p = exhibit.feature_pages.find_by(slug: page[:slug])
         page[:content] = p.read_attribute(:content)
-        (page[:translated_pages]).each do |translated_page|
+        page[:translated_pages].each do |translated_page|
           translated_page[:content] = p.translated_page_for(translated_page[:locale]).read_attribute(:content)
         end
       end
@@ -373,7 +373,7 @@ module Spotlight
       (json[:about_pages] || []).each do |page|
         p = exhibit.about_pages.find_by(slug: page[:slug])
         page[:content] = p.read_attribute(:content)
-        (page[:translated_pages]).each do |translated_page|
+        page[:translated_pages].each do |translated_page|
           translated_page[:content] = p.translated_page_for(translated_page[:locale]).read_attribute(:content)
         end
       end

data/app/views/catalog/_add_tags.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="add-tag-modal"><%= t(:'spotlight.bulk_actions.add_tags.heading') %></h4>
-        <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>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -20,7 +18,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.add'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

data/app/views/catalog/_change_visibility.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="save-modal-label"><%= t(:'spotlight.bulk_actions.change_visibility.heading') %></h4>
-        <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>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -27,7 +25,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.change'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

data/app/views/catalog/_remove_tags.html.erb

@@ -4,9 +4,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <h4 class="modal-title" id="remove-tag-modal"><%= t(:'spotlight.bulk_actions.remove_tags.heading') %></h4>
-        <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>
+        <button type="button" class="blacklight-modal-close close btn-close" data-bs-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>"></button>
       </div>
       <div class="modal-body">
         <%= t(:'spotlight.bulk_actions.remove_tags.description_html', count: @response.total) %>
@@ -16,7 +14,7 @@
           <h5><%= t(:'spotlight.bulk_actions.remove_tags.assigned') %></h5>
         <% end %>
         <% facet.items.each do |facet_item| %>
-          <div class="badge badge-info bg-info">
+          <div class="badge bg-info">
             <%= "#{facet_item.value} (#{facet_item.hits})" %>
           </div>
         <% end %>
@@ -29,7 +27,7 @@
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit t(:'spotlight.bulk_actions.remove'), class: 'btn btn-primary', data: { confirm: t(:'spotlight.bulk_actions.confirm'), turbo_confirm: t(:'spotlight.bulk_actions.confirm') } %>
-        <button type="button" class="btn btn-link" data-dismiss="modal" data-bs-dismiss="modal"><%= t :cancel %></button>
+        <button type="button" class="btn btn-link" data-bs-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>
     <% end %>

data/app/views/shared/_curated_features_navbar.html.erb

@@ -2,7 +2,7 @@
 <% if published_top_level_feature_pages.present? %>
   <% if published_top_level_feature_pages.many? %>
     <li class="nav-item dropdown">
-      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown"><%= navigation.label_or_default %></a>
+      <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"><%= navigation.label_or_default %></a>
       <ul class="dropdown-menu">
         <% published_top_level_feature_pages.each do |page| %>
           <li><%= link_to page.title, [spotlight, page.exhibit, page], class: 'dropdown-item' %></li>

data/app/views/shared/_user_util_links.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <% if nav_actions.present? %>
-  <ul class="navbar-nav mr-auto me-auto">
+  <ul class="navbar-nav me-auto'">
     <%= nav_actions %>
   </ul>
 <% end %>
@@ -14,7 +14,7 @@
   <%= render '/spotlight/shared/locale_picker' %>
   <% if current_user %>
     <li class="nav-item dropdown">
-      <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" data-bs-toggle="dropdown"><%=current_user%></a>
+      <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"><%=current_user%></a>
       <ul class="dropdown-menu">
         <% if can? :manage, Spotlight::Site.instance %>
           <li><%= link_to t(:'spotlight.header_links.edit_site'), spotlight.edit_site_path, class: 'dropdown-item' %></li>

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 bg-warning pending-label'><%= t('.pending') %></span>
+              <span class='badge 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 float-end') unless user == current_user %>
+                    class: 'btn btn-sm btn-danger float-end') unless user == current_user %>
             </td>
           </tr>
         <% end %>
@@ -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 align-self-end'>
+      <div class='btn-toolbar align-self-end'>
         <button class="btn btn-sm btn-primary 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 bg-warning pending-label'><%= t('.pending') %></span>
+              <span class='badge 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 text-end">
+            <td class="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" data-bs-toggle="tab" class="nav-link active"><%= t(:'.site_theme.heading') %></a>
+          <a href="#site-theme" aria-controls="site-theme" role="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" data-bs-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-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" data-bs-toggle="tab" class="nav-link"><%= t(:'.site_thumbnail.heading') %></a>
+        <a href="#site-thumbnail" aria-controls="site-thumbnail" role="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" data-bs-toggle="tab" class="nav-link"><%= t(:'.main_navigation.menu') %></a>
+        <a href="#main-menu" aria-controls="main-menu" role="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

@@ -7,11 +7,11 @@
         <div class="input-group">
           <%= text_field_tag :q, params[:q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
           <button class="btn btn-reset btn-sm" type="reset">
-            <span class="sr-only visually-hidden"><%= t(:'.reset') %></span>
+            <span class="visually-hidden"><%= t(:'.reset') %></span>
             <%= blacklight_icon('highlight_off') %>
           </button>
           <button type="submit" class="btn btn-primary search-btn" id="browse-search">
-            <span class="submit-search-text sr-only visually-hidden"><%= t(:'.submit') %></span>
+            <span class="submit-search-text visually-hidden"><%= t(:'.submit') %></span>
             <%= blacklight_icon('search', aria_hidden: true) %>
           </button>
         </div>

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 visually-hidden"><%= title %></h1>
+<h1 class="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 %>
 <% add_browse_meta_content(@search) %>
 
-<%= exhibit_edit_link @search, class: 'edit-button float-right float-end btn btn-primary' if can? :edit, @search %>
+<%= exhibit_edit_link @search, class: 'edit-button 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, data: { turbo: false }) 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 fw-bold mb-3' }) do %>
+      <%= f.form_group(:reference_fields, label: { text: t('.reference_fields.heading'), class: '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 fw-bold mb-3' }) do %>
+      <%= f.form_group(:updatable_fields, label: { text: t('.updatable_fields.heading'), class: '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

@@ -2,7 +2,7 @@
 
 <%= 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">
+    <div class="col-12 col-md-3 text-md-end">
       <%= f.label :file, t('.file_label'), class: 'col-form-label' %>
     </div>
     <div class="col-12 col-md-9">

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>