blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

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/shared/_locale_picker.html.erb

@@ -6,7 +6,7 @@
     <ul class="dropdown-menu">
       <% locale_selecter_dropown_options.each do |language| %>
         <li>
-          <%= link_to language.to_native, (spotlight.url_for(locale: lanaguage.locale) rescue url_for(locale: language.locale)), class: 'dropdown-item', data: { turbolinks: false } %>
+          <%= link_to language.to_native, current_page_for_locale(language.locale), class: 'dropdown-item', data: { turbolinks: false } %>
         </li>
       <% end %>
     </ul>

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

@@ -0,0 +1,45 @@
+<% if browse_group_categories_block.groups? %>
+  <% 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-baseline">
+          <h2 class="m-0"><%= group.title %></h2>
+          <div class="pl-3">
+            <%= link_to t(:'.view_all'), exhibit_browse_groups_path(current_exhibit, group) %>
+          </div>
+        </div>
+        <% if group.searches.count > 1 %>
+          <ul class="browse-group-categories-controls p-0 pt-2 pt-md-0 ml-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>
+            <li class="next px-1 overflow-hidden">
+              <%= blacklight_icon 'arrow-alt-circle-right' %>
+            </li>
+          </ul>
+        <% end %>
+      </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-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">
+                  <p class="category-title">
+                    <%= search.title %>
+                    <% if search.subtitle.present? %><span class="category-subtitle"><%= search.subtitle %></span><% end %>
+                  </p>
+
+                  <% if browse_group_categories_block.display_item_counts? %>
+                    <span class="item-count"><%= t(:'.items', count: search.count) %></span>
+                  <% end %>
+                </div>
+                <div class="hover-overlay"></div>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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/_groups.html.erb

@@ -0,0 +1,34 @@
+<div role="tabpanel" class="tab-pane <%= 'active' if @tab == 'groups' %>" id="groups">
+  <%= 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' %>
+
+    <% current_exhibit.groups.each do |group| %>
+      <% title_translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "#{group.slug}.title", locale: @language) %>
+      <%= f.fields_for :translations, title_translation do |translation_fields| %>
+        <%= translation_fields.hidden_field :key %>
+        <%= translation_fields.hidden_field :locale %>
+        <div data-translation-progress-item="true" class="row form-group browse-group-title">
+          <%= translation_fields.label :value, group[:title], class: 'col-form-label col-12 col-sm-2' %>
+          <div class="col-11 col-sm-9">
+            <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
+          </div>
+          <div class="col-1">
+            <% if title_translation.value.present? %>
+              <span data-translation-present="true">
+                <%= blacklight_icon('check', classes: 'translation-complete') %>
+              </span>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= f.submit nil, class: 'btn btn-primary' %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -1,10 +1,10 @@
 <% if can? :import_translations, Spotlight::Exhibit %>
-  <div class="row col-md-12 mb-4">
+  <div class="row col-md-12 mb-5">
     <h2><%= t(:'.header') %></h2>
     <p class="instructions"><%= t(:'.description') %></p>
 
-    <%= bootstrap_form_for current_exhibit, url: spotlight.import_exhibit_translations_path(current_exhibit), html: { class: 'row col-md-12 clearfix mb-3', multipart: true } do |f| %>
-      <%= f.label :value, t(".import_label"), class: 'col-form-label col-12 col-sm-3 text-right' %>
+    <%= bootstrap_form_for current_exhibit, url: spotlight.import_exhibit_translations_path(current_exhibit), html: { class: 'row col-md-12 align-items-center clearfix mb-3', multipart: true } do |f| %>
+      <%= f.label :value, t(".import_label"), class: 'col-form-label col-12 col-sm-3 pl-0 translation-import-export-label' %>
 
       <div class="input-group col px-0">
         <%= file_field_tag :file, class: 'form-control' %>
@@ -14,8 +14,8 @@
         </div>
       </div>
     <% end %>
-    <div class="row col-md-12">
-      <%= content_tag :span, t(".export_label"), class: 'col-form-label col-12 col-sm-3 text-right' %>
+    <div class="row col-md-12 align-items-center">
+      <%= content_tag :span, t(".export_label"), class: 'col-form-label col-12 col-sm-3 pl-0 translation-import-export-label' %>
 
       <%= link_to t(:'.export_current_locale', language: t(:"locales.#{@language}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: @language), class: 'btn btn-primary mr-3' %>
       <%= link_to t(:'.export_default_locale', language: t(:"locales.#{I18n.default_locale}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: I18n.default_locale), class: 'btn btn-primary' %>

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

@@ -41,6 +41,11 @@
           <%= t('spotlight.translations.browse_categories.label') %> <span class="badge"></span>
         </a>
       </li>
+      <li class="nav-item">
+        <a href="#groups" class="nav-link <%= 'active' if @tab == 'groups' %>" aria-controls="groups" role="tab" data-toggle="tab" data-behavior="translation-progress">
+          <%= t('spotlight.translations.groups.label') %> <span class="badge"></span>
+        </a>
+      </li>
       <li class="nav-item">
         <a href="#pages" class="nav-link <%= 'active' if @tab == 'pages' %>" aria-controls="pages" role="tab" data-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.pages.label') %> <span class="badge"></span>
@@ -54,6 +59,7 @@
       <%= render 'search_fields' %>
       <%= render 'browse_categories' %>
       <%= render 'pages' %>
+      <%= render 'groups' %>
     </div>
   </div>
 </div>

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

@@ -39,6 +39,8 @@ ignore_unused:
   - activerecord.attributes.spotlight/masthead.display # app/views/spotlight/appearances/edit.html.erb
   - activerecord.attributes.spotlight/custom_field.is_multiple # app/views/spotlight/custom_fields/_form.html.erb
   - activerecord.attributes.spotlight/custom_search_field.field # app/views/spotlight/custom_search_fields/_form.html.erb
+  - activerecord.models.spotlight/group # Used in flash messages around the app to rename Group to Browse group
+  - activerecord.models.spotlight/search # Used in flash messages around the app to rename Search to Browse category
   - helpers.label.spotlight/filter.{field,value} # app/views/spotlight/filters/_form.html.erb
   - spotlight.catalog.admin.{title,header} # app/helpers/spotlight/title_helper.rb
   - spotlight.{contacts,pages,searches}.edit.{title,header} # app/helpers/spotlight/title_helper.rb
@@ -49,14 +51,17 @@ ignore_unused:
   - spotlight.featured_images.upload_form.{non_iiif_alert_html,source.exhibit.help,source.exhibit.label} # app/views/spotlight/featured_images/_form.html.erb
   - spotlight.feature_pages.page_options.published # app/views/spotlight/feature_pages/_page_options.html.erb
   - spotlight.{exhibits,custom_fields,custom_search_fields}.{new,edit}.header # configuration_page_title
+  - spotlight.{searches}.{group}.{view}
   - helpers.submit.custom_field.{batch_error,batch_updated,create,submit,update} # Generic repeated template
   - helpers.submit.custom_search_field.{batch_error,batch_updated,create,submit,update} # Generic repeated template
   - helpers.submit.exhibit.{batch_error,batch_updated,create,submit,update} # Generic repeated template
+  - helpers.submit.group.{destroyed,updated} # Generic helper that is used
   - helpers.submit.search.{create,submit,update} # Generic repeated template
   - helpers.submit.site.{batch_error,batch_updated,create,created,destroyed,submit,update} # Generic repeated template
   - helpers.submit.filter.{batch_error,batch_updated,create,created,destroyed,submit,update} # Generic repeated template
   - helpers.action.destroy_are_you_sure # app/helpers/spotlight/crud_link_helpers.rb
   - helpers.action.spotlight/role.{create,destroy} # app/views/spotlight/roles/index.html.erb
+  - helpers.action.spotlight/group.destroy # app/views/spotlight/searches/_group.html.erb
   - helpers.action.{edit,edit_long,new,view} # app/helpers/spotlight/crud_link_helpers.rb
   - helpers.action.spotlight/search.edit_long # app/views/spotlight/searches/_search.html.erb
   - spotlight.about_pages.page_options.published # app/views/spotlight/about_pages/_page_options.html.erb
@@ -78,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.ar.yml

@@ -34,6 +34,9 @@ ar:
         zero_results:
           expand_html: "تستطيع أن <a href=\"%{clear_search_url}\"> تمسح استعلام البحث </a> أو محاولة <a href=\"%{expand_search_url}\"> البحث في كل المواد المعروضة لاستعلام البحث ل\"%{browse_query}\"</a>"
           result_number: لم يتطابق بحثك مع أي عنصر في هذه الفئة.
+    exhibits:
+      groups:
+        all: الكل
     header_links:
       contact: ملاحظات واقتراحات
       login: تسجيل الدخول
@@ -52,7 +55,14 @@ ar:
             few: "%{count} عناصر"
             many: "%{count} عنصراً"
             other: "%{count} عنصراً"
-
+        browse_group_categories_block:
+          items:
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
+            few: "%{count} عناصر"
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"
+          view_all: مشاهدة الكل
         link_to_search_block:
           items:
             zero: "%{count} عنصر"

data/config/locales/spotlight.en.yml

@@ -24,6 +24,8 @@ en:
     models:
       spotlight:
         page: Page
+      spotlight/group: Browse group
+      spotlight/search: Browse category
   cancel: Cancel
   drag: Drag
   helpers:
@@ -44,6 +46,8 @@ en:
         create: Add new field
       spotlight/custom_search_field:
         create: Add new field
+      spotlight/group:
+        destroy: Delete group
       spotlight/role:
         create: Add a new user
         destroy: Remove from site
@@ -101,6 +105,12 @@ en:
         created: The %{model} was created.
         destroyed: The %{model} was deleted.
         updated: The %{model} was successfully updated.
+      group:
+        batch_error: There was an error updating the requested %{model}.
+        batch_updated: "%{model} were successfully updated."
+        created: The %{model} was created.
+        destroyed: The %{model} was deleted.
+        updated: The %{model} was successfully updated.
       language:
         create: Add language
         created: The %{model} was created.
@@ -142,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
@@ -155,12 +169,6 @@ en:
     pt-BR: Portuguese - Brazil
     sq: Albanian
     zh: Chinese
-  reindexing_log:
-    status:
-      failed: Failed
-      in_progress: In Progress
-      succeeded: Successful
-      unstarted: Not Yet Started
   shared:
     site_sidebar:
       documentation: Curator documentation
@@ -171,7 +179,7 @@ en:
         header: Contacts
       contacts_form:
         header: Contacts
-        instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the About Pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
+        instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the about pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
       page_options:
         published: Publish
     admin_users:
@@ -196,7 +204,7 @@ en:
       edit:
         header: Appearance
         main_navigation:
-          help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Click a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
+          help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Select a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
           menu: Main menu
         site_masthead:
           heading: Exhibit masthead
@@ -227,23 +235,147 @@ 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
-        title: Curation - Items
+        title: Curation - items
       admin_header:
         new_resource: Add items
         reindex: Reindex items
       breadcrumb:
-        index: Search Results
+        index: Search results
       document_visibility_control:
         inprogress:
           label: ''
         make_private:
-          button: Make Private
+          button: Make private
           label: ''
         make_public:
-          button: Make Public
+          button: Make public
           label: ''
       edit_default:
         url-field:
@@ -252,15 +384,16 @@ en:
         blank_field_warning_html: This field is currently hidden on all pages. You can make it visible on the Curation &gt; %{link} page.
       facets:
         exhibit_visibility:
-          label: Item Visibility
+          label: Item visibility
           private: Private
+          public: Public
       fields:
-        date_added: Date Added
+        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:
@@ -268,6 +401,7 @@ en:
       sidebar:
         appearance: Appearance
         header: Configuration
+        job_trackers: Job status
         metadata: Metadata
         search_configuration: Search
         settings: General
@@ -281,7 +415,7 @@ en:
       subject: "%{application_name} exhibit feedback"
     contacts:
       edit:
-        header: Edit Contact
+        header: Edit contact
       form:
         avatar:
           header: Avatar
@@ -300,7 +434,7 @@ en:
         title:
           placeholder: Job title most relevant to this exhibit
       new:
-        header: Add Exhibit Contact
+        header: Add exhibit contact
     curation:
       header: Curation
       nav:
@@ -309,6 +443,7 @@ en:
         about_pages: About pages
         analytics: Analytics
         browse: Browse
+        bulk_updates: Bulk updates
         dashboard: Dashboard
         feature_pages: Feature pages
         header: Curation
@@ -317,7 +452,7 @@ en:
         translations: Translations
     custom_fields:
       edit:
-        header: Edit Exhibit-Specific Field
+        header: Edit exhibit-specific field
       form:
         field_type:
           label: Type
@@ -326,19 +461,19 @@ en:
         is_multiple:
           label: Multi-valued?
       new:
-        header: Add Exhibit-Specific Field
+        header: Add exhibit-specific field
     custom_search_fields:
       edit:
-        header: Edit Exhibit-Specific Field
+        header: Edit exhibit-specific field
       form:
         field:
           help: Specify fields to be searched and their boost values (e.g., full_title_tesim^100 personal_name_tesim^50).
       new:
-        header: Add Exhibit-Specific Field
+        header: Add exhibit-specific field
     dashboards:
       analytics:
         header: Analytics
-        monthly_header: User Activity Over the Past Month
+        monthly_header: User activity over the past month
         pages:
           header: Most popular pages
         pagetitle: page title
@@ -349,21 +484,21 @@ en:
         field:
           last_edited_by: User
           title: Title
-          updated_at: Last Edited
-        header: Recent Site Building Activity
+          updated_at: Last edited
+        header: Recent site building activity
       reindexing_activity:
         field:
           date: Date
-          duration: Elapsed Time
-          items_reindexed_count: Items Indexed
+          duration: Elapsed time
+          items_reindexed_count: Items indexed
           job_status: Status
-          user: Requested By
-        header: Recent Item Indexing Activity
+          user: Requested by
+        header: Recent item indexing activity
         no_reindexing_activity: There has been no reindexing activity
       show:
         header: Dashboard
       solr_document_activity:
-        header: Recently Updated Items
+        header: Recently updated items
         no_documents: There are no documents in this exhibit
     exhibitnavbar:
       label: Exhibit navigation
@@ -403,6 +538,8 @@ en:
           published:
             help_block: ''
         uneditable_non_default_language: This field is not editable in the current language. Switch to the default language to edit it.
+      groups:
+        all: All
       import:
         button: Import data
         heading: Import data
@@ -412,7 +549,7 @@ en:
         unpublished: Unpublished exhibits
         user: Your exhibits
       languages:
-        current_header: Current Languages
+        current_header: Current languages
         current_instructions: Each language listed below is available for translations on the Curation > Translations page. To enable exhibit visitors to change the language of the exhibit, enable the Public checkbox. To hide translations from an available language from the exhibit, disable the Public checkbox.
         heading: Languages
         modal:
@@ -440,7 +577,7 @@ en:
     exhibits_admin_invitation_mailer:
       invitation_instructions:
         accept: Accept invitation
-        accept_invitation: " You can accept this invitation by clicking the link below."
+        accept_invitation: You can accept this invitation by selecting the link below.
         hello: Hello!
         ignore: If you don't want to accept the invitation, please ignore this email. Your exhibits administrator account won't be created until you access the link above.
         someone_invited_you: The Exhibits Administrator has invited you to help manage exhibits.
@@ -451,7 +588,7 @@ en:
     featured_images:
       form:
         crop_area:
-          help: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Click "Save changes" to save the cropped area.
+          help_html: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Select <b>Save changes</b> to save the cropped area.
         non_iiif_alert_html: The image source must be a IIIF image. Contact your exhibits adminstrator or see the <a href="http://iiif.io">IIIF website</a> for more information about IIIF.
         source:
           exhibit:
@@ -464,7 +601,7 @@ en:
             label: Upload an image
       upload_form:
         crop_area:
-          help: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Click "Save changes" to save the cropped area.
+          help_html: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Select <b>Save changes</b> to save the cropped area.
         non_iiif_alert_html: The image source must be a IIIF image. Contact your exhibits adminstrator or see the <a href="http://iiif.io">IIIF website</a> for more information about IIIF.
         source:
           exhibit:
@@ -494,30 +631,61 @@ en:
         title: Your CSV file has just finished being processed.
     invitation_mailer:
       invitation_instructions:
-        accept_invitation: You can accept this invitation by clicking the link below.
+        accept_invitation: You can accept this invitation by selecting the link below.
         hello: Hello!
         ignore: If you don't want to accept the invitation, please ignore this email. Your account won't be created until you access the link above.
         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
-      curated_features: Curated Features
+      curated_features: Curated features
     metadata_configurations:
       edit:
         deselect_all: Deselect all
         exhibit_specific:
-          header: Exhibit-Specific Fields
+          header: Exhibit-specific fields
           instructions: You can add metadata fields to supplement the metadata fields that are part of the repository item record.
         field:
           label: Field name
         header: Metadata
-        instructions: Select metadata fields to display on each type of page. Click a field name to edit its display label. Drag and drop fields to specify the order in which they are displayed.
-        order_header: Display and Order Metadata Fields
+        instructions: Select metadata fields to display on each type of page. Select a field name to edit its display label. Drag and drop fields to specify the order in which they are displayed.
+        order_header: Display and order metadata fields
         select_all: Select all
         view:
-          show: Item Details
+          show: Item details
     pages:
       edit:
         header: Edit page
@@ -527,30 +695,30 @@ en:
         page_options: Options
         page_thumbnail: Thumbnail
         thumbnail:
-          help: You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page using the 'Highlight Featured Pages' widget.
+          help: You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page in the Pages widget.
         title_placeholder: Title
       index:
         about_pages:
-          header: About Pages
+          header: About pages
         feature_pages:
-          header: Feature Pages
+          header: Feature pages
           home_pages_header: Homepage
         home_pages:
-          header: Exhibit Home
-          title: Exhibit Home
+          header: Exhibit home
+          title: Exhibit home
       new:
         header: New page
       order_pages:
         cancel: Cancel
         instructions: Add new pages below. Drag and drop pages to change the order in which they are displayed in the sidebar.
         new_page: Add new page
-        pages_header: Custom Pages
+        pages_header: Custom pages
         save: Save
     resources:
       csv_upload:
         form:
           add_item: Add item
-          file_label: CSV File
+          file_label: CSV file
           help_html: "%{link}"
           template: Download template
           title: Upload multiple items
@@ -568,7 +736,7 @@ en:
       json_upload:
         form:
           add_item: Add item
-          file_label: JSON File
+          file_label: JSON file
           title: Upload raw documents
       new:
         header: Add items
@@ -588,16 +756,17 @@ en:
     role:
       admin: Admin
       curator: Curator
+      viewer: Viewer
     roles:
       edit_fields:
         help: Enter a valid email address
       index:
         actions: Actions
-        email: Email Address
+        email: Email address
         header: Users
         invite_pending: pending
         role: Role
-        title: Site Configuration - Users
+        title: Site configuration - users
     saved_search:
       id: Select a title to update a previously saved search
       label: Save this search
@@ -605,41 +774,41 @@ en:
     search:
       fields:
         abstract_tesim: Abstract
-        corporate_name_ssm: Corporate Names
+        corporate_name_ssm: Corporate names
         facet:
-          corporate_name_ssm: Corporate Names
-          exhibit_tags: Exhibit Tags
+          corporate_name_ssm: Corporate names
+          exhibit_tags: Exhibit tags
           genre_ssim: Genre
           language_ssim: Language
-          personal_name_ssm: Personal Names
+          personal_name_ssm: Personal names
           subject_geographic_ssim: Geographic
           subject_temporal_ssim: Era
         full_title_tesim: Title
         language_ssm: Language
         note_desc_note_tesim: Note
         note_mapuse_tesim: Type
-        note_page_num_tesim: Page Number
+        note_page_num_tesim: Page number
         note_phys_desc_tesim: Note
         note_provenance_tesim: Provenance
         note_references_tesim: References
         note_source_tesim: Source
-        personal_name_ssm: Personal Names
+        personal_name_ssm: Personal names
         search:
           all_fields: Everything
           author: Author
           title: Title
         sort:
-          date: Date (new to old)
-          identifier: Identifier
-          relevance: Relevance
-          source: Source
-          title: Title
-          type: Type
+          date: date (new to old)
+          identifier: identifier
+          relevance: relevance
+          source: source
+          title: title
+          type: type
         spotlight_upload_attribution_tesim: Attribution
         spotlight_upload_date_tesim: Date
         spotlight_upload_description_tesim: Description
-        subject_geographic_tesim: Geographic Subject
-        subject_temporal_tesim: Temporal Subject
+        subject_geographic_tesim: Geographic subject
+        subject_temporal_tesim: Temporal subject
     search_configurations:
       default_per_page:
         label: Default per page
@@ -660,7 +829,7 @@ en:
           one: "%{count} unique value"
           other: "%{count} unique values"
       facets:
-        help: If the sidebar is visible, users can use the facets shown in the sidebar to limit a search.  You can select the facets that are available for searching below. Click a facet field name to edit its display label. Drag and drop facets to specify the order they are displayed in the sidebar.
+        help: If the sidebar is visible, users can use the facets shown in the sidebar to limit a search.  You can select the facets that are available for searching below. Select a facet field name to edit its display label. Drag and drop facets to specify the order they are displayed in the sidebar.
         sort_by:
           count: Frequency
           index: Value
@@ -672,10 +841,10 @@ en:
           instructions: You can add custom search fields to supplement the search fields that are part of the default configuration.
         header: Field-based search
         help: If the search box is displayed, you can also enable field-based search. Field-based search adds a dropdown menu to your exhibit site's search box that provides the user with an option to restrict a search query to a single metadata field.
-        instructions: If enabled, you can select below the metadata fields that are available for searching. Click a field name to edit its display label.  Drag and drop fields to specify the order they are displayed in the search box dropdown menu.
+        instructions: If enabled, you can select below the metadata fields that are available for searching. Select a field name to edit its display label.  Drag and drop fields to specify the order they are displayed in the search box dropdown menu.
       sort:
         header: Sort fields
-        help: Select the fields you want to be available to users for sorting results. Click a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field.
+        help: Select the fields you want to be available to users for sorting results. Select a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field.
         keys:
           asc: ascending
           desc: descending
@@ -687,10 +856,13 @@ en:
           sort_type_ssi: type
     searches:
       edit:
-        header: Edit Browse Category
-        title: Curation - Browse
+        header: Edit browse category
+        title: Curation - browse
       form:
         default_index_view_type: Default view
+        group:
+          help: You can add this browse category to any number of browse groups. When you add a browse category to a group it will be displayed when an exhibit visitor selects that browse group’s filter button on the Browse landing page.
+          help_no_groups: You cannot add this browse category to a browse group because no browse groups have been created. To create a browse group, use the Browse groups tab on the Curation > Browse page.
         masthead:
           help: You can select and crop an image to use as a browse category-specific masthead, instead of the default site masthead, for this browse category's detail page.
           help_secondary: To create a browse category-specific masthead, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below.
@@ -700,17 +872,32 @@ en:
           help_block: Displays a search box that enables users to search within the browse category results
           label: Search box
         search_description: Description
+        search_group: Group
         search_masthead: Masthead
         search_thumbnail: Thumbnail
         thumbnail:
           help: You can select and crop an image to visually represent this search.
+      group:
+        category_count:
+          one: "%{count} category"
+          other: "%{count} categories"
+        unpublished_count:
+          one: "(%{count} unpublished)"
+          other: "(%{count} unpublished)"
+          zero: ''
+        view: View
       index:
-        categories_header: Browse Categories
+        add_new_group: Add new group
+        cancel: Cancel
+        categories_header: Browse categories
+        categories_instructions: Use the Save search button on a search results page to create a new browse category. Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page.
+        groups_header: Browse groups
+        groups_instructions_html: "<p>Optionally, you can create groups to organize your exhibits’ browse categories and enable exhibit visitors to filter browse categories by group. Drag and drop browse groups to change the order in which their filter buttons are displayed.</p><p>To add a browse category to a browse group, edit the browse category from the Browse categories tab.</p>"
         header: Browse
-        instructions: Use the Save search button on a search results page to create a new browse category. Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page.
         no_saved_searches: You can save search results while in curation mode to create browse categories, which will be displayed here.
         not_searchable_html: This exhibit is not currently searchable. To perform searches that can be saved as additional browse categories, temporarily turn on the Display search box option in the Options section of the Configuration > %{href} page.
-        title: Curation - Browse
+        save: Save
+        title: Curation - browse
       search:
         item_count:
           one: "%{count} item"
@@ -724,17 +911,26 @@ en:
       report_a_problem:
         honeypot_field_explanation: Ignore this text box. It is used to detect spammers. If you enter anything into this text box, your message will not be sent.
         reporting_from: 'Reporting from: %{url}'
-        title: Contact Us
+        title: Contact us
     sir_trevor:
       blocks:
         browse_block:
           items:
             one: "%{count} item"
             other: "%{count} items"
+        browse_group_categories_block:
+          items:
+            one: "%{count} item"
+            other: "%{count} items"
+          view_all: View all
         link_to_search_block:
           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:
@@ -754,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.
+        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:
@@ -774,16 +968,18 @@ en:
       general:
         basic_settings:
           description: Description
-          label: Basic Settings
+          label: Basic settings
           subtitle: Subtitle
           title: Title
         label: General
         main_menu:
           about: About
           browse: Browse
-          curated_features: Curated Features
+          curated_features: Curated features
           home: Home
-          label: Main Menu
+          label: Main menu
+      groups:
+        label: Browse groups
       import:
         description: You can import and export Rails-based YAML files containing the translated label values for the currently selected language for use in internationalization tools such as Transifex and i18n-tools. This feature does not include importing or exporting translations for Pages.
         export_current_locale: Export %{language}
@@ -794,7 +990,7 @@ en:
         import_submit: Import translations
       metadata:
         exhibit_specific_fields:
-          label: Exhibit-Specific Fields
+          label: Exhibit-specific fields
         label: Metadata field labels
       page:
         destroy: Delete
@@ -806,12 +1002,12 @@ en:
         recreate_are_you_sure: Are you sure you want to recreate this page? If you recreate this page all content, including any existing translations you have made, will be replaced with the content of the English version of the page.
       pages:
         about_pages:
-          label: About Pages
+          label: About pages
         feature_pages:
-          label: Feature Pages
-        help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <i>Recreate</i> action.
+          label: Feature pages
+        help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <b>Recreate</b> action.
         home_page:
-          label: Home Page
+          label: Home page
         label: Pages
       pages_table:
         header:
@@ -821,12 +1017,12 @@ en:
           last_updated: "%{language} title / Last update"
       search_fields:
         facet_fields:
-          label: Facet Fields
+          label: Facet fields
         field_based_search_fields:
-          label: Field-Based Search Fields
+          label: Field-based search fields
         label: Search field labels
         sort_fields:
-          label: Sort Fields
+          label: Sort fields
     versions:
       redo: Redo changes
       undo: Undo changes