blacklight-spotlight 4.7.1 → 5.0.0.pre.alpha1

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

@@ -1,7 +1,6 @@
 import BrowseGroupCateogries from 'spotlight/user/browse_group_categories'
 import Carousel from 'spotlight/user/carousel'
 import ClearFormButton from 'spotlight/user/clear_form_button'
-import ReportProblem from 'spotlight/user/report_a_problem'
 import ZprLinks from 'spotlight/user/zpr_links'
 
 export default class {
@@ -9,7 +8,6 @@ export default class {
     new BrowseGroupCateogries().connect()
     new Carousel().connect()
     new ClearFormButton().connect()
-    new ReportProblem().connect()
     new ZprLinks().connect()
   }
 }

data/app/models/sir_trevor_rails/block.rb

@@ -18,11 +18,12 @@ module SirTrevorRails
       send(:[], :format).present? ? send(:[], :format).to_sym : DEFAULT_FORMAT
     end
 
-    def alt_text?
-      self.class.alt_text?
+    def supports_alt_text?
+      self.class.supports_alt_text?
     end
 
-    def self.alt_text?
+    # By default we don't support alt text, but some subclasses do
+    def self.supports_alt_text?
       false
     end
 
@@ -33,7 +34,7 @@ module SirTrevorRails
     end
 
     def self.custom_block_type_alt_text_settings
-      custom_block_types.index_with { |block_type| SirTrevorRails::Block.block_class(block_type).alt_text? }
+      custom_block_types.index_with { |block_type| SirTrevorRails::Block.block_class(block_type).supports_alt_text? }
     end
 
     def initialize(hash, parent)

data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb

@@ -13,7 +13,7 @@ module SirTrevorRails
         @solr_helper = solr_helper
       end
 
-      def self.alt_text?
+      def self.supports_alt_text?
         true
       end
 

data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb

@@ -5,7 +5,7 @@ module SirTrevorRails
     ##
     # Embed documents (using a special blacklight view configuration) and text block
     class SolrDocumentsEmbedBlock < SirTrevorRails::Blocks::SolrDocumentsBlock
-      def self.alt_text?
+      def self.supports_alt_text?
         false
       end
     end

data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb

@@ -12,7 +12,7 @@ module SirTrevorRails
         (item || {}).map { |_, file| file }.select { |file| file[:display].to_s == 'true' }
       end
 
-      def self.alt_text?
+      def self.supports_alt_text?
         true
       end
 

data/app/models/spotlight/page_configurations.rb

@@ -70,7 +70,7 @@ module Spotlight
     end
 
     def exhibit_autocomplete_endpoint
-      spotlight.autocomplete_exhibit_catalog_path(current_exhibit, q: '%QUERY', format: 'json')
+      spotlight.autocomplete_exhibit_catalog_path(current_exhibit, format: 'json')
     end
 
     def page_autocomplete_endpoint

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

@@ -14,12 +14,12 @@
         </p>
         <div class="form-group mb-3">
           <%= label_tag :tags, t(:'spotlight.bulk_actions.add_tags.label') %>
-          <%= text_field_tag :tags, '', class: 'form-control', data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
+          <%= render Spotlight::TagSelectorComponent.new(field_name: :tags, all_tags: current_exhibit.owned_tags) %>
         </div>
         <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search) %>
       </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') } %>
+        <%= 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>
       </div>
     </div>

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

@@ -26,7 +26,7 @@
         <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search) %>
       </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') } %>
+        <%= 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>
       </div>
     </div>

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

@@ -23,12 +23,12 @@
 
         <div class="form-group mb-3 mt-4">
           <%= label_tag :tags, t(:'spotlight.bulk_actions.remove_tags.label') %>
-          <%= text_field_tag :tags, '', class: 'form-control', data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
+          <%= render Spotlight::TagSelectorComponent.new(field_name: :tags, all_tags: current_exhibit.owned_tags) %>
         </div>
         <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search) %>
       </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') } %>
+        <%= 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>
       </div>
     </div>

data/app/views/layouts/spotlight/base.html.erb

@@ -13,25 +13,36 @@
     <% else %>
       <%= stylesheet_link_tag "application" %>
     <% end %>
-    <%= javascript_include_tag "application" %>
+    <%= javascript_tag "window.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}'" %>
+
+    <script src="https://code.jquery.com/jquery-3.7.1.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.serializeJSON/3.2.1/jquery.serializejson.min.js"></script>
+    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
+    <%= javascript_tag 'L.Icon.Default.prototype.options.imagePath = "https://unpkg.com/leaflet@1.9.4/dist/images/"' %>
+    <%= javascript_include_tag 'leaflet-iiif', "data-turbo-track": "reload", defer: true %>
+    <%= javascript_include_tag 'Leaflet.Editable', "data-turbo-track": "reload", defer: true %>
+    <%= javascript_include_tag 'Path.Drag', "data-turbo-track": "reload", defer: true %>
+    <% if defined? Importmap %>
+      <%= javascript_importmap_tags %>
+    <% else %>
+      <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+    <% end %>
     <%= csrf_meta_tags %>
     <%= content_for(:head) %>
-    <%= description %>
-    <%= twitter_card %>
-    <%= opengraph %>
-    <%= javascript_tag "Spotlight.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}'" %>
-    <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
+    <% if @document %>
+      <% add_document_meta_content(@document) %>
+    <% elsif current_exhibit %>
+      <% description(current_exhibit.description) if current_exhibit %>
+      <% add_exhibit_meta_content %>
+    <% end %>
+    <%= yield(:meta) %>
+    <%= javascript_tag "window.addEventListener('load', () => $.fx.off = true)" if Rails.env.test? %>
   </head>
   <body class="<%= render_body_class %>">
     <%= render partial: 'shared/body_preamble' %>
-    <div id="skip-link">
-      <% if should_render_spotlight_search_bar? %>
-        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'btn btn-link bg-light sr-only sr-only-focusable visually-hidden-focusable' %>
-      <% end %>
-      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'btn btn-link bg-light sr-only sr-only-focusable visually-hidden-focusable' %>
+    <%= render blacklight_config.skip_link_component.new(render_search_link: should_render_spotlight_search_bar?) do %>
       <%= content_for(:skip_links) %>
-    </div>
-
+    <% end %>
     <%= render partial: 'shared/header_navbar' %>
     <%= render partial: 'shared/masthead' %>
     <%= content_for?(:header_content) ? yield(:header_content) : "" %>

data/app/views/layouts/spotlight/spotlight.html.erb

@@ -1,12 +1,12 @@
 <% content_for(:content) do %>
-  <% if content_for? :sidebar %>
-    <section id="content" class="<%= main_content_classes %> <%= content_for(:content_position) || 'order-last' %>" aria-label="<%= t('blacklight.search.search_results') %>">
-      <%= yield %>
-    </section>
-
-    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) || 'order-first' %>" aria-label="<%= t('blacklight.search.documents.aria.limit_search') %>">
+  <% if content? :sidebar %>
+    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) %>" aria-label="<%= t('blacklight.search.documents.aria.limit_search') %>">
       <%= content_for(:sidebar) %>
     </aside>
+
+    <section id="content" class="<%= main_content_classes %> <%= content_for(:content_position) %>" aria-label="<%= t('blacklight.search.search_results') %>">
+      <%= yield %>
+    </section>
   <% else %>
     <section id="content" class="col-md-12">
       <%= yield %>

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

@@ -1,45 +1,18 @@
 <% if show_contact_form? && (current_exhibit.nil? || !current_page?(spotlight.new_exhibit_contact_form_path(current_exhibit))) %>
-  <div id="report-problem-form">
+  <div id="report-problem-form" class="collapse">
     <%= render 'spotlight/shared/report_a_problem' %>
   </div>
 <% end %>
 
-<%- masthead_navbar = capture do %>
-  <% if content_for? :masthead_navbar %>
-    <%= content_for :masthead_navbar %>
-  <% elsif current_exhibit %>
-    <%= render 'shared/exhibit_navbar' %>
-  <% else %>
-    <%= render 'shared/site_navbar' %>
-  <% end %>
-<% end %>
-
 <header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
   <% if current_masthead %>
     <span class='background-container' style="background-image: url('<%= current_masthead.iiif_url %>')"></span>
     <span class='background-container-gradient'></span>
   <% end %>
 
-  <%= masthead_navbar if resource_masthead? %>
-
-  <div class="container site-title-container">
-    <div class="site-title-wrapper">
-      <% if content_for? :masthead %>
-        <h1 class="site-title h2">
-          <%= content_for :masthead %>
-        </h1>
-      <% else %>
-        <h1 class="site-title h2">
-          <%= masthead_heading_content %>
-        </h1>
-        <% if masthead_subheading_content %>
-          <small class="d-none d-md-block py-2 fs-4"><%= masthead_subheading_content %></small>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-
-  <%= masthead_navbar unless resource_masthead? %>
+  <%= render current_exhibit ? 'shared/exhibit_navbar' : 'shared/site_navbar' if resource_masthead? %>
+  <%= render Spotlight::Engine.config.spotlight.title_component.new(title: content_for(:masthead) || masthead_heading_content, subtitle: masthead_subheading_content) %>
+  <%= render current_exhibit ? 'shared/exhibit_navbar' : 'shared/site_navbar' unless resource_masthead? %>
 </header>
 
 <%= render Spotlight::BreadcrumbsComponent.new(breadcrumbs:) %>

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

@@ -14,6 +14,6 @@
 </ul>
 
 <ul class="nav sidenav nav-pills nav-stacked">
-  <li class="nav-item"><%= link_to t(:'spotlight.exhibits.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-outline-secondary btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
+  <li class="nav-item"><%= link_to t(:'spotlight.exhibits.new.page_title'), spotlight.new_exhibit_path, class: 'btn btn-primary btn-nav', role: 'button' if can? :create, Spotlight::Exhibit %></li>
 </ul>
 <% end %>

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

@@ -47,7 +47,9 @@
   <% end %>
   <% if current_exhibit and show_contact_form? %>
     <li class="nav-item">
-      <%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit), data: {behavior: 'contact-link', target: 'report-problem-form' }, class: 'nav-link' %>
+      <%= link_to t('spotlight.header_links.contact'), spotlight.new_exhibit_contact_form_path(current_exhibit),
+        data: { bs_toggle: 'collapse', bs_target: '#report-problem-form' },
+        class: 'nav-link' %>
     </li>
   <% end %>
 </ul>

data/app/views/spotlight/accessibility/alt_text.html.erb

@@ -34,11 +34,11 @@
             <%= page.title %>
             <span class="alt-text-status">
               <% if page_dict[:complete] %>
-                <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" class="bi bi-check-circle-fill">
+                <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" fill="var(--bs-success)" class="bi bi-check-circle-fill">
                   <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0m-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"/>
                 </svg>
               <% else %>
-              <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" class="bi bi-exclamation-triangle-fill">
+              <svg xmlns="http://www.w3.org/2000/svg" width="20px" height="20px" fill="var(--bs-warning)" class="bi bi-exclamation-triangle-fill">
                   <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5m.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2"/>
                 </svg>
               <% end %>

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

@@ -45,7 +45,7 @@
 
     <div class="form-actions">
       <div class="primary-actions">
-        <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-secondary', data: { behavior: 'new-user' }) %>
+        <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-primary', data: { behavior: 'new-user' }) %>
       </div>
     </div>
   </div>
@@ -54,7 +54,7 @@
     <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'>
-        <button class="btn btn-sm btn-secondary copy-email-addresses" data-clipboard-target="#admins_curators">
+        <button class="btn btn-sm btn-primary copy-email-addresses" data-clipboard-target="#admins_curators">
             <%= t('.copy') %>
         </button>
       </div>
@@ -89,7 +89,7 @@
               <% else %>
                 <%= link_to(t('.update'), admin_user_path(user),
                       data: { method: :patch, turbo_method: :patch },
-                      class: 'btn btn-sm btn-secondary') %>
+                      class: 'btn btn-sm btn-primary') %>
               <% end %>
             </td>
           </tr>

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

@@ -71,7 +71,7 @@
           <div class="card-group dd main_navigation_admin col-sm-7" id="nested-navigation" data-behavior="nestable" data-max-depth="1">
             <ol class="dd-list">
               <%= f.fields_for :main_navigations do |label| %>
-                <%= render layout: 'spotlight/shared/dd3_item', locals: { id: label.object.nav_type, field: label, label: label.object.label_or_default, default_value: label.object.default_label, enabled_method: :display } do; end %>
+                <%= render layout: 'spotlight/shared/dd3_item', locals: { id: label.object.nav_type, field: label, label: label.object.label_or_default, default_value: label.object.default_label, index: label.index, enabled_method: :display } do; end %>
               <% end %>
             </ol>
           </div>

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

@@ -6,14 +6,14 @@
       <div class="col-sm-6">
         <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>
-              <%= blacklight_icon('highlight_off') %>
-            </button>
-            <button type="submit" class="btn btn-primary search-btn" id="browse-search">
-              <span class="submit-search-text"><%= t(:'.submit') %></span>
-              <%= blacklight_icon('search', aria_hidden: true) %>
-            </button>
+          <button class="btn btn-reset btn-sm" type="reset">
+            <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">
+            <span class="submit-search-text sr-only visually-hidden"><%= t(:'.submit') %></span>
+            <%= blacklight_icon('search', aria_hidden: true) %>
+          </button>
         </div>
       </div>
     </div>

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

@@ -1,5 +1,5 @@
 <% set_html_page_title @search.title %>
-<% render partial: 'tophat' %>
+<% add_browse_meta_content(@search) %>
 
 <%= exhibit_edit_link @search, class: 'edit-button float-right float-end btn btn-primary' if can? :edit, @search %>
 <% if resource_masthead? %>

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

@@ -1,6 +1,6 @@
 <p class="instructions"><%= t('.instructions_html') %></p>
 
-<%= bootstrap_form_with(url: download_template_exhibit_bulk_updates_path, local: true, target: '_blank') do |f| %>
+<%= 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 %>

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

@@ -17,6 +17,6 @@
 <% end %>
 <div class="row">
   <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>
+    <p id="bulk-update-form-help" class="form-text text-muted ms-3"><%= t('.form_help') %></p>
   </div>
 </div>

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

@@ -6,7 +6,7 @@
     <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' %>
+          class: 'btn btn-outline-primary' %>
       <% if Spotlight::Engine.config.resource_partials.any? %>
         <%= link_to t('.new_resource'), new_exhibit_resource_path(current_exhibit), class: 'btn btn-primary' %>
       <% end %>

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

@@ -13,7 +13,8 @@
 
   <% if can? :tag, current_exhibit %>
   <div class="edit-tags">
-  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
+  <%= render Spotlight::TagSelectorComponent.new(form: f, field_name: :exhibit_tag_list, selected_tags_value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s,
+                                                 all_tags: current_exhibit.owned_tags) %>
   </div>
   <% end %>
   <div class="form-actions">

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

@@ -0,0 +1 @@
+<%= render Spotlight::SelectImageComponent.new(@index_id, @block_item_id) %>

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

@@ -7,7 +7,7 @@
   <% end %>
 
   <%= f.fields_for :avatar, (@contact.avatar || @contact.build_avatar) do |af| %>
-    <div data-cropper="<%= af.object.model_name.singular_route_key %>" data-form-prefix="<%= form_prefix(af) %>">
+    <div data-cropper="<%= af.object.model_name.singular_route_key %>" data-input-prefix="<%= input_prefix(af) %>">
     <%= field_set_tag(t(:'.avatar.header')) do %>
       <p class="instructions"><%= t(:'featured_images.form.crop_area.help_html', scope: [:spotlight], thing: 'contact photo') %></p>
 

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

@@ -1,3 +1,4 @@
+        <%= turbo_frame_tag dom_id(contact.object) do %>
         <div class="row contact">
           <%= contact.hidden_field :id %>
           <div class="col-md-8<%= ' has-error' if contact.object.errors[:email].present? %>">
@@ -6,17 +7,14 @@
               <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>
+              <span class="contact-email-delete-error text-danger" style="display: none;"><%= t('.email_delete_error') %> <span class="error-msg"></span></span>
             </p>
           </div>
           <div class="col-md-4">
             <% if contact.object.id %>
               <span class="contact-email-delete-wrapper">
-                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-sm btn-danger', 
-                            data: { method: :delete, turbo_method: :delete,
-                                    confirm: t('.email_delete_confirmation'),
-                                    turbo_confirm: t('.email_delete_confirmation'),
-                                    remote: true } do %>
+                <%= link_to exhibit_contact_email_path(exhibit_id: exhibit.id, id: contact.object.id), class: 'contact-email-delete btn btn-sm btn-danger',
+                            data: { turbo_method: :delete, turbo_confirm: t('.email_delete_confirmation') } do %>
                   <%= t('.email_delete_button') %>
                 <% end %>
               </span>
@@ -24,3 +22,4 @@
             <%= render partial: 'confirmation_status', locals: {contact_email: contact.object} unless contact.object.new_record? %>
           </div>
         </div>
+        <% end %>

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

@@ -4,7 +4,7 @@
     <div class="row">
       <p class='col-9'><%= t(:".warning_html", export_link: link_to(t(:'spotlight.exhibits.export.download'), spotlight.edit_exhibit_path(current_exhibit, anchor: 'export'))) %></p>
       <div class='col-3'>
-        <%= delete_link current_exhibit, class: 'btn btn-secondary' %>
+        <%= delete_link current_exhibit, class: 'btn btn-primary' %>
       </div>
     </div>
   </div>

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

@@ -30,7 +30,8 @@
             <tbody>
               <% current_exhibit.languages.each do |language| %>
                 <%= f.fields_for :languages, language do |languages| %>
-                  <tr>
+                  <tr id="<%= dom_id(language) %>">
+                    <%= languages.hidden_field :id %>
                     <td><%= t("locales.#{language.locale}") %></td>
                     <td class='text-center'>
                       <div class='checkbox'>
@@ -38,7 +39,7 @@
                         <%= languages.check_box_without_bootstrap :public %>
                       </div>
                       </td>
-                    <td class='text-center'><%= link_to t('.remove'), exhibit_language_path(current_exhibit, language), method: :delete, data: { confirm: t('.modal.confirm') }, class: 'btn btn-sm btn-danger' %></td>
+                    <td class='text-center'><%= link_to t('.remove'), spotlight.exhibit_language_path(current_exhibit, language), data: { turbo_method: :delete, turbo_confirm: t('.modal.confirm')}, class: 'btn btn-sm btn-danger' %></td>
                   </tr>
                 <% end %>
               <% end %>

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

@@ -1,4 +1,4 @@
-<div data-cropper="<%= f.object.model_name.singular_route_key %>" data-form-prefix="<%= form_prefix(f) %>">
+<div data-cropper="<%= f.object.model_name.singular_route_key %>" data-input-prefix="<%= input_prefix(f) %>">
 <%= field_set_tag do %>
   <%= f.check_box(:display, layout: :vertical) %>
 <% end if f.object.is_a? Spotlight::Masthead %>
@@ -11,7 +11,11 @@
         <%= blacklight_icon('warning') %>
         <%= t(:'.non_iiif_alert_html') %>
       </div>
-      <%= 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" }) %>
+      <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>
+      </auto-complete>
       <div id="<%= form_prefix(f) %>-target-panel" style="display:none">
         <div class="card-header">
           <div data-item-title="true"></div>

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

@@ -1,4 +1,4 @@
-<div data-cropper="<%= f.object.model_name.singular_route_key %>" data-form-prefix="<%= form_prefix(f) %>">
+<div data-cropper="<%= f.object.model_name.singular_route_key %>" data-input-prefix="<%= input_prefix(f) %>">
 <%= field_set_tag do %>
   <%= f.check_box(:display, layout: :vertical) %>
 <% end if f.object.is_a? Spotlight::Masthead %>

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

@@ -14,7 +14,7 @@
         </div>
         <% if default_field_label %>
           <div class="restore-default">
-            <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn btn-secondary btn-sm #{'d-none' if config.display_label == default_field_label}" %>
+            <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn btn-primary btn-sm #{'d-none' if config.display_label == default_field_label}" %>
           </div>
         <% end %>
       </div>

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

@@ -17,15 +17,15 @@
               <%= t :'.view.show' %>
             </div>
             <div class="text-center">
-              <%= label_tag 'item_details', class: 'select-label'  do %>
-                <%= select_deselect_action(t :'.view.select_id') %>
-                <%= t(:'.select_all') %>
-              <% end %>
-            </div>
+               <%= label_tag 'item_details', class: 'select-label'  do %>
+                  <%= select_deselect_action(t :'.view.select_id') %>
+                  <%= t(:'.select_all') %>
+                <% end %>
+             </div>
           </th>
           <% available_view_fields.keys.each do |type| %>
             <th class="text-center">
-              <div>
+              <div> 
                 <%= t :".view.#{type}", default: t("blacklight.search.view.#{type}", default: type.to_s.humanize.titleize) %>
               </div>
               <div class="text-center">

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

@@ -1,5 +1,5 @@
 <% set_html_page_title @page.title if @page.should_display_title? %>
-<% render 'tophat' %>
+<% add_page_meta_content(@page) %>
 
 <% content_for(:sidebar) do %>
   <%= render 'sidebar' %>

data/app/views/spotlight/resources/csv_upload/_form.html.erb

@@ -1,5 +1,5 @@
 <%= bootstrap_form_for([current_exhibit, @resource.becomes(Spotlight::Resources::CsvUpload)], layout: :horizontal, label_col: 'col-md-2', control_col: 'col-sm-6 col-md-6', html: { class: 'item-upload-form', multipart: true } ) do |f| %>
-  <%= f.url_field :url, type: "file", help: t('.help_html', link: link_to(t('.template'), template_exhibit_resources_csv_uploads_path)), label: t('.file_label') %>
+  <%= f.url_field :url, type: "file", help: t('.help_html', link: link_to(t('.template'), template_exhibit_resources_csv_uploads_path, data: { turbo: false })), label: t('.file_label') %>
   <div class="form-actions">
     <div class="primary-actions">
       <%= cancel_link @resource, :back, class: 'btn btn-link', role: 'button' %>

data/app/views/spotlight/resources/upload/_form.html.erb

@@ -13,7 +13,7 @@
     <div class="primary-actions">
       <%= hidden_field_tag :tab, 'upload', id: nil %>
       <%= cancel_link @resource, :back, class: 'btn btn-link', role: 'button' %>
-      <%= f.submit t('.add_item_and_continue'), name: 'add-and-continue', class: 'btn btn-secondary' %>
+      <%= f.submit t('.add_item_and_continue'), name: 'add-and-continue', class: 'btn btn-outline-primary' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -55,7 +55,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-    <%= exhibit_create_link Spotlight::Role.new, '#', class: 'btn btn-secondary', data: {behavior: 'new-user'} %>
+    <%= exhibit_create_link Spotlight::Role.new, '#', class: 'btn btn-primary', data: {behavior: 'new-user'} %>
     </div>
   </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= bootstrap_form_for [@search.exhibit, @search], layout: :horizontal, label_col: 'col-md-2 col-sm-2', control_col: 'col-md-7 col-sm-7', data: {form_observer: 'true', autocomplete_exhibit_catalog_path: spotlight.autocomplete_exhibit_search_path(@search.exhibit, @search, q: "%QUERY", format: "json")}, html: {id: 'edit-search'} do |f| %>
+<%= bootstrap_form_for [@search.exhibit, @search], layout: :horizontal, label_col: 'col-md-2 col-sm-2', control_col: 'col-md-7 col-sm-7', data: {form_observer: 'true', autocomplete_exhibit_catalog_path: spotlight.autocomplete_exhibit_search_path(@search.exhibit, @search, q: "%QUERY", format: "json"), turbo: 'false'}, html: {id: 'edit-search'} do |f| %>
   <% if @search.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@search.errors.count, "error") %> prohibited this page from being saved:</h2>

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

@@ -33,7 +33,7 @@
 
       <% if default_value %>
         <div class="">
-          <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-secondary btn-sm #{'d-none' if label.blank? || label == default_value}" %>
+          <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-primary btn-sm #{'d-none' if label.blank? || label == default_value}" %>
         </div>
       <% end %>
 

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

@@ -9,7 +9,7 @@
           </div>
         </div>
         <% if group.searches.count > 1 %>
-          <ul class="browse-group-categories-controls p-0 pt-2 pt-md-0 ml-md-auto ms-md-auto mb-0 d-flex justify-content-center align-items-end">
+          <ul class="browse-group-categories-controls p-0 pt-2 pt-md-0 ms-md-auto mb-0 d-flex justify-content-center align-items-end">
             <li class="prev px-1 overflow-hidden">
               <%= blacklight_icon 'arrow_alt_circle_left' %>
             </li>

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

@@ -26,7 +26,7 @@
               </div>
             <% end %>
             <% if solr_documents_block.zpr_link? && block_options[:iiif_tilesource].present? %>
-              <button class="btn btn-secondary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>"><%= t('.zpr_link_html', title: doc_presenter.heading) %></button>
+              <button class="btn btn-primary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>"><%= t('.zpr_link_html', title: doc_presenter.heading) %></button>
             <% end %>
           </div>
         </div>