blacklight-spotlight 3.0.0.rc3 → 3.0.1

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

@@ -13,7 +13,7 @@
         <%= f.text_field :title, label: t(:'spotlight.saved_search.title') %>
         <%= label_tag :id, t(:'spotlight.saved_search.id'), class: 'col-form-label' %>
         <%= select_tag :id, options_for_select(current_exhibit.searches.map { |s| [s.full_title, s.id] }), include_blank: true, class: 'form-control' %>
-        <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:qt, :page, :utf8)) %>
+        <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:qt, :page)) %>
       </div>
       <div class="modal-footer d-flex flex-row-reverse justify-content-start">
         <%= f.submit nil, class: 'btn btn-primary' %>

data/app/views/spotlight/about_pages/_sidebar.html.erb

@@ -1,4 +1,4 @@
-<% cache_unless current_user, [current_exhibit, @page] do %>
+<% cache_unless current_user, [current_exhibit, @page, I18n.locale] do %>
   <h2 class="nav-heading h4"><%= current_exhibit.main_navigations.about.label_or_default %></h2>
   <ul class="nav sidenav flex-column">
     <% current_exhibit.about_pages.for_locale.published.each do |page| %>
@@ -7,7 +7,7 @@
       </li>
     <% end %>
   </ul>
-  <%= cache current_exhibit do %>
+  <%= cache [current_exhibit, I18n.locale] do %>
     <%= render 'contacts' if current_exhibit.contacts.published.present? %>
   <% end %>
 <% end %>

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

@@ -1,12 +1,12 @@
-<%= cache [@exhibit, search, I18n.locale] do %>
-  <% group ||= @group %>
+<% group ||= @group %>
+<%= cache [@exhibit, group || '', search, I18n.locale] do %>
   <div class="col-md-4 col-12 category">
     <%= link_to group.present? ? spotlight.exhibit_browse_group_path(@exhibit, group, search) : spotlight.exhibit_browse_path(@exhibit, search) do %>
       <div class="image-overlay">
         <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-responsive', alt: '') %>
         <div class="text-overlay">
            <h2 class="browse-category-title">
-             <span class="title"><%= search.title%></span>
+             <span class="title"><%= search.title %></span>
              <% if search.subtitle.present? %><span class="category-subtitle"><%= search.subtitle %></span><% end %>
              <small class="item-count"><%= t :'spotlight.browse.search.item_count', count: search.count %></small>
            </h2>

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

@@ -1,11 +1,11 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-form form-horizontal', role: 'search', 'aria-labelledby' => 'browse-search-form' do %>
-    <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :exhibit_id, :browse_q, :qt, :page, :utf8)) %>
+    <%= render Blacklight::HiddenSearchStateComponent.new(params: search_state.params_for_search.except(:q, :search_field, :exhibit_id, :qt, :page)) %>
     <div class="form-group row">
       <label id="browse-search-form" class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
       <div class="col-sm-6">
         <div class="input-group">
-          <%= text_field_tag :browse_q, params[:browse_q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
+          <%= text_field_tag :q, params[:q], placeholder: t(:'.placeholder'), class: "form-control", id: "browse_q" %>
             <span class="input-group-btn input-group-append">
               <button class="btn btn-reset btn-sm" type="reset">
                 <span class="sr-only"><%= t(:'.reset') %></span>
@@ -20,20 +20,20 @@
       </div>
     </div>
   <% end %>
-  <% if params[:browse_q]%>
+  <% if params[:q].present? %>
     <div class="browse-search-expand">
-      <% if search.count > 0 %>
-        <p><%= t(:'.success.result_number_html', search_size: search.count, parent_search_count: parent_search_count) %></p>
+      <% if @response.size > 0 %>
+        <p><%= t(:'.success.result_number_html', search_size: @response.size, parent_search_count: parent_search_count) %></p>
         <p><%= t(:'.success.expand_html',
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:browse_q]),
-                  browse_query: params[:browse_q]) %>
+                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
+                  browse_query: params[:q]) %>
         </p>
       <% else %>
         <p><%= t(:'.zero_results.result_number') %></p>
         <p><%= t(:'.zero_results.expand_html',
                   clear_search_url: exhibit_browse_path(current_exhibit, search),
-                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:browse_q]),
-                  browse_query: params[:browse_q])%>
+                  expand_search_url: search_exhibit_catalog_path(current_exhibit, q: params[:q]),
+                  browse_query: params[:q])%>
         </p>
       <% end %>
     </div>

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

@@ -1,3 +1,3 @@
 <span class="title"><%= search.title %></span>
 <% if search.subtitle.present? %><span class="subtitle"><%= search.subtitle %></span><% end %>
-<small class="item-count"><%= t :'spotlight.browse.search.item_count', count: params[:browse_q] ? parent_search_count: search.count %></small>
+<small class="item-count"><%= t :'spotlight.browse.search.item_count', count: search.count %></small>

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

@@ -0,0 +1,23 @@
+<p class="instructions"><%= t('.instructions_html') %></p>
+
+<%= bootstrap_form_with(url: download_template_exhibit_bulk_updates_path, local: true, target: '_blank') do |f| %>
+  <div class="row">
+    <div class="col col-sm-3">
+      <%= f.form_group(:reference_fields, label: { text: t('.reference_fields.heading'), class: 'font-weight-bold' }) do %>
+        <%= f.check_box('reference_fields[item_id]', label: t('.item_id'), checked: true, disabled: true) %>
+        <%= f.check_box('reference_fields[item_title]', label: t('.item_title')) %>
+      <% end %>
+    </div>
+    <div class="col col-sm-3">
+      <%= f.form_group(:updatable_fields, label: { text: t('.updatable_fields.heading'), class: 'font-weight-bold' }) do %>
+        <%= f.check_box('updatable_fields[visibility]', checked: true, label: t('.visibility')) %>
+        <%= f.check_box('updatable_fields[tags]', label: t('.tags')) %>
+      <% end %>
+    </div>
+    <div class="col col-sm-3 download-csv">
+      <%= f.submit t('.submit'), class: 'btn btn-primary'  %>
+    </div>
+  </div>
+<% end %>
+
+<%= t('.guidelines_html') %>

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

@@ -0,0 +1 @@
+<%= t('.instructions_html') %>

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

@@ -0,0 +1,19 @@
+<div class="card index-status border-info mb-3" style='display:none;'>
+  <h3 class="card-header bg-info text-white h4"><%= t('.heading') %></h3>
+  <div class="card-body">
+    <p data-behavior='monitor-start'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.begin_html') %>
+    </p>
+    <p data-behavior='monitor-completed'>
+      <span class="text-muted" data-behavior='date'></span> <%= t('.completed_html') %>
+    </p>
+
+    <p class="bg-warning" data-behavior='monitor-error' style='display:none;'>
+      <%= t('.error') %>
+    </p>
+
+    <div class="progress">
+      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="" aria-valuemin="0" aria-valuemax=""></div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<p class="instructions"><%= t('.instructions') %></p>
+
+<%= bootstrap_form_with(url: exhibit_bulk_updates_path, method: :patch, multipart: true, layout: :inline) do |f| %>
+  <%= f.label :file, t('.file_label'), class: 'col-form-label col-md-3' %>
+  <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by' => 'bulk-update-form-help' %>
+  <%= f.submit t('.submit'), class: 'btn btn-primary ml-2' %>
+<% end %>
+<div class="row">
+  <div class="offset-md-3">
+    <p id="bulk-update-form-help" class="form-text text-muted ml-2"><%= t('.form_help') %></p>
+  </div>
+</div>

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

@@ -0,0 +1,37 @@
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= curation_page_title t(:".header") %>
+
+<div data-behavior='progress-panel' data-monitor-url="<%= monitor_exhibit_bulk_updates_path(current_exhibit) %>">
+  <%= render 'progress_panel' %>
+</div>
+
+<div role="tabpanel">
+  <ul class="nav nav-tabs" role="tablist">
+    <li role="presentation" class="nav-item">
+      <a href="#overview" aria-controls="overview" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.overview.heading') %></a>
+    </li>
+    <li role="presentation" class="nav-item">
+      <a href="#download" aria-controls="download" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.download.heading') %></a>
+    </li>
+    <li role="presentation" class="nav-item">
+      <a href="#upload" aria-controls="upload" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.upload.heading') %></a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div role="tabpanel" class="tab-pane active" id="overview">
+      <%= render 'overview' %>
+    </div>
+
+    <div role="tabpanel" class="tab-pane" id="download">
+      <%= render 'download' %>
+    </div>
+
+    <div role="tabpanel" class="tab-pane" id="upload">
+      <%= render 'upload' %>
+    </div>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <% if can? :manage, Spotlight::Resource.new(exhibit: current_exhibit) %>
-  <div data-behavior='reindex-monitor' data-monitor-url="<%= monitor_exhibit_resources_path(current_exhibit) %>">
+  <div data-behavior='progress-panel' data-monitor-url="<%= monitor_exhibit_resources_path(current_exhibit) %>">
     <%= render 'reindex_progress_panel' %>
   </div>
   <div class="add-items-nav clearfix">

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

@@ -15,7 +15,7 @@
         <%= t('blacklight.search.documents.counter', counter: counter) %>
       </span>
     <% end %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+    <%= link_to_document document, counter: counter %>
   </h5>
 
   <%= document_actions %>

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

@@ -1,5 +1,6 @@
-<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, { alt: '' }, 'aria-hidden': true, tabindex: -1, counter: document_counter_with_offset(document_counter)) %>
+<% doc_presenter = document_presenter(document) %>
+<%- if doc_presenter.thumbnail.exists? %>
   <div class="document-thumbnail spotlight-admin-thumbnail">
-    <%= tn %>
+    <%= doc_presenter.thumbnail.thumbnail_tag({ alt: '' }, 'aria-hidden': true, tabindex: -1, counter: document_counter_with_offset(document_counter)) %>
   </div>
 <%- end %>

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

@@ -13,12 +13,12 @@
 
   <% if can? :tag, current_exhibit %>
   <div class="edit-tags">
-  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, 'data-autocomplete_url' => exhibit_tags_path(current_exhibit, format: 'json') %>
+  <%= f.text_field :exhibit_tag_list, value: f.object.sidecar(current_exhibit).tags_from(current_exhibit).to_s, data: { autocomplete_tag: true, autocomplete_url: exhibit_tags_path(current_exhibit, format: 'json')} %>
   </div>
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]) %>
+      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]), class: 'btn-sizing' %>
       <%= f.submit nil, class: 'btn btn-primary' %>
       </div>
   </div>

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

@@ -12,7 +12,7 @@ json.manifests do
 
     json.set! :@id, doc.first(Spotlight::Engine.config.iiif_manifest_field)
     json.set! :@type, 'sc:manifest'
-    json.label presenter(doc).label(document_show_link_field(doc)).to_str
+    json.label document_presenter(doc).heading
   end
 end
 

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

@@ -1,4 +1,4 @@
-<% cache_unless current_user, [current_exhibit, @page] do %>
+<% cache_unless current_user, [current_exhibit, @page, I18n.locale] do %>
   <ol class="nav sidenav flex-column">
     <% @exhibit.feature_pages.for_locale.published.at_top_level.each do |feature_section| %>
       <li class="<%= 'active' if current_page? [spotlight, @exhibit, feature_section] %>">

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>

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

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