blacklight-spotlight 3.0.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931e772ae7165aea85c6664c6c1fcbb615d0397d42d2000b2bc4f7038288ff91
-  data.tar.gz: 5eac236663178ff5476f8b58213f8da5757bd7120108b801792247cc194392b4
+  metadata.gz: c6d38a0f303034a89f2a514617e5bc17b31ad2bb60a2dd865245a1822d5ef27c
+  data.tar.gz: 3a1e9f34a1f5bb1486843486dfc9bbb991b0c8504ae69898dbd852828fbb82f9
 SHA512:
-  metadata.gz: 528286f83609189237af8feef3e40048357b37de3770fdf772bc2672c3b0a52230cb1ab9f2ddfb31b59932aba9a0fafdc44ef2d2f79a333db9618ccf34746acf
-  data.tar.gz: 16900b7cbc3278b6be875cb0e91441f33860dc13200c36898e36f545d236557eddada90fe99536ed2fecd72538c076f6dd0edadeea9e481b5d7d025b470b93b6
+  metadata.gz: a9e96166b8445ac6333e6a5fb2647b1688b2007dcdc5907fb81099c5476f6dc49f053a060dbea12c531fb91934ef5f2c3aa6051ae408c1f654155fc6cd7e9816
+  data.tar.gz: b72e0ccf54ad7969d11167df4aa8139533d4afd0acab8bfe05cd26f54170ca8b52bfe92575224e216dd1af32c537a0a2c2785f2b691567a0c7b176dc2b73e3ba

data/README.md

@@ -9,8 +9,8 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 
 ## Requirements
 
-1. Ruby (2.5.0 or greater)
-2. Rails (5.1 or greater)
+1. Ruby (2.7 or greater)
+2. Rails (5.2 or greater)
 3. Java (7 or greater) *for Solr*
 4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
 

data/app/assets/javascripts/spotlight/admin/blocks/block.js

@@ -1,5 +1,9 @@
 (function ($){
   Spotlight.Block = SirTrevor.Block.extend({
+    scribeOptions: {
+      allowBlockElements: true,
+      tags: { p: true }
+    },
     formable: true,
     editorHTML: function() {
       return _.template(this.template)(this);

data/app/assets/stylesheets/spotlight/_breadcrumbs.scss

@@ -1,8 +1,6 @@
-.breadcrumb-item {
-  .truncated-value {
+.truncated-value {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
-    width: 30ex;
-  }
+    max-width: 30ex;
 }

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -25,7 +25,7 @@ module Spotlight
 
       html_class = 'active' if current
 
-      @context.content_tag(:li, class: "breadcrumb-item #{html_class}") do
+      @context.content_tag(:li, class: "breadcrumb-item truncated-value #{html_class}") do
         @context.link_to_unless(current, element_label(element), compute_path(element), element.options&.except(:current))
       end
     end
@@ -33,7 +33,7 @@ module Spotlight
     private
 
     def element_label(element)
-      @context.content_tag(:span, class: 'truncated-value') { compute_name(element) }
+      @context.content_tag(:span) { compute_name(element) }
     end
   end
 end

data/app/controllers/concerns/spotlight/controller.rb

@@ -67,38 +67,39 @@ module Spotlight
       end
     end
 
-    def search_action_url(*args)
+    def search_action_url(*args, **kwargs)
       if current_exhibit
-        exhibit_search_action_url(*args)
+        exhibit_search_action_url(*args, **kwargs)
       else
-        main_app.search_catalog_url(*args)
+        main_app.search_catalog_url(*args, **kwargs)
       end
     end
 
-    def search_facet_path(*args)
+    def search_facet_path(*args, **kwargs)
       if current_exhibit
-        exhibit_search_facet_path(*args)
+        exhibit_search_facet_path(*args, **kwargs)
       else
-        main_app.catalog_facet_url(*args)
+        main_app.catalog_facet_url(*args, **kwargs)
       end
     end
 
-    def exhibit_search_action_url(*args)
+    def exhibit_search_action_url(*args, **kwargs)
       options = args.extract_options!
+      options = options.merge(kwargs)
       only_path = options[:only_path]
       options.except! :exhibit_id, :only_path
 
       if only_path
-        spotlight.search_exhibit_catalog_path(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_path(current_exhibit, *args, **options)
       else
-        spotlight.search_exhibit_catalog_url(current_exhibit, *args, options)
+        spotlight.search_exhibit_catalog_url(current_exhibit, *args, **options)
       end
     end
 
-    def exhibit_search_facet_path(*args)
+    def exhibit_search_facet_path(*args, **kwargs)
       options = args.extract_options!
-      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).except(:exhibit_id, :only_path)
-      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, options)
+      options = Blacklight::Parameters.sanitize(params.to_unsafe_h.with_indifferent_access).merge(options).merge(kwargs).except(:exhibit_id, :only_path)
+      spotlight.facet_exhibit_catalog_url(current_exhibit, *args, **options&.symbolize_keys)
     end
   end
 end

data/app/controllers/spotlight/attachments_controller.rb

@@ -17,7 +17,7 @@ module Spotlight
 
     private
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def attachment_params
       params.require(:attachment).permit(:name, :file, :uid)
     end

data/app/controllers/spotlight/custom_search_fields_controller.rb

@@ -57,7 +57,7 @@ module Spotlight
       add_breadcrumb t(:'spotlight.configuration.sidebar.search_configuration'), edit_exhibit_search_configuration_path(@exhibit)
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def custom_search_field_params
       params.require(:custom_search_field).permit(:slug, :field, :label)
     end

data/app/controllers/spotlight/pages_controller.rb

@@ -3,9 +3,6 @@
 module Spotlight
   ##
   # Base CRUD controller for pages
-  # rubocop:disable Metrics/ClassLength
-  # Disableing class length because this is a base
-  # controller that gives other controllers their behavior
   class PagesController < Spotlight::ApplicationController
     before_action :authenticate_user!, except: [:show]
     before_action :load_locale_specific_page, only: %i[destroy edit show update]
@@ -32,7 +29,7 @@ module Spotlight
 
       respond_to do |format|
         format.html
-        format.json { render json: @pages.for_locale.published.to_json(methods: [:thumbnail_image_url]) }
+        format.json { render json: @pages.for_default_locale.published.to_json(methods: [:thumbnail_image_url]) }
       end
     end
 
@@ -192,7 +189,7 @@ module Spotlight
       add_breadcrumb t(key, title: current_exhibit.title), spotlight.exhibit_root_path(current_exhibit)
     end
 
-    # Only allow a trusted parameter "white list" through.
+    # Only allow trusted parameters through.
     def page_params
       params.require(controller_name.singularize).permit(allowed_page_params)
     end
@@ -208,5 +205,4 @@ module Spotlight
       end
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/app/controllers/spotlight/searches_controller.rb

@@ -117,9 +117,14 @@ module Spotlight
     end
 
     def query_params
-      params.to_unsafe_h.with_indifferent_access.except(:exhibit_id, :search, *blacklisted_search_session_params).reject { |_k, v| v.blank? }
+      params.to_unsafe_h.with_indifferent_access.except(:exhibit_id, :search, *excluded_search_session_params).reject { |_k, v| v.blank? }
     end
 
+    def excluded_search_session_params
+      blacklisted_search_session_params
+    end
+
+    # @deprecated
     def blacklisted_search_session_params
       %i[id commit counter total search_id page per_page authenticity_token utf8 action controller]
     end

data/app/helpers/spotlight/application_helper.rb

@@ -162,7 +162,7 @@ module Spotlight
       if current_exhibit_theme && current_exhibit.theme != 'default'
         stylesheet_link_tag "#{tag}_#{current_exhibit_theme}"
       else
-        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in white-list of available themes: #{current_exhibit.themes}"
+        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit.themes}"
         stylesheet_link_tag(tag)
       end
     end

data/app/helpers/spotlight/job_trackers_helper.rb

@@ -4,7 +4,7 @@ module Spotlight
   # HTML <meta> tag helpers
   module JobTrackersHelper
     def job_status_icon(job_tracker)
-      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do # rubocop:disable Rails/ContentTag
+      content_tag :span, title: t(job_tracker.status || 'missing', scope: 'spotlight.job_trackers.status') do
         if job_tracker.enqueued? || job_tracker.in_progress?
           '⏱'
         elsif job_tracker.completed?

data/app/helpers/spotlight/main_app_helpers.rb

@@ -40,7 +40,7 @@ module Spotlight
       if current_exhibit_theme && current_exhibit&.theme != 'default'
         stylesheet_link_tag "#{tag}_#{current_exhibit_theme}"
       else
-        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in white-list of available themes: #{current_exhibit&.themes}"
+        Rails.logger.warn "Exhibit theme '#{current_exhibit_theme}' not in the list of available themes: #{current_exhibit&.themes}"
         stylesheet_link_tag(tag)
       end
     end

data/app/jobs/spotlight/reindex_exhibit_job.rb

@@ -14,7 +14,7 @@ module Spotlight
 
       # Use the provided batch size, or calculate a reasonable default
       batch_count = (count.to_f / batch_size).ceil if batch_size
-      batch_count ||= 1 + Math.log(count).round # e.g. 10 => 3, 100 => 6, 1000 => 8
+      batch_count ||= batch_count_based_on_number_of_resources(count)
 
       return Spotlight::ReindexJob.perform_now(exhibit, reports_on: job_tracker) if batch_count == 1
 
@@ -26,6 +26,8 @@ module Spotlight
       job_tracker.update(status: 'pending')
     end
 
+    private
+
     def perform_later_in_batches(exhibit, of:)
       last = 0
       exhibit.resources.select(:id).in_batches(of: of) do |batch|
@@ -35,5 +37,11 @@ module Spotlight
 
       Spotlight::ReindexJob.perform_later(exhibit, reports_on: job_tracker, start: last)
     end
+
+    def batch_count_based_on_number_of_resources(count)
+      return 1 if count.zero?
+
+      1 + Math.log(count).round # e.g. 10 => 3, 100 => 6, 1000 => 8
+    end
   end
 end

data/app/mailers/spotlight/confirmation_mailer.rb

@@ -6,8 +6,9 @@ module Spotlight
   class ConfirmationMailer < ActionMailer::Base
     include Devise::Mailers::Helpers
 
-    def confirmation_instructions(record, token, opts)
+    def confirmation_instructions(record, token, opts, exhibit: nil)
       @token = token
+      @exhibit = exhibit
       initialize_from_record(record)
       mail headers_for(:confirmation_instructions, opts)
     end

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

@@ -12,7 +12,7 @@ module SirTrevorRails
       end
 
       def pages
-        @pages ||= parent.exhibit.pages.published.where(slug: item_ids).sort do |a, b|
+        @pages ||= parent.exhibit.pages.for_default_locale.published.where(slug: item_ids).sort do |a, b|
           ordered_items.index(a.slug) <=> ordered_items.index(b.slug)
         end
       end
@@ -28,7 +28,7 @@ module SirTrevorRails
 
         result[:data][:item].transform_values! do |v|
           begin
-            v['thumbnail_image_url'] = parent.exhibit.pages.find(v['id']).thumbnail_image_url
+            v['thumbnail_image_url'] = parent.exhibit.pages.for_default_locale.find(v['id']).thumbnail_image_url
           rescue ActiveRecord::RecordNotFound
             v = nil
           end

data/app/models/spotlight/contact_email.rb

@@ -33,7 +33,7 @@ module Spotlight
     end
 
     def send_devise_notification(notification, *args)
-      notice = notification_mailer.send(notification, self, *args)
+      notice = notification_mailer.send(notification, self, *args, exhibit: exhibit)
       if notice.respond_to? :deliver_now
         notice.deliver_now
       else

data/app/models/spotlight/page.rb

@@ -46,6 +46,12 @@ module Spotlight
 
     after_update :update_translated_pages_weights_and_parent_page
 
+    def title
+      return super if I18n.locale == I18n.default_locale
+
+      translated_page_for(I18n.locale)&.title || super
+    end
+
     def content_changed!
       @content = nil
     end
@@ -133,6 +139,8 @@ module Spotlight
     end
 
     def translated_page_for(locale)
+      return self if locale == self.locale
+
       translated_pages.for_locale(locale).first
     end
 

data/app/models/spotlight/page_configurations.rb

@@ -57,7 +57,7 @@ module Spotlight
     end
 
     def available_view_configs
-      available_view_fields.map { |k, v| { key: k, label: v.display_label(k) } }
+      available_view_fields.map { |k, v| { key: k, label: v.display_label } }
     end
 
     def attachment_endpoint

data/app/services/spotlight/exhibit_import_export_service.rb

@@ -49,7 +49,7 @@ module Spotlight
       deserialize_featured_image(exhibit, :masthead, hash[:masthead]) if hash[:masthead]
       deserialize_featured_image(exhibit, :thumbnail, hash[:thumbnail]) if hash[:thumbnail]
 
-      exhibit.blacklight_configuration.update hash[:blacklight_configuration].deep_stringify_keys if hash[:blacklight_configuration]
+      exhibit.blacklight_configuration.update hash[:blacklight_configuration].with_indifferent_access if hash[:blacklight_configuration]
 
       hash[:main_navigations].each do |attr|
         ar = exhibit.main_navigations.find_or_initialize_by(nav_type: attr[:nav_type])

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

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
+    <%= render partial: 'shared/analytics' %>
     <title><%= h(@page_title || application_name.to_s) %></title>
     <link href="<%= current_exhibit ? spotlight.opensearch_exhibit_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= h(@page_title || application_name.to_str) %>" type="application/opensearchdescription+xml" rel="search"/>
     <%= favicon_link_tag 'favicon.ico' %>
@@ -22,8 +22,11 @@
     <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
   </head>
   <body class="<%= render_body_class %>">
+    <%= render partial: 'shared/body_preamble' %>
     <div id="skip-link">
-      <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% if should_render_spotlight_search_bar? %>
+        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% end %>
       <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
       <%= content_for(:skip_links) %>
     </div>

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

@@ -1 +0,0 @@
-<%= render 'shared/analytics' %>

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

@@ -1,4 +1,4 @@
-<% if show_contact_form? %>
+<% if show_contact_form? && (current_exhibit.nil? || !current_page?(spotlight.new_exhibit_contact_form_path(current_exhibit))) %>
   <div id="report-problem-form">
     <%= render 'spotlight/shared/report_a_problem' %>
   </div>

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

@@ -1,8 +1,14 @@
-<ul class="navbar-nav mr-auto">
+<% nav_actions = capture do %>
   <%= render_nav_actions do |config, action|%>
     <li class="nav-item"><%= action %></li>
   <% end %>
-</ul>
+<% end %>
+
+<% if nav_actions.present? %>
+  <ul class="navbar-nav mr-auto">
+    <%= nav_actions %>
+  </ul>
+<% end %>
 
 <ul class="navbar-nav">
   <%= render '/spotlight/shared/locale_picker' %>

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

@@ -10,7 +10,7 @@
 <%- if @response.empty? %>
   <%= render "zero_results" %>
 <%- else %>
-  <%= render_document_index %>
+  <%= render_document_index(@response.documents) %>
 <%- end %>
 
 <%= render 'results_pagination' %>

data/app/views/spotlight/confirmation_mailer/confirmation_instructions.html.erb

@@ -1,5 +1,5 @@
 <p><%= t(:'.welcome', email: @email) %></p>
-
-<p><%= t(:'.instructions') %></p>
-
+<br /><br />
+<%= simple_format t(:'.instructions', exhibit_title: @exhibit&.title) %>
+<br /><br />
 <p><%= link_to t(:'.confirm'), spotlight.contact_email_confirmation_url(:confirmation_token => @token) %></p>

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

@@ -4,7 +4,7 @@
       <p class="instructions"><%= t :'.instructions' %></p>
       <div class="form-group">
         <%= file_field_tag :file, class: 'form-control' %>
-        <%= hidden_field_tag :tab, 'import' %>
+        <%= hidden_field_tag :tab, 'import', id: nil %>
       </div>
       <div class="form-actions">
         <div class="primary-actions">

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

@@ -4,7 +4,7 @@
   <%= bootstrap_form_for [current_exhibit, Spotlight::Language.new], layout: :horizontal, html: { class: 'row' }, label_col: "col-sm-3", control_col: "col-sm-9" do |f| %>
     <div class='col-sm-6'>
       <%= f.select('locale', add_exhibit_language_dropdown_options, prompt: t('.selection_prompt')) %>
-      <%= hidden_field_tag :tab, 'language' %>
+      <%= hidden_field_tag :tab, 'language', id: nil %>
     </div>
     <div class='col-sm-6'>
       <%= f.submit nil, class: 'btn btn-primary' %>
@@ -48,7 +48,7 @@
       </div>
       <div class="form-actions">
         <div class="primary-actions">
-          <%= hidden_field_tag :tab, 'language' %>
+          <%= hidden_field_tag :tab, 'language', id: nil %>
           <%= f.submit nil, class: 'btn btn-primary' %>
         </div>
       </div>

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

@@ -4,7 +4,7 @@
 
     <%= f.text_field :field %>
     <%= f.text_field :value %>
-    <%= hidden_field_tag :tab, 'filter' %>
+    <%= hidden_field_tag :tab, 'filter', id: nil %>
 
     <div class="form-actions">
       <div class="primary-actions">

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

@@ -11,7 +11,7 @@
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= hidden_field_tag :tab, 'upload' %>
+      <%= hidden_field_tag :tab, 'upload', id: nil %>
       <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item_and_continue'), name: 'add-and-continue', class: 'btn btn-secondary' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>

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

@@ -1,7 +1,7 @@
 <%= f.form_group :document_index_view_types, label: {text: t(:'.label'), class: 'pt-0'} 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| %>
-      <%= vt.check_box key, label: view.display_label(key) %>
+      <%= vt.check_box key, label: view.display_label %>
     <% end %>
   <% end %>
 <% end %>

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

@@ -1,8 +1,10 @@
 <%= content_tag :span, t(:'.document_count', count: metadata[:document_count]) %>
 <% if metadata[:document_count] > 0 %>
   •
-  <% if metadata[:value_count] > Spotlight::FieldMetadata::FACET_LIMIT %>
-    <%= content_tag :span, t(:'.too_many_values_count', count: Spotlight::FieldMetadata::FACET_LIMIT) %>
+  <% limit = field_config&.limit || Spotlight::FieldMetadata::FACET_LIMIT %>
+  <% limit = blacklight_config.default_facet_limit if limit == true %>
+  <% if metadata[:value_count] >= limit %>
+    <%= content_tag :span, t(:'.too_many_values_count', count: limit) %>
   <% else %>
     <%= content_tag :span, t(:'.value_count', count: metadata[:value_count]) %>
   <% end %>

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

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

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

@@ -40,7 +40,7 @@
         <% end %>
         <%= f.form_group label: { text: t(:".default_index_view_type"), class: 'pt-0' } do %>
           <% available_document_index_views.each do |key, view| %>
-            <%= f.radio_button :default_index_view_type, key, label: view.display_label(key) %>
+            <%= f.radio_button :default_index_view_type, key, label: view.display_label %>
           <% end %>
         <% end %>
         <% unless @search.query_params.blank? %>

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

@@ -1 +1 @@
-<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>
+<%= sanitize iframe_block.code, tags: %w(iframe), attributes: %w(id aria-label title width height marginwidth marginheight src frameborder allowfullscreen sandbox seamless srcdoc scrolling) %>

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

@@ -17,6 +17,7 @@
       </div>
       <% end %>
 
+      <h2 class="sr-only visually-hidden"><%= t('blacklight.search.search_results') %></h2>
       <%= render_document_index_with_view(block_document_index_view_type(search_results_block), document_list) %>
       <%= render 'results_pagination' %>
   <%- end %>

data/app/views/spotlight/translations/_browse_categories.html.erb

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'browse' %>
+    <%= hidden_field_tag :tab, 'browse', id: nil %>
     <div class="row">
       <div class="col-4 text-right">
         <span class="browse-translations-header">

data/app/views/spotlight/translations/_groups.html.erb

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'groups' %>
+    <%= hidden_field_tag :tab, 'groups', id: nil %>
 
     <% current_exhibit.groups.each do |group| %>
       <% title_translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "#{group.slug}.title", locale: @language) %>

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

@@ -8,7 +8,7 @@
 
       <div class="input-group col px-0">
         <%= file_field_tag :file, class: 'form-control' %>
-        <%= hidden_field_tag :tab, 'import' %>
+        <%= hidden_field_tag :tab, 'import', id: nil %>
         <div class="input-group-append">
           <%= f.submit t(:'.import_submit'), class: 'btn btn-primary' %>
         </div>

data/app/views/spotlight/translations/_metadata.html.erb

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add a hidden field for the language so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'metadata' %>
+    <%= hidden_field_tag :tab, 'metadata', id: nil %>
 
     <% non_custom_metadata_fields.each do |key, field_config| %>
       <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "blacklight.search.fields.#{key}", locale: @language) %>

data/app/views/spotlight/translations/_search_fields.html.erb

@@ -2,7 +2,7 @@
   <%= bootstrap_form_for current_exhibit, url: spotlight.exhibit_translations_path(current_exhibit), layout: :horizontal do |f| %>
     <% # Add hidden fields for the language and tab so the redirect knows how to come back here %>
     <%= hidden_field_tag :language, @language %>
-    <%= hidden_field_tag :tab, 'search_fields' %>
+    <%= hidden_field_tag :tab, 'search_fields', id: nil %>
 
     <div class='translation-field-based-search-fields'>
       <h2 class='translation-subheading'>

data/config/i18n-tasks.yml

@@ -77,7 +77,7 @@ ignore_unused:
   # TODO Look into these as its unclear
   - activerecord.models.spotlight.page
   #- # perhaps removed here? https://github.com/projectblacklight/spotlight/commit/d4fdf04565ab3d648f0cb2a1238d84f262509fcd
-  - devise.mailer.invitation_instructions.subject # Does this even work? https://github.com/projectblacklight/spotlight/blob/master/app/mailers/spotlight/invitation_mailer.rb#L16
+  - devise.mailer.*.* # Does this even work? https://github.com/projectblacklight/spotlight/blob/master/app/mailers/spotlight/invitation_mailer.rb#L16
   - helpers.submit.solr_document.{batch_error,batch_updated,create,created,destroyed,submit,update,updated} # Do we need this?
   - helpers.submit.user.{batch_error,batch_updated,create,created,destroyed,submit,update,updated} # Do we need this?
   - helpers.action.destroy # no idea here

data/config/locales/spotlight.en.yml

@@ -27,6 +27,10 @@ en:
       spotlight/group: Browse group
       spotlight/search: Browse category
   cancel: Cancel
+  devise:
+    mailer:
+      confirmation_instructions:
+        contact_email_subject: Exhibit feedback confirmation
   drag: Drag
   helpers:
     action:
@@ -50,7 +54,7 @@ en:
         destroy: Delete group
       spotlight/role:
         create: Add a new user
-        destroy: Remove from site
+        destroy: Remove from exhibit
       spotlight/search:
         destroy: Delete
         edit_long: Edit this saved search
@@ -408,9 +412,14 @@ en:
         users: Users
     confirmation_mailer:
       confirmation_instructions:
-        confirm: Confirm my account
-        instructions: 'You can confirm your account email through the link below:'
-        welcome: Welcome %{email}!
+        confirm: Yes, add me to the list of feedback form recipients
+        instructions: |
+          An administrator of the %{exhibit_title} exhibit has added your email address to the list of feedback form recipients.
+          This will enable you to receive any feedback submitted through the feedback form by visitors to the %{exhibit_title} exhibit.
+
+          To receive feedback from this exhibit, confirm your decision through the link below. If you do not want to
+          receive feedback form submissions from this exhibit, you can ignore this email.
+        welcome: Hello %{email},
     contact_form:
       subject: "%{application_name} exhibit feedback"
     contacts: