blacklight-spotlight 3.0.0.rc4 → 3.0.2

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

@@ -4,8 +4,8 @@
       <%= field.hidden_field :weight, 'data-property' => 'weight' %>
       <div class="handle-wrap" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
         <div class="dd-handle dd3-handle"><%= t :drag %></div>
-        <a href="#edit-in-place" class="field-label edit-in-place"><%= index_field_label(blacklight_config.document_model.new, key) %></a>
-        <%= field.hidden_field :label, value: index_field_label(blacklight_config.document_model.new, key), class: 'form-control form-control-sm', data: {:"edit-field-target" => 'true'} %>
+        <a href="#edit-in-place" class="field-label edit-in-place"><%= config.display_label %></a>
+        <%= field.hidden_field :label, value: config.display_label, class: 'form-control form-control-sm', data: {:"edit-field-target" => 'true'} %>
        </div>
     </td>
     <td class="checkbox-cell text-center"><%= field.check_box :show, inline: true, checked: config.show, disabled: !config.immutable.show.nil?, hide_label: true %></td>

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

@@ -50,7 +50,7 @@
 
       <% if @page.respond_to? :thumbnail %>
       <div role="tabpanel" class="tab-pane" id="page-thumbnail">
-        <%= f.fields_for :thumbnail, (@page.thumbnail || @page.build_thumbnail) do |m| %>
+        <%= f.fields_for :thumbnail, (@page.thumbnail || @page.build_thumbnail), include_id: false do |m| %>
           <p class="instructions"><%= t(:'.thumbnail.help') %></p>
           <%= render '/spotlight/featured_images/form', f: m, initial_crop_selection: Spotlight::Engine.config.featured_image_thumb_size, crop_type: :thumbnail %>
         <% end %>
@@ -61,7 +61,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {})) %>
+      <%= link_to(t('cancel'), :back, data: (@page.lock && @page.lock.current_session? ? { lock: url_for([spotlight, @page.exhibit, @page.lock]) } : {}), class: 'btn-sizing') %>
       <%= f.submit class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -1,5 +1,5 @@
 <%= curation_page_title t(:"spotlight.pages.index.#{page_collection_name}.header") %>
-<%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, page_collection_name]), layout: :horizontal, control_col: 'col-sm-10', html: {:'data-form-observer' => true} do |f| %>
+<%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, page_collection_name.to_sym]), layout: :horizontal, control_col: 'col-sm-10', html: {:'data-form-observer' => true} do |f| %>
 
     <%= render partial: 'header', locals: {f: f} %>
     <h2 class="mt-4"><%= t :'.pages_header' %></h2>
@@ -20,7 +20,7 @@
     </div>
 <%- end -%>
 <div>
-  <%= form_for @page, url: spotlight.polymorphic_path([@exhibit, page_collection_name]), html: {class: "expanded-add-button"} do |f|%>
+  <%= form_for @page, url: spotlight.polymorphic_path([@exhibit, page_collection_name.to_sym]), html: {class: "expanded-add-button"} do |f|%>
     <a href='#add-new' class="btn btn-primary" data-turbolinks="false" data-expanded-add-button="true" data-field-target="[data-title-field]">
       <%= t(:'.new_page') %> <%= blacklight_icon('chevron_right') %>
       <span data-title-field="true" class="input-field">

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

@@ -3,9 +3,9 @@
 <div class="view-type">
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
-    <%  views.each do |view, config| %>
-    <%= link_to url_for(search_state.to_h.merge(view: view)), :title => t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), :class => "btn btn-outline-secondary view-type-#{ view.to_s.parameterize } #{"active" if block_document_index_view_type(block) == view}" do %>
-      <%= render_view_type_group_icon view %>
+    <% views.each do |view, config| %>
+      <%= link_to url_for(search_state.to_h.merge(view: view)), :title => t("blacklight.search.view_title.#{view}", default: t("blacklight.search.view.#{view}", default: blacklight_config.view[view].title)), :class => "btn btn-outline-secondary view-type-#{ view.to_s.parameterize } #{"active" if block_document_index_view_type(block) == view}" do %>
+        <%= blacklight_icon config.icon || view %>
         <span class="caption"><%= t("blacklight.search.view.#{view}") %></span>
       <% end %>
     <% end %>

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

@@ -5,7 +5,7 @@
   <%= render 'sidebar' %>
 <% end if @page.display_sidebar?%>
 
-<%= cache_unless current_user, [@page, request.query_string] do %>
+<%= cache_unless current_user, [current_exhibit, @page, I18n.locale, request.query_string] do %>
   <div class="clearfix">
     <%= render 'edit_page_link' if can? :edit, @page %>
     <% if @page.should_display_title? %>

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

@@ -2,7 +2,7 @@
   <%= f.text_field :url  %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+      <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
   <%= 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') %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+      <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -2,7 +2,7 @@
   <%= f.text_field :url, help: t('.url-field.help'), label: t('.manifest') %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+      <%= cancel_link @resource, :back, class: 'btn-sizing' %>
       <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -3,7 +3,7 @@
     <%= f.url_field :json, type: "file", label: t('.file_label') %>
     <div class="form-actions">
       <div class="primary-actions">
-        <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+        <%= cancel_link @resource, :back, class: 'btn-sizing' %>
         <%= f.submit t('.add_item'), class: 'btn btn-primary' %>
       </div>
     </div>
@@ -12,4 +12,4 @@
   <div class="alert alert-info">
     Uploading raw documents is restricted to site administrators.
   </div>
-<% end %>
+<% end %>

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

@@ -12,7 +12,7 @@
   <div class="form-actions">
     <div class="primary-actions">
       <%= hidden_field_tag :tab, 'upload' %>
-      <%= cancel_link @resource, :back, class: 'btn btn-secondary' %>
+      <%= 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' %>
     </div>

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 }.keys.each do |key| %>
-      <%= vt.check_box key, label: view_label(key) %>
+    <% @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) %>
     <% end %>
   <% end %>
 <% end %>

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

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

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

@@ -17,4 +17,7 @@
   <% if (can? :manage, current_exhibit.translations.first_or_initialize) && current_exhibit.languages.any? %>
     <%= nav_link t(:'spotlight.curation.sidebar.translations'), spotlight.edit_exhibit_translations_path(current_exhibit), 'data-no-turbolink' => true %>
   <% end %>
+  <% if can? :bulk_update, current_exhibit %>
+    <%= nav_link t(:'spotlight.curation.sidebar.bulk_updates'), spotlight.edit_exhibit_bulk_updates_path(current_exhibit), 'data-no-turbolink' => true %>
+  <% end %>
 </ul>

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

@@ -2,9 +2,9 @@
   <% browse_group_categories_block.groups.each do |group| %>
     <div class="browse-group-categories-block" data-browse-group-categories-count="<%= group.searches.count %>">
       <div class="d-flex flex-column flex-md-row py-2">
-        <div class="d-flex justify-content-between align-items-end">
+        <div class="d-flex justify-content-between align-items-baseline">
           <h2 class="m-0"><%= group.title %></h2>
-          <div class="pl-5">
+          <div class="pl-3">
             <%= link_to t(:'.view_all'), exhibit_browse_groups_path(current_exhibit, group) %>
           </div>
         </div>
@@ -21,7 +21,7 @@
       </div>
       <div class="spotlight-flexbox browse-categories categories-<%= [group.searches.count, (@page.display_sidebar? ? 3 : 4)].min %>" data-browse-group-categories-carousel data-sidebar='<%= @page.display_sidebar? %>' data-browse-group-categories-count="<%= group.searches.count %>">
         <% group.searches.published.each_with_index do |search, index| %>
-          <div class="box category-1 justify-content-center justify-content-md-start">
+          <div class="box category-1 justify-content-center justify-content-md-space-around">
             <%= link_to spotlight.exhibit_browse_group_path(current_exhibit, group, search), class: 'justify-content-center' do %>
               <div class="browse-category" style='background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.5)), url("<%= search.thumbnail.iiif_url if search.thumbnail %>")'>
                 <div class="category-caption">

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

@@ -10,7 +10,7 @@
 
       <% views = blacklight_view_config_for_search_block(search_results_block) %>
       <% if views.length > 1 -%>
-      <div id="sortAndPerPage" class="clearfix" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label', default: 'Results navigation')%>">
+      <div id="sortAndPerPage" class="clearfix my-3" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label', default: 'Results navigation')%>">
         <div class="search-widgets float-right">
           <%= render partial: 'view_type_group', locals: { block: search_results_block } %>
         </div>

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

@@ -5,28 +5,28 @@
 
     <div class="items-col spotlight-flexbox <%= solr_documents_block.text? ? "col-md-6" : "col-md-12" %> <%= solr_documents_block.content_align == 'right' ? 'float-right' : 'float-left' %>">
       <% solr_documents_block.each_document do |block_options, document| %>
-        <% doc_presenter = index_presenter(document) %>
+        <% doc_presenter = document_presenter(document) %>
         <div class="box" data-id="<%= document.id %>">
           <div class="contents">
             <% if block_options[:thumbnail_image_url].present? %>
-              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading), counter: -1) %>
-            <% elsif has_thumbnail? document %>
-              <%= render_thumbnail_tag(document, { class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+            <% elsif doc_presenter.thumbnail.exists? %>
+              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
             <% end %>
             <% if solr_documents_block.primary_caption? %>
               <div class="caption primary-caption">
-                <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_block.primary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_block.primary_caption_field)) %>
+                <%= solr_documents_block.document_caption(doc_presenter, solr_documents_block.primary_caption_field) %>
               </div>
             <% end %>
             <% if solr_documents_block.secondary_caption? %>
               <div class="caption secondary-caption">
-                <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_block.secondary_caption_field)) %>
+                <%= solr_documents_block.document_caption(doc_presenter, solr_documents_block.secondary_caption_field) %>
               </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] %>">Show in ZPR viewer</button>
+              <button class="btn btn-secondary zpr-link" data-iiif-tilesource="<%= block_options[:iiif_tilesource] %>"><%= t('.zpr_link_html', title: doc_presenter.heading) %></button>
             <% end %>
           </div>
         </div>

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

@@ -6,24 +6,24 @@
   <div id="<%= html_id %>" class="carousel slide" data-ride="carousel"  data-interval="<%= solr_documents_carousel_block.interval %>">
     <div class="carousel-inner text-center">
     <% solr_documents_carousel_block.each_document.each_with_index do |(block_options, document), index| %>
-      <% doc_presenter = index_presenter(document) %>
+      <% doc_presenter = document_presenter(document) %>
       <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
         <% if block_options[:full_image_url].present? %>
-          <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading), counter: -1) %>
+          <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
         <% elsif block_options[:iiif_tilesource_base].present?  %>
-          <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading), counter: -1) %>
-        <% elsif has_thumbnail? document %>
-          <%= render_thumbnail_tag(document, { alt: doc_presenter.heading }, document_counter: -1) %>
+          <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+        <% elsif doc_presenter.thumbnail.exists? %>
+          <%= doc_presenter.thumbnail.thumbnail_tag({ alt: doc_presenter.heading }, document_counter: -1) %>
         <% end %>
         <div class="carousel-caption">
           <% if solr_documents_carousel_block.primary_caption? %>
             <h3 class="primary">
-              <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_carousel_block.primary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_carousel_block.primary_caption_field)) %>
+              <%= solr_documents_carousel_block.document_caption(doc_presenter, solr_documents_carousel_block.primary_caption_field) %>
             </h3>
           <% end %>
           <% if solr_documents_carousel_block.secondary_caption? %>
             <div class="secondary">
-              <%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_carousel_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_carousel_block.secondary_caption_field)) %>
+              <%= solr_documents_carousel_block.document_caption(doc_presenter, solr_documents_carousel_block.secondary_caption_field) %>
             </div>
           <% end %>
         </div>

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

@@ -9,24 +9,26 @@
         <div class="col-sm-6">
           <div class="carousel-inner">
             <% solr_documents_features_block.each_document.each_with_index do |(block_options, document), index| %>
-              <% doc_presenter = index_presenter(document) %>
+              <% doc_presenter = document_presenter(document) %>
               <div class="carousel-item <%= 'active' if index == 0 %>" data-id="<%= document.id %>">
                 <% if block_options[:full_image_url].present? %>
-                  <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading), counter: -1) %>
+                  <%= link_to_document(document, image_tag(block_options[:full_image_url], alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
                 <% elsif block_options[:iiif_tilesource_base].present?  %>
-                  <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading), counter: -1) %>
-                <% elsif has_thumbnail? document %>
-                  <%= render_thumbnail_tag(document, { alt: doc_presenter.heading }, document_counter: -1) %>
+                  <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!800,800/0/default.jpg', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+                <% elsif doc_presenter.thumbnail.exists? %>
+                  <%= doc_presenter.thumbnail.thumbnail_tag({ alt: doc_presenter.heading }, document_counter: -1) %>
                 <% end %>
               </div>
 
               <% indicators << capture do %>
                 <li data-target="#<%= html_id %>" data-slide-to="<%= index %>" class="list-group-item <%= 'active' if index == 0 %>">
-                  <a href="#" title="<%= (caption_text = doc_presenter.field_value(blacklight_config.index_fields[solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field(document)] || Blacklight::Configuration::NullField.new(solr_documents_features_block.primary_caption? ? solr_documents_features_block.primary_caption_field : document_show_link_field(document)))) %>">
+                  <% caption_text = solr_documents_features_block.document_caption(doc_presenter, solr_documents_features_block.primary_caption_field, default: Spotlight::PageConfigurations::DOCUMENT_TITLE_KEY) %>
+
+                  <a href="#" title="<%= caption_text %>">
                     <%= truncate(caption_text, length: 95) %>
                   </a>
                   <% if solr_documents_features_block.secondary_caption? %>
-                    <p><%= doc_presenter.field_value(blacklight_config.index_fields[solr_documents_features_block.secondary_caption_field] || Blacklight::Configuration::NullField.new(solr_documents_features_block.secondary_caption_field)) %></p>
+                    <p><%= solr_documents_features_block.document_caption(doc_presenter, solr_documents_features_block.secondary_caption_field) %></p>
                   <% end %>
                 </li>
               <% end %>

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

@@ -3,14 +3,14 @@
   <div class="items-col align-content-start justify-content-between flex-wrap <%= solr_documents_grid_block.text? ? 'col-md-9' : 'col-md-12' %> <%= solr_documents_grid_block.content_align == 'right' ? 'float-right' : 'float-left' %>">
     <% if solr_documents_grid_block.documents? %>
         <% solr_documents_grid_block.each_document.each_with_index do |(block_options, document), index| %>
-          <% doc_presenter = index_presenter(document) %>
+          <% doc_presenter = document_presenter(document) %>
           <div class="box item-<%= index %>" data-id="<%= document.id %>">
             <% if block_options[:thumbnail_image_url].present? %>
-              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading), counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:thumbnail_image_url], class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
             <% elsif block_options[:iiif_tilesource_base].present?  %>
-              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading), counter: -1) %>
-            <% elsif has_thumbnail? document %>
-              <%= render_thumbnail_tag(document, { class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
+              <%= link_to_document(document, image_tag(block_options[:iiif_tilesource_base] + '/full/!400,400/0/default.jpg', class: 'img-thumbnail', alt: doc_presenter.heading, skip_pipeline: true), counter: -1) %>
+            <% elsif doc_presenter.thumbnail.exists? %>
+              <%= doc_presenter.thumbnail.thumbnail_tag({ class: 'img-thumbnail', alt: doc_presenter.heading }, document_counter: -1) %>
             <% end %>
           </div>
         <% end %>

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

@@ -16,6 +16,10 @@
                 <%= file[:caption] %>
               </div>
             <% end %>
+
+            <% if uploaded_items_block.zpr_link? %>
+              <%= button_tag t('.zpr_link_html', title: file[:caption]), class: 'btn btn-secondary zpr-link', data: { 'iiif-tilesource' => { type: 'image', url: file[:url] }.to_json } %>
+            <% end %>
           </div>
         </div>
       <% end %>

data/app/views/spotlight/tags/_tag.html.erb

@@ -0,0 +1,24 @@
+<% tag = f.object %>
+
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: tag.id.to_s, field: f, dd3_content_classes: "tag" , enabled_method: :present?, label_method: :name, label: tag.name } do |_, section| %>
+  <% case section when nil %>
+  <div class="d-flex flex-grow-1">
+    <div class="flex-grow-1 mx-2 main">
+      <h4 class="card-title h6 mb-0" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
+        <a href="#edit-in-place" class="field-label edit-in-place"><%= tag.name %></a>
+        <%= f.hidden_field :name, value: tag.name , class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true'} %>
+      </h4>
+
+      <div class="card-text">
+        <div class=""><%= t 'spotlight.tags.index.taggings.count', count: tag.taggings.count %> &bull; <%= link_to t(:'helpers.action.view'), url_to_tag_facet(tag.name) %></div>
+        <%= f.hidden_field :current_name, value: tag.name %>
+
+      </div>
+    </div>
+    <div class="flex m-2">
+      <div class="card-text">
+        <%= delete_link(tag, exhibit_tag_path(current_exhibit, tag), class: 'btn btn-danger btn-sm') %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -7,21 +7,17 @@
 <% if @tags.empty? %>
   <p><%= t :'.no_tags' %></p>
 <% else %>
-<table class="table table-striped tags">
-  <thead>
-    <th><%= t '.name' %></th>
-    <th><%= t '.taggings.count' %></th>
-    <%# TODO last used? %>
-    <th><%= t '.actions' %></th>
-  </thead>
-  <tbody>
-  <% @tags.each do |tag| %>
-    <tr>
-      <td><%= link_to tag.name, url_to_tag_facet(tag.name) %></td>
-      <td><%= tag.taggings.count %></td>
-      <td><%= delete_link(tag, exhibit_tag_path(current_exhibit, tag), class: 'btn btn-danger btn-sm') %></td>
-    </tr>
+  <%= bootstrap_form_for @exhibit, url: update_all_exhibit_tags_path(@exhibit), layout: :horizontal, control_col: 'col-sm-10' do |f| %>
+    <ul class="dd-list">
+      <% @tags.each_with_index do |tag, index| %>
+        <%= f.fields_for :owned_tags_attributes, tag, index: index do |p| %>
+          <%= render partial: 'tag', locals: { f: p } %>
+        <% end %>
+      </ul>
+    <% end %>
+
+    <div class="float-right">
+      <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
+    </div>
   <% end %>
-  </tbody>
-</table>
 <% end %>

data/app/views/spotlight/translations/show.yaml.yamlbuilder

@@ -71,6 +71,12 @@ json.set!(locale) do
     end
   end
 
+  current_exhibit.groups.each do |group|
+    json.set!(group.slug) do
+      json.title group.translated_title(default: '')
+    end
+  end
+
   current_exhibit.searches.each do |search|
     json.set!(search.slug) do
       json.title search.translated_title(default: '')

data/config/i18n-tasks.yml

@@ -83,6 +83,7 @@ ignore_unused:
   - helpers.action.destroy # no idea here
   - helpers.action.spotlight/search.destroy # I think it might be used by #action_default_value
   - helpers.submit.contact_form.create # /shrug
+  - spotlight.bulk_actions.{add_tags,change_visibility,remove_tags}.changed.* # app/controllers/spotlight/bulk_actions_controller.rb
 
 <% I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
       patterns: [

data/config/locales/spotlight.en.yml

@@ -152,6 +152,10 @@ en:
       spotlight_default:
         updated: The %{model} was successfully updated.
       submit: Save changes
+      tags:
+        batch_updated:
+          one: Renaming %{count} tag
+          other: Renaming %{count} tags
       update: Save changes
   locales:
     ar: Arabic
@@ -165,12 +169,6 @@ en:
     pt-BR: Portuguese - Brazil
     sq: Albanian
     zh: Chinese
-  reindexing_log:
-    status:
-      completed: Successful
-      enqueued: Not yet started
-      failed: Failed
-      in_progress: In progress
   shared:
     site_sidebar:
       documentation: Curator documentation
@@ -237,6 +235,130 @@ en:
         zero_results:
           expand_html: You can <a href="%{clear_search_url}"> clear this search</a> or try <a href="%{expand_search_url}">searching all exhibit items for "%{browse_query}"</a>.
           result_number: Your search did not match any items in this browse category.
+    bulk_actions:
+      add: Add
+      add_tags:
+        changed:
+          one: Tags are being added for %{count} item.
+          other: Tags are being added for %{count} items.
+        description:
+          one: There is %{count} item in the current search result set. Tags entered below will be added to this item. This action won’t affect any tags already assigned to this item.
+          other: There are %{count} items in the current search result set. Tags entered below will be added to all %{count} items in the result set. This action won’t affect any tags already assigned to these items.
+        heading: Add tags
+        label: Enter tags to add
+      change: Change
+      change_visibility:
+        changed:
+          one: Visibility of %{count} item is being updated.
+          other: Visibility of %{count} items is being updated.
+        description:
+          one: There is %{count} item in the current search result set. A visibility change will be applied to this item.
+          other: There are %{count} items in the current search result set. A visibility change will be applied to all items in the result set.
+        heading: Change item visibility
+        label: Item visibility
+        private: Private
+        public: Public
+      confirm: All items in the result set will be updated. Are you sure?
+      label: Bulk actions
+      remove: Remove
+      remove_tags:
+        assigned: Currently assigned tags
+        changed:
+          one: Tags are being removed for %{count} item.
+          other: Tags are being removed for %{count} items.
+        description_html:
+          one: "<p>There is %{count} item in the current search result set. Tags shown below are assigned to this item.</p><p>When you remove a tag below it will be unassigned from this item.</p>"
+          other: "<p>There are %{count} items in the current search result set. Tags shown below are assigned to one or more of those items.</p><p>When you remove a tag below it will be unassigned from any item in the result set to which that tag is currently assigned.</p>"
+        heading: Remove tags
+        label: Enter tags to remove
+    bulk_updates:
+      download:
+        guidelines_html: |
+          <h2>Guidelines for CSV updates</h2>
+          <p class="instructions">
+            The downloadable CSV file for this exhibit contains one line for each item in the exhibit. Each line contains one or more comma-separated values. Although you can update the CSV file directly, we strongly recommended importing it into a spreadsheet application and making your updates there. The rest of these guidelines assume you are making updates in a spreadsheet.
+          </p>
+          <p class="instructions">
+            Note that the more lines there are in the completed CSV file that you upload, the longer the updates will take to process. If your exhibit contains more than a few thousand items, after importing the CSV file into a spreadsheet application, you should consider removing the rows of items you do not intend to update. This will also make it easier to focus on the items you do intend to update.
+          </p>
+          <h3>Column headers</h3>
+          <p class="instructions">
+            Do not edit the column headers. These are used to match property values to existing exhibit item fields.
+          </p>
+
+          <h3>Reference fields</h3>
+          <p class="instructions">
+            Do not edit the reference fields. These are intended to help you identify items whose updatable fields you might want to change. Updates to the reference fields will not be processed.
+          </p>
+
+          <p class="instructions">
+            If you are making a lot of updates, we recommended you use the protect or lock feature of your spreadsheet application to lock the reference field columns and ensure you don’t inadvertently edit them.
+          </p>
+
+          <h3>Updatable fields</h3>
+          <dl>
+            <dt>Visibility</dt>
+            <dd>Valid values are <em>public</em> (expressed as <samp>TRUE</samp>) and <em>private</em> (blank value).</dd>
+
+            <dt>Tags</dt>
+            <dd>
+              <p class="instructions">
+                If you chose to include tags in the CSV file, there will be a column in the spreadsheet for each existing tag in the exhibit, prefixed with <samp>Tag:</samp>, such as <samp>Tag: apples</samp>. (If you want to add to items a tag that does not yet exist, you must first add that tag to at least one item (by editing an item or using the Bulk actions feature on a search result set of items) before downloading the CSV file.)
+              </p>
+
+              <p class="instructions">
+                To assign a tag to an exhibit item, the value of the <samp>Tag:</samp> column for that item must be <samp>TRUE</samp>. A blank value in the <samp>Tag:</samp> column for an item means that tag is not assigned to that item.
+              </p>
+
+              <p class="instructions">
+                To remove a tag currently assigned to an item, remove the <samp>TRUE</samp> value from the appropriate <samp>Tag:</samp> column for that item.
+              </p>
+            </dd>
+          </dl>
+        instructions_html: A CSV file listing each item in this exhibit will be generated with the reference and updatable fields you specify below. <i>Reference fields</i> are intended to help you identify items that you intend to update. <i>Updatable fields</i> are the fields for which you can update values (see guidelines below).
+        item_id: Item ID
+        item_title: Item title
+        reference_fields:
+          heading: Reference fields
+        submit: Download CSV file
+        tags: Tags
+        updatable_fields:
+          heading: Updatable fields
+        visibility: Visibility
+      edit:
+        download:
+          heading: Download CSV
+        header: Bulk updates
+        overview:
+          heading: Overview
+        upload:
+          heading: Upload CSV
+      overview:
+        instructions_html: |
+          <p>You can update in bulk several properties of items in this exhibit:</p> <ul>
+            <li>Visibility</li>
+            <li>Tags</li>
+          </ul> <p>The steps to making bulk updates are:</p> <ol>
+            <li>Download a CSV (comma-separated values) file from the Download CSV tab above. The downloaded CSV file will contain a row for every item in this exhibit. Each row contains the unique ID of an exhibit item along with the values of the reference and updatable fields you specify.</li>
+            <li>Import the CSV file into a new spreadsheet, using an application such as a Google Sheets or Excel.</li>
+            <li>In the new spreadsheet, update the values for the updatable fields of exhibit items you want to change. When you’ve finished making updates, save the spreadsheet.</li>
+            <li>(Optional) Remove the rows for items that contain no updated values. This is not required but for exhibits with many items this can speed up the import process. If necessary, save the spreadsheet.</li>
+            <li>Download/export the updated spreadsheet to your computer as a .csv file.</li>
+            <li>Use the Upload CSV tab above to submit the updated file for processing.</li>
+          </ol>
+      progress_panel:
+        begin_html: Began CSV processing
+        completed_html: Completed CSV processing
+        error: An error occured while processing the CSV. Contact your exhibits administrator for more information.
+        heading: CSV processing status
+      update:
+        error: There was a problem uploading your CSV.
+        submitted: The CSV file was uploaded successfully.
+      upload:
+        file_label: Upload CSV file
+        form_help: The uploaded file must have a ".csv" extension
+        instructions: After you've saved updates to a CSV file, use the Upload CSV file action below to submit it for processing.
+        submit: Upload
     catalog:
       admin:
         header: Items
@@ -264,13 +386,14 @@ en:
         exhibit_visibility:
           label: Item visibility
           private: Private
+          public: Public
       fields:
         date_added: Date added
         title: Title
         visibility: Public
       reindex_progress_panel:
         begin_html: Began reindexing a total of <span data-behavior='total'></span> items.
-        completed_html: Reindexed <span data-behavior='completed'></span> of <span data-behavior='total'></span> items.
+        current_html: Reindexed <span data-behavior='completed'></span> of <span data-behavior='total'></span> items.
         error: An error occured while reindexing. Contact your exhibits administrator for more information.
         heading: Reindexing status
     configuration:
@@ -278,6 +401,7 @@ en:
       sidebar:
         appearance: Appearance
         header: Configuration
+        job_trackers: Job status
         metadata: Metadata
         search_configuration: Search
         settings: General
@@ -319,6 +443,7 @@ en:
         about_pages: About pages
         analytics: Analytics
         browse: Browse
+        bulk_updates: Bulk updates
         dashboard: Dashboard
         feature_pages: Feature pages
         header: Curation
@@ -512,6 +637,37 @@ en:
         someone_invited_you: The Exhibits Administrator has invited you to help work on the "%{exhibit_name}" exhibit.
         subject: Invitation to manage \"%{exhibit_name}\"
         visit: Visit exhibit
+    job_trackers:
+      show:
+        headers:
+          details: Details
+          message: Message
+        messages:
+          created_by: job created by %{user}
+          errors:
+            one: "(%{count} error)"
+            other: "(%{count} errors)"
+          progress: processed %{progress} / %{total}
+          started: job started
+          status:
+            completed: job completed
+            enqueued: job enqueued
+            failed: job failed
+            in_progress: ''
+            missing: "(missing status)"
+            pending: job pending
+        summary:
+          completed: Completed %{last_updated} ago in %{duration}
+          enqueued: In progress for %{created_at}
+          failed: Failed %{last_updated} ago in %{duration}
+          in_progress: In progress for %{created_at}
+      status:
+        completed: Successful
+        enqueued: Not yet started
+        failed: Failed
+        in_progress: In progress
+        missing: Unknown
+        pending: Pending
     main_navigation:
       about: About
       browse: Browse
@@ -600,6 +756,7 @@ en:
     role:
       admin: Admin
       curator: Curator
+      viewer: Viewer
     roles:
       edit_fields:
         help: Enter a valid email address
@@ -770,6 +927,10 @@ en:
           items:
             one: "%{count} item"
             other: "%{count} items"
+        solr_documents_block:
+          zpr_link_html: View <span class="sr-only">%{title}</span> larger
+        uploaded_items_block:
+          zpr_link_html: View <span class="sr-only">%{title}</span> larger
     sites:
       edit:
         basic_settings:
@@ -789,12 +950,10 @@ en:
       home: Exhibits
     tags:
       index:
-        actions: Actions
         header: Tags
-        name: Tag name
         no_tags: No items in this exhibit have been tagged. You can add tags to an item on the item details page while in curation mode.
         taggings:
-          count: Items tagged
+          count: 'Items tagged: %{count}'
     topbar:
       label: Utilities
     translations: