blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

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

@@ -5,7 +5,7 @@
       <span class="text-muted" data-behavior='date'></span> <%= t('.begin_html') %>
     </p>
     <p data-behavior='monitor-current'>
-      <span class="text-muted" data-behavior='date'></span> <%= t('.completed_html') %>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.current_html') %>
     </p>
 
     <p class="bg-warning" data-behavior='monitor-error' style='display:none;'>

data/app/views/spotlight/catalog/index.iiif_json.jbuilder

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+json.set! :@context, 'http://iiif.io/api/presentation/2/context.json'
+json.set! :@id, exhibit_iiif_collection_url(page: params[:page]&.to_i)
+json.set! :@type, 'sc:Collection'
+json.label current_exhibit.title
+json.viewingHint 'top'
+json.description current_exhibit.description if current_exhibit.description
+json.manifests do
+  json.array!(@response.documents) do |doc|
+    next unless doc.first(Spotlight::Engine.config.iiif_manifest_field)
+
+    json.set! :@id, doc.first(Spotlight::Engine.config.iiif_manifest_field)
+    json.set! :@type, 'sc:manifest'
+    json.label document_presenter(doc).heading
+  end
+end
+
+json.total @response.total
+json.first exhibit_iiif_collection_url(page: nil)
+
+json.next exhibit_iiif_collection_url(page: @response.next_page) unless @response.last_page? || @response.out_of_range?

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

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

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

@@ -15,7 +15,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit) %>
+      <%= link_to t(:"cancel"), edit_exhibit_metadata_configuration_path(current_exhibit), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

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

@@ -6,7 +6,7 @@
 
   <div class="form-actions">
     <div class="primary-actions">
-      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit) %>
+      <%= link_to t(:"cancel"), edit_exhibit_search_configuration_path(current_exhibit), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>

data/app/views/spotlight/dashboards/_reindexing_activity.html.erb

@@ -12,13 +12,13 @@
     </tr>
   </thead>
   <tbody>
-    <% @recent_reindexing.each do |log_entry| %>
+    <% @recent_reindexing.each do |tracker| %>
       <tr class="d-flex">
-        <td class="col-3"><%= l log_entry.start_time, format: :long if log_entry.start_time %></td>
-        <td class="col-3"><%= log_entry.user.email if log_entry.user %></td>
-        <td class="col-1"><%= log_entry.items_reindexed_count %></td>
-        <td class="col-3"><%= distance_of_time_in_words log_entry.duration, 0, include_seconds: true if log_entry.duration %></td>
-        <td class="col-2"><%= t "reindexing_log.status.#{log_entry.job_status}" %></td>
+        <td class="col-3"><%= l tracker.created_at, format: :long %></td>
+        <td class="col-3"><%= tracker.user.email if tracker.user %></td>
+        <td class="col-1"><%= tracker.progress %></td>
+        <td class="col-3"><%= distance_of_time_in_words tracker.created_at, tracker.updated_at, include_seconds: true if tracker.completed? || tracker.failed? %></td>
+        <td class="col-2"><%= link_to_if can?(:read, tracker), t("spotlight.job_trackers.status.#{tracker.status}"), [current_exhibit, tracker], data: { blacklight_modal: 'trigger' } %></td>
       </tr>
     <% end %>
   </tbody>

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

@@ -2,7 +2,7 @@
   <div class="card exhibit-card">
     <%= link_to exhibit, aria: { hidden: true  }, tabindex: '-1' do %>
       <% if exhibit.thumbnail.present? && exhibit.thumbnail.iiif_url %>
-        <%= image_tag(exhibit.thumbnail.iiif_url, class: 'card-img',  alt: '', role: 'presentation') %>
+        <%= image_tag(exhibit.thumbnail.iiif_url, class: 'card-img',  alt: '', role: 'presentation', skip_pipeline: true) %>
       <% else %>
         <%= image_tag 'spotlight/default_thumbnail.jpg', class: 'card-img default-thumbnail',  alt: '', role: 'presentation' %>
       <% end %>

data/app/views/spotlight/feature_pages/_empty.html.erb

@@ -4,23 +4,23 @@
 
     <ol>
       <li>
-        To add content to this page, click the Edit button above to enter Edit mode.
+        To add content to this page, select the Edit button above to enter edit mode.
       </li>
       <li>
-        In Edit mode, click the plus sign icon to display the widget selection panel. This panel displays a range of widgets, each of which adds a different type of content to the page.
+        In edit mode, select the plus sign icon to display the widget selection panel. This panel displays a range of widgets, each of which adds a different type of content to the page.
       </li>
       <li>
-        Select a widget to configure. Click <strong>Save changes</strong> when you're ready to add it to the page.
+        Select a widget to configure. Select <b>Save changes</b> when you're ready to add it to the page.
       </li>
       <li>
         Repeat the steps above to continue adding widgets to build out the page. To work more efficiently, you can configure multiple widgets before saving the page. Use the icons in the lower right of the widget configuration panel to preview, reorder, or delete widgets.
       </li>
       <li>
-        Note the <strong>Options</strong> and <strong>Thumbnail</strong> tabs at the top of the page in Edit mode. Options in these tabs enable you to publish or unpublish the page, turn on or off the page sidebar, and create a thumbnail image to represent the page.
+        Note the <b>Options</b> and <b>Thumbnail</b> tabs at the top of the page in edit mode. Options in these tabs enable you to publish or unpublish the page, turn on or off the page sidebar, and create a thumbnail image to represent the page.
       </li>
       <li>
         Visit the Spotlight <%= link_to 'documentation pages', 'https://github.com/projectblacklight/spotlight/wiki' %> to learn more about creating exhibit pages.
       </li>
     </ol>
   </div>
-<% end %>
+<% end %>

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

@@ -11,7 +11,7 @@
         <%= blacklight_icon('warning') %>
         <%= t(:'.non_iiif_alert_html') %>
       </div>
-      <%= text_field_tag(:document_title, (presenter(f.object.document).heading if f.object.document), class: "form-control", data: { input_select_target: "##{form_prefix(f)}_source_exhibit", 'behavior': 'autocomplete', featured_image_typeahead: true, target_panel: "##{form_prefix(f)}-target-panel", :'id-field' => "##{form_prefix(f)}_document_global_id" }) %>
+      <%= text_field_tag(:document_title, (document_presenter(f.object.document).heading if f.object.document), class: "form-control", data: { input_select_target: "##{form_prefix(f)}_source_exhibit", 'behavior': 'autocomplete', featured_image_typeahead: true, target_panel: "##{form_prefix(f)}-target-panel", :'id-field' => "##{form_prefix(f)}_document_global_id" }) %>
       <div id="<%= form_prefix(f) %>-target-panel" style="display:none">
         <div class="card-header">
           <div data-item-title="true"></div>
@@ -30,7 +30,7 @@
   </div>
 <% end %>
 <%= field_set_tag(t(:'.source.remote.header')) do %>
-  <p class="instructions"><%= t(:'.crop_area.help', thing: crop_type) %></p>
+  <p class="instructions"><%= t(:'.crop_area.help_html', thing: crop_type) %></p>
   <%= iiif_cropper_tags f, initial_crop_selection: initial_crop_selection %>
 <% end %>
 </div>

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

@@ -12,7 +12,7 @@
   </div>
 <% end %>
 <%= field_set_tag(t(:'.source.remote.header')) do %>
-  <p class="instructions"><%= t(:'.crop_area.help', thing: crop_type) %></p>
+  <p class="instructions"><%= t(:'.crop_area.help_html', thing: crop_type) %></p>
   <%= iiif_cropper_tags f, initial_crop_selection: initial_crop_selection %>
 <% end %>
 </div>

data/app/views/spotlight/home_pages/_empty.html.erb

@@ -20,14 +20,14 @@
       <% end %>
 
       <% if Spotlight::Engine.config.resource_partials.any? %>
-        <li>Add items to the exhibit. Go to the <%= link_to "Curation > Items", admin_exhibit_catalog_path(current_exhibit) %> page and click <strong>Add items</strong>. You can add items individually or in bulk via a CSV file.</li>
+        <li>Add items to the exhibit. Go to the <%= link_to "Curation > Items", admin_exhibit_catalog_path(current_exhibit) %> page and select <b>Add items</b>. You can add items individually or in bulk via a CSV file.</li>
       <% end %>
 
       <% if can? :update, current_exhibit.blacklight_configuration %>
-        <li>Use the other Curation pages, such as <%= link_to "Curation > Metadata", edit_exhibit_metadata_configuration_path(current_exhibit) %> and <%= link_to "Curation > Search", edit_exhibit_search_configuration_path(current_exhibit) %>, to customize the way various features are presented to exhibit visitors.</li>
+        <li>Use the other curation pages, such as <%= link_to "Curation > Metadata", edit_exhibit_metadata_configuration_path(current_exhibit) %> and <%= link_to "Curation > Search", edit_exhibit_search_configuration_path(current_exhibit) %>, to customize the way various features are presented to exhibit visitors.</li>
       <% end %>
 
       <li>Visit the Spotlight <%= link_to "documentation pages", "https://github.com/projectblacklight/spotlight/wiki" %> to learn how to add and edit feature pages, about pages, custom browse categories, and more.</li>
     </ol>
   <% end %>
-</div>
+</div>

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

@@ -0,0 +1,79 @@
+<%= page_title 'Job details' %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<div data-blacklight-modal="container">
+
+  <div class="modal-header border-0">
+    <h2 class="modal-title"><%= job_status_icon(@job_tracker) %> <%= t @job_tracker.job_class, default: @job_tracker.job_class %> <small class="text-monospace font-weight-lighter"><%= @job_tracker.job_id&.truncate(8, omission: '') %></small></h2>
+
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="modal-body row">
+    <p class="mx-2 text-small">
+      <%= t(:".summary.#{@job_tracker.status}", default: '', last_updated: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), created_at: time_ago_in_words(@job_tracker.updated_at, include_seconds: true), duration: distance_of_time_in_words(@job_tracker.created_at, @job_tracker.updated_at)) %>
+    </p>
+
+    <table class="table table-striped">
+      <thead>
+        <th></th>
+        <th><%= t('.headers.message') %></th>
+        <th><%= t('.headers.details') %></th>
+      </thead>
+
+      <tbody>
+        <% row_number = 0 %>
+        <tr>
+          <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
+          <td><%= t('.messages.started') %></td>
+          <td><%= l @job_tracker.updated_at, format: :long %></td>
+        </tr>
+
+        <% if @job_tracker.user %>
+        <tr>
+          <th scope="row" title="<%= l @job_tracker.created_at, format: :long %>"><%= row_number += 1 %></th>
+          <td><%= t('.messages.created_by', user: @job_tracker.user.email) %></td>
+          <td></td>
+        </tr>
+        <% end %>
+
+        <% @job_tracker.events.order(:created_at, :collation_key).find_each do |e| %>
+          <tr class="<%= job_tracker_event_table_row_class(e) %>">
+            <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
+            <td><%= e.data[:message] %></td>
+            <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+          </tr>
+        <% end %>
+
+        <% @job_tracker.subevents.where.not(type: :summary).order(:created_at, :collation_key).find_each do |e| %>
+          <tr class="<%= job_tracker_event_table_row_class(e) %>">
+            <th scope="row" title="<%= l e.created_at, format: :long %>"><%= row_number += 1 %></th>
+            <td><%= e.data[:message] %></td>
+            <td><pre><%= JSON.pretty_generate(e.data.except(:message)) %></pre></td>
+          </tr>
+        <% end %>
+
+        <% error_count = @job_tracker.subevents.where(type: :summary).find_each.sum { |e| e.data[:errors] } %>
+        <tr>
+          <th scope="row" title="<%= l @job_tracker.updated_at, format: :long %>"><%= row_number += 1 %></th>
+          <td>
+            <%= t('.messages.progress', progress: @job_tracker.progress, total: @job_tracker.total, errors: (t('.messages.errors', count: error_count) if error_count.positive?)) %>
+          </td>
+          <td></td>
+        </tr>
+
+        <% unless @job_tracker.in_progress? %>
+          <tr>
+            <th scope="row" title="<%= l @job_tracker.updated_at, format: :long %>"><%= row_number += 1 %></th>
+            <td><%= t(@job_tracker.status, scope: 'spotlight.job_trackers.show.messages.status', default: :'spotlight.job_trackers.show.messages.status.missing') %></td>
+            <td><%= l @job_tracker.updated_at, format: :long %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

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/_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/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

@@ -16,6 +16,10 @@
         <a href="#search-description" aria-controls="search-description" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.search_description') %></a>
       </li>
 
+      <li role="presentation" class="nav-item">
+        <a href="#search-group" aria-controls="search-group" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.search_group') %></a>
+      </li>
+
       <li role="presentation" class="nav-item">
         <a href="#search-masthead" aria-controls="search-masthead" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.search_masthead') %></a>
       </li>
@@ -35,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? %>
@@ -50,6 +54,14 @@
           </div>
         <% end %>
       </div>
+      <div role="tabpanel" class="tab-pane" id="search-group">
+        <% if @groups.present? %>
+          <p class="instructions"><%= t(:'.group.help') %></p>
+          <%= f.collection_check_boxes(:group_ids, @groups, :id, :title, hide_label: true) %>
+        <% else %>
+          <p class="instructions"><%= t(:'.group.help_no_groups') %></p>
+        <% end %>
+      </div>
       <div role="tabpanel" class="tab-pane" id="search-masthead">
         <%= f.fields_for :masthead, (@search.masthead || @search.build_masthead) do |m| %>
           <p class="instructions"><%= t(:'.masthead.help') %></p>

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

@@ -0,0 +1,27 @@
+<% group = f.object %>
+<%= render layout: 'spotlight/shared/dd3_item', locals: { id: group.id.to_s, field: f, dd3_content_classes: "group" , enabled_method: :published, label_method: :title, label: group.title } do |_, section| %>
+  <% case section when nil %>
+  <div class="d-flex flex-grow-1">
+    <div>
+      <%= f.check_box :published, inline: true, hide_label: true %>
+    </div>
+
+    <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"><%= group.title %></a>
+        <%= f.hidden_field :title, value: group.title , class: 'form-control form-control-sm title-field', data: {:"edit-field-target" => 'true'} %>
+      </h4>
+
+      <div class="card-text">
+        <div class=""><%= t :'spotlight.searches.group.category_count', count: group.searches.count %> <%= t :'spotlight.searches.group.unpublished_count', count: group.searches.unpublished.count %> &bull; <%= link_to t(:'helpers.action.view'), exhibit_browse_groups_path(current_exhibit, group) %></div>
+        <%= f.hidden_field :id %>
+        <%= f.hidden_field :weight, data: {property: "weight"} %>
+      </div>
+    </div>
+    <div class="flex m-2">
+      <div class="card-text">
+        <%= exhibit_delete_link(group) %>
+      </div>
+    </div>
+  <% end %>
+<% end %>

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

@@ -3,7 +3,6 @@
 <% end %>
 
 <%= curation_page_title %>
-<h2><%= t(:'.categories_header') %></h2>
 
 <% if @searches.empty? %>
   <%= t :'.no_saved_searches' %>
@@ -13,24 +12,66 @@
     </p>
   <% end %>
 <% else %>
-  <p class="instructions"><%= t(:'.instructions') %></p>
-  <% unless @exhibit.searchable? %>
-    <p class="instructions alert-warning">
-      <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(@exhibit))) %>
-    </p>
-  <% end %>
-  <%= bootstrap_form_for @exhibit, url: update_all_exhibit_searches_path(@exhibit), layout: :horizontal, control_col: 'col-sm-10' do |f| %>
+  <div role="tabpanel">
+    <ul class="nav nav-tabs" role="tablist">
+      <li role="presentation" class="nav-item">
+        <a href="#browse-categories" aria-controls="browse-categories" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.categories_header') %></a>
+      </li>
 
-    <div class="panel-group dd search_admin" id="nested-pages" data-behavior="nestable" data-max-depth="1">
-      <ol class="dd-list">
-        <%= f.fields_for :searches do |p| %>
-          <%= render partial: 'search', locals: { f: p} %>
+      <li role="presentation" class="nav-item">
+        <a href="#browse-groups" aria-controls="browse-groups" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.groups_header') %></a>
+      </li>
+    </ul>
+    <div class="tab-content">
+      <div role="tabpanel" class="tab-pane active" id="browse-categories">
+        <p class="instructions"><%= t(:'.categories_instructions') %></p>
+        <% unless @exhibit.searchable? %>
+          <p class="instructions alert-warning">
+            <%= t(:'.not_searchable_html', href: link_to(t(:'spotlight.configuration.sidebar.search_configuration'), spotlight.edit_exhibit_search_configuration_path(@exhibit))) %>
+          </p>
         <% end %>
-      </ol>
-    </div>
+        <%= bootstrap_form_for @exhibit, url: update_all_exhibit_searches_path(@exhibit), layout: :horizontal, control_col: 'col-sm-10' do |f| %>
 
-    <div class="float-right">
-      <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
+          <div class="panel-group dd search_admin" id="nested-pages" data-behavior="nestable" data-max-depth="1">
+            <ol class="dd-list">
+              <%= f.fields_for :searches do |p| %>
+                <%= render partial: 'search', locals: { f: p} %>
+              <% end %>
+            </ol>
+          </div>
+
+          <div class="float-right">
+            <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
+          </div>
+        <% end %>
+      </div>
+      <div role="tabpanel" class="tab-pane" id="browse-groups">
+        <div class="instructions"><%= t(:'.groups_instructions_html') %></div>
+        <%= bootstrap_form_for @exhibit, url: update_all_exhibit_groups_path(@exhibit), layout: :horizontal, control_col: 'col-sm-10' do |f| %>
+
+          <div class="panel-group dd search_admin" id="nested-pages" data-behavior="nestable" data-max-depth="1">
+            <ol class="dd-list">
+              <%= f.fields_for :groups do |p| %>
+                <%= render partial: 'group', locals: { f: p} %>
+              <% end %>
+            </ol>
+          </div>
+
+          <div class="float-right">
+            <%= submit_tag t(:'helpers.action.update_all'), class: "btn btn-primary" %>
+          </div>
+        <% end %>
+        <%= form_for :group, url: spotlight.exhibit_groups_path(current_exhibit), 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(:'.add_new_group') %> <%= blacklight_icon('chevron_right') %>
+            <span data-title-field="true" class="input-field">
+              <%= f.text_field(:title) %>
+              <%= f.submit t(:'.save'), data: {behavior: "save"} %>
+              <%= f.submit t(:'.cancel'), data: {behavior: "cancel"} %>
+            </span>
+          </a>
+        <%- end -%>
+      </div>
     </div>
-  <% end %>
+  </div>
 <% end %>