blacklight-spotlight 2.13.0 → 3.0.0.alpha.1

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

@@ -1,8 +1,10 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= configuration_page_title %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= configuration_page_title %>
 
-<%= bootstrap_form_for @exhibit, url: spotlight.exhibit_appearance_path(@exhibit), layout: :horizontal, label_col: 'col-md-3 col-sm-3', control_col: 'col-md-5 col-sm-5', html: {data: { autocomplete_exhibit_catalog_path: spotlight.autocomplete_exhibit_catalog_path(current_exhibit, q: "%QUERY", format: "json") } } do |f| %>
+<%= bootstrap_form_for @exhibit, url: spotlight.exhibit_appearance_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-md-5 row', html: {data: { autocomplete_exhibit_catalog_path: spotlight.autocomplete_exhibit_catalog_path(current_exhibit, q: "%QUERY", format: "json") } } do |f| %>
   <% if @exhibit.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@exhibit.errors.count, "error") %> prohibited this page from being saved:</h2>
@@ -17,21 +19,21 @@
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
       <% if Spotlight::Engine.config.exhibit_themes.many? %>
-        <li role="presentation" class="active">
-          <a href="#site-theme" aria-controls="site-theme" role="tab" data-toggle="tab"><%= t(:'.site_theme.heading') %></a>
+        <li role="presentation" class="nav-item">
+          <a href="#site-theme" aria-controls="site-theme" role="tab" data-toggle="tab" class="nav-link active"><%= t(:'.site_theme.heading') %></a>
         </li>
       <% end %>
 
-      <li role="presentation" <%= 'class="active"'.html_safe unless Spotlight::Engine.config.exhibit_themes.many? %>>
-        <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab"><%= t(:'.site_masthead.heading') %></a>
+      <li role="presentation" class="nav-item">
+        <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab" class="nav-link <%= 'active' unless Spotlight::Engine.config.exhibit_themes.many? %>"><%= t(:'.site_masthead.heading') %></a>
       </li>
 
-      <li role="presentation">
-        <a href="#site-thumbnail" aria-controls="site-thumbnail" role="tab" data-toggle="tab"><%= t(:'.site_thumbnail.heading') %></a>
+      <li role="presentation" class="nav-item">
+        <a href="#site-thumbnail" aria-controls="site-thumbnail" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.site_thumbnail.heading') %></a>
       </li>
 
-      <li role="presentation">
-        <a href="#main-menu" aria-controls="main-menu" role="tab" data-toggle="tab"><%= t(:'.main_navigation.menu') %></a>
+      <li role="presentation" class="nav-item">
+        <a href="#main-menu" aria-controls="main-menu" role="tab" data-toggle="tab" class="nav-link"><%= t(:'.main_navigation.menu') %></a>
       </li>
     </ul>
     <div class="tab-content">
@@ -66,28 +68,30 @@
       <div role="tabpanel" class="tab-pane" id="main-menu">
         <%= field_set_tag do %>
           <p class="instructions"><%= t(:'.main_navigation.help') %></p>
-          <div class="panel-group dd main_navigation_admin col-sm-7" id="nested-navigation" data-behavior="nestable" data-max-depth="1">
+          <div class="card-group dd main_navigation_admin col-sm-7" id="nested-navigation" data-behavior="nestable" data-max-depth="1">
             <ol class="dd-list">
               <%= f.fields_for :main_navigations do |label| %>
                     <li class="dd-item dd3-item" data-id="<%= label.object.id %>">
-                      <div class="dd3-content panel panel-default">
+                      <div class="dd3-content card">
                         <div class="dd-handle dd3-handle"><%= t :drag %></div>
-                        <div class="panel-heading" data-behavior="restore-default">
+                        <div class="card-body container" data-behavior="restore-default">
                           <%= label.hidden_field :id %>
                           <div class="row">
                             <div class="col-sm-8">
-                              <div class='publish-control'>
-                                <%= label.check_box_without_bootstrap :display %>
-                              </div>
                               <div class="main">
-                                <h3 class="panel-title" 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"><%= label.object.label_or_default %></a>
-                                  <%= label.hidden_field :label, data: {:"default-value" => label.object.default_label, :"edit-field-target" => 'true'} %>
+                                <h3 class="card-title h6 mb-0">
+                                  <span class='publish-control h6'>
+                                    <%= label.check_box_without_bootstrap :display %>
+                                  </span>
+                                  <span class="d-inline-block w-75" 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"><%= label.object.label_or_default %></a>
+                                    <%= label.hidden_field :label, data: {:"default-value" => label.object.default_label, :"edit-field-target" => 'true'} %>
+                                  </span>
                                 </h3>
                               </div>
                             </div>
                             <div class="col-sm-4">
-                              <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-default btn-sm pull-right #{'hidden' if label.object.label.blank? || label.object.label == label.object.default_label}" %>
+                              <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-secondary btn-sm float-right #{'hidden' if label.object.label.blank? || label.object.label == label.object.default_label}" %>
                             </div>
                           </div>
                           <%= label.hidden_field :weight, data: {property: "weight"} %>
@@ -108,4 +112,3 @@
     </div>
   </div>
 <% end %>
-</div>

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

@@ -1,12 +1,12 @@
 <%= cache [@exhibit, search, I18n.locale] do %>
-  <div class="col-sm-4 col-xs-12 category">
+  <div class="col-md-4 col-12 category">
     <%= link_to 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') %>
         <div class="text-overlay">
            <h2 class="browse-category-title">
              <%= search.title%>
-             <small><%= t :'spotlight.browse.search.item_count', count: search.documents.size %></small>
+             <small><%= t :'spotlight.browse.search.item_count', count: search.count %></small>
            </h2>
          </div>
       </div>

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

@@ -1,16 +1,19 @@
 <div class="search-box-container">
   <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form form-horizontal', role: 'browse-search' do %>
     <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :exhibit_id, :browse_q, :qt, :page, :utf8)) %>
-    <div class="form-group">
-        <label class="col-sm-4 control-label" for="browse_q"><%= t(:'.label') %></label>
+    <div class="form-group row">
+      <label 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" %>
-            <span class="input-group-btn">
-              <button class="btn btn-reset" type="reset"><span class="sr-only"><%= t(:'.reset') %></span><span class="glyphicon glyphicon-remove-circle"></span></button>
+            <span class="input-group-btn input-group-append">
+              <button class="btn btn-reset" type="reset">
+                <span class="sr-only"><%= t(:'.reset') %></span>
+                <%= blacklight_icon('remove_circle_outline') %>
+              </button>
               <button type="submit" class="btn btn-primary search-btn" id="browse-search">
-              <span class="submit-search-text"><%= t(:'.submit') %></span>
-              <span class="glyphicon glyphicon-search"></span>
+                <span class="submit-search-text"><%= t(:'.submit') %></span>
+                <%= blacklight_icon('search', aria_hidden: true) %>
               </button>
             </span>
         </div>

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

@@ -1,2 +1,2 @@
 <%= search.title %>
-<small class="item-count"><%= t :'spotlight.browse.search.item_count', count: params[:browse_q] ? parent_search_count: search.documents.size %></small>
+<small class="item-count"><%= t :'spotlight.browse.search.item_count', count: params[:browse_q] ? parent_search_count: search.count %></small>

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

@@ -1,7 +1,5 @@
-<div id="sortAndPerPage" class="clearfix">
-  <div class="search-widgets pull-right">
-    <%= render :partial => 'sort_widget' %>
-    <%= render :partial => 'per_page_widget' %>
-    <%= render :partial => 'view_type_group' %>
+<div id="sortAndPerPage" class="sort-pagination clearfix">
+  <div class="search-widgets float-md-right">
+    <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
   </div>
 </div>

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

@@ -1,8 +1,6 @@
 <% set_html_page_title %>
-<div class="col-md-12">
-  <h1 class="sr-only"><%= t :'.header' %></h1>
+<h1 class="sr-only"><%= t :'.header' %></h1>
 
-  <div class="browse-landing">
-    <%= render collection: @searches, partial: 'spotlight/browse/search' %>
-  </div>
-</div>
+<div class="browse-landing row">
+  <%= render collection: @searches, partial: 'spotlight/browse/search' %>
+</div>

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

@@ -1,7 +1,7 @@
 <% set_html_page_title @search.title %>
 <% render partial: 'tophat' %>
 <div class="col-md-12">
-  <%= exhibit_edit_link @search, class: 'edit-button pull-right btn btn-primary' if can? :edit, @search %>
+  <%= exhibit_edit_link @search, class: 'edit-button float-right btn btn-primary' if can? :edit, @search %>
   <% if resource_masthead? %>
     <% content_for :masthead do %>
       <%= render 'search_title', search: @search %>

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

@@ -3,8 +3,8 @@
     <%= render 'reindex_progress_panel' %>
   </div>
   <div class="add-items-nav clearfix">
-    <div class="pull-right">
-      <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), method: :post, class: 'btn btn-default' %>
+    <div class="float-right">
+      <%= link_to t('.reindex'), reindex_all_exhibit_resources_path(current_exhibit), method: :post, class: 'btn btn-secondary' %>
       <% if Spotlight::Engine.config.resource_partials.any? %>
         <%= link_to t('.new_resource'), new_exhibit_resource_path(current_exhibit), class: 'btn btn-primary' %>
       <% end %>

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

@@ -1 +1 @@
-<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'pull-right btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>
+<%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'float-right btn btn-primary' if can?(:curate, current_exhibit) and !current_page? [:edit, current_exhibit, document]  %>

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

@@ -2,10 +2,10 @@
 <table id="documents" class="table">
   <thead>
     <tr>
-      <th class="col-sm-1"></th>
-      <th class="col-sm-5"><%= t(:'spotlight.catalog.fields.title') %></th>
-      <th class="col-sm-2"><%= t(:'spotlight.catalog.fields.date_added') %></th>
-      <th class="col-sm-1 checkbox-toggle"><%= t(:'spotlight.catalog.fields.visibility') %></th>
+      <th></th>
+      <th scope="col"><%= t(:'spotlight.catalog.fields.title') %></th>
+      <th scope="col" class="text-nowrap"><%= t(:'spotlight.catalog.fields.date_added') %></th>
+      <th scope="col" class="checkbox-toggle"><%= t(:'spotlight.catalog.fields.visibility') %></th>
     </tr>
   </thead>
   <%= render partial: 'document_row', collection: documents, as: :document %>

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

@@ -14,7 +14,7 @@
       <%= render partial: "spotlight/custom_fields/form_group/#{field.field_type}", locals: { f: d, field: field, value: data[field.slug.to_s] || data[field.field.to_s] }  %>
 
       <% unless field.configured_to_display? %>
-        <p class="bg-warning help-block">
+        <p class="bg-warning form-text">
           <%= t(:'.blank_field_warning_html',
                 link: link_to(t(:'spotlight.configuration.sidebar.metadata'), spotlight.edit_exhibit_metadata_configuration_path(current_exhibit))) %>
         </p>

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

@@ -11,11 +11,10 @@
   </div>
 </td>
 
-<td>
+<td class="text-nowrap">
   <%= l Date.parse(document[blacklight_config.index.timestamp_field]) if document[blacklight_config.index.timestamp_field] %>
 </td>
 
 <td class="checkbox-toggle">
   <%= render partial: 'document_visibility_control', locals: { document: document} %>
 </td>
-

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

@@ -1,8 +1,6 @@
-<div class="panel panel-info index-status" style='display:none;'>
-  <div class="panel-heading">
-    <h3 class="panel-title"><%= t('.heading') %></h3>
-  </div>
-  <div class="panel-body">
+<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>

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

@@ -1,16 +1,16 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
 
-  <%= curation_page_title %>
+<%= curation_page_title %>
 
-      <%= render 'admin_header' %>
-      <%= render 'search_header' %>
+<%= render 'admin_header' %>
+<%= render 'search_header' %>
 
-      <%- if @response.empty? %>
-        <%= render "zero_results" %>
-      <%- else %>
-        <%= render_document_index %>
-      <%- end %>
+<%- if @response.empty? %>
+  <%= render "zero_results" %>
+<%- else %>
+  <%= render_document_index %>
+<%- end %>
 
-	    <%= render 'results_pagination' %>
-</div>
+<%= render 'results_pagination' %>

data/app/views/spotlight/contact_forms/new.html.erb

@@ -1,3 +1 @@
-<div id="content" class="col-md-9">
-  <%= render partial: 'spotlight/shared/report_a_problem', locals: { contact_form: @contact_form } %>
-</div>
+<%= render partial: 'spotlight/shared/report_a_problem', locals: { contact_form: @contact_form } %>

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

@@ -1,5 +1,6 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= curation_page_title %>
-  <%= render 'form' %>
-</div>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= curation_page_title %>
+<%= render 'form' %>

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

@@ -1,5 +1,6 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= curation_page_title %>
-  <%= render 'form' %>
-</div>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= curation_page_title %>
+<%= render 'form' %>

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

@@ -1,5 +1,6 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= configuration_page_title %>
-  <%= render 'form' %>
-</div>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= configuration_page_title %>
+<%= render 'form' %>

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

@@ -1,5 +1,6 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
-<div id="content" class="col-md-9">
-  <%= configuration_page_title %>
-  <%= render 'form' %>
-</div>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
+
+<%= configuration_page_title %>
+<%= render 'form' %>

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

@@ -2,13 +2,13 @@
   <h3><%= t :'.monthly_header' %></h3>
   <table class="table analytics">
     <tr>
-    <% Spotlight::Engine.config.analytics_provider.metrics.elements.each do |e| %>
-        <td class="value col-md-3 <%= e %>"><%= current_exhibit.analytics(1.month, exhibit_root_path(current_exhibit)).send(e) %></td>
+    <% current_exhibit.analytics_provider.metrics.elements.each do |e| %>
+        <td class="value <%= e %>"><%= current_exhibit.analytics(1.month, exhibit_root_path(current_exhibit)).send(e) %></td>
     <% end %>
     </tr>
     <tfoot>
       <tr>
-      <% Spotlight::Engine.config.analytics_provider.metrics.elements.each do |e| %>
+      <% current_exhibit.analytics_provider.metrics.elements.each do |e| %>
         <th><%= t(:".#{e}") %></th>
       <% end %>
       </tr>

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

@@ -1,7 +1,7 @@
-<tr>
-  <td>
-    <h4 class="panel-title"><%= page.title %></h4>
-    <div class="page-links">
+<tr class="d-flex">
+  <td class="col-6">
+    <h4 class="h5 mb-0"><%= page.title %></h4>
+    <div class="page-links pt-0">
       <% if page.is_a?(Spotlight::HomePage) %>
           <%= link_to action_default_value(page, :view), current_exhibit, :class => 'btn btn-link' %> &middot;
           <%= exhibit_edit_link page, edit_exhibit_home_page_path(page.exhibit), :class => 'btn btn-link', data: { turbolinks: false } %>
@@ -11,6 +11,6 @@
       <% end %>
     </div>
   </td>
-  <td><%= page.last_edited_by.to_s if page.last_edited_by %></td>
-  <td><%= l page.updated_at, format: :short %></td>
+  <td class="col-4"><%= page.last_edited_by.to_s if page.last_edited_by %></td>
+  <td class="col-2"><%= l page.updated_at, format: :short %></td>
 </tr>

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

@@ -3,14 +3,14 @@
 <% unless @pages.empty? %>
   <table class="table table-striped">
   <thead>
-    <tr>
-      <th class="col-md-4"><%= t :'.field.title' %></th>
-      <th class="col-md-2"><%= t :'.field.last_edited_by' %></th>
-      <th class="col-md-2"><%= t :'.field.updated_at' %></th>
+    <tr class="d-flex">
+      <th class="col-6"><%= t :'.field.title' %></th>
+      <th class="col-4"><%= t :'.field.last_edited_by' %></th>
+      <th class="col-2"><%= t :'.field.updated_at' %></th>
     </tr>
   </thead>
   <tbody>
     <%= render partial: 'page', collection: @pages %>
   </tbody>
   </table>
-<% end %>
+<% end %>

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

@@ -3,22 +3,22 @@
 <% unless @recent_reindexing.empty? %>
   <table class="table table-striped">
   <thead>
-    <tr>
-      <th class="col-md-3"><%= t :'.field.date' %></th>
-      <th class="col-md-2"><%= t :'.field.user' %></th>
-      <th class="col-md-1"><%= t :'.field.items_reindexed_count' %></th>
-      <th class="col-md-2"><%= t :'.field.duration' %></th>
-      <th class="col-md-2"><%= t :'.field.job_status' %></th>
+    <tr class="d-flex">
+      <th class="col-3"><%= t :'.field.date' %></th>
+      <th class="col-3"><%= t :'.field.user' %></th>
+      <th class="col-1"><%= t :'.field.items_reindexed_count' %></th>
+      <th class="col-3"><%= t :'.field.duration' %></th>
+      <th class="col-2"><%= t :'.field.job_status' %></th>
     </tr>
   </thead>
   <tbody>
     <% @recent_reindexing.each do |log_entry| %>
-      <tr>
-        <td><%= l log_entry.start_time, format: :short if log_entry.start_time %></td>
-        <td><%= log_entry.user.email if log_entry.user %></td>
-        <td><%= log_entry.items_reindexed_count %></td>
-        <td><%= distance_of_time_in_words log_entry.duration, 0, include_seconds: true if log_entry.duration %></td>
-        <td><%= t "reindexing_log.status.#{log_entry.job_status}" %></td>
+      <tr class="d-flex">
+        <td class="col-3"><%= l log_entry.start_time, format: :short 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>
       </tr>
     <% end %>
   </tbody>

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

@@ -1,13 +1,13 @@
-<%= render 'spotlight/shared/exhibit_sidebar' %>
+<% content_for(:sidebar) do %>
+  <%= render 'spotlight/shared/exhibit_sidebar' %>
+<% end %>
 
-<div id="content" class="col-md-9">
-  <%= curation_page_title %>
+<%= curation_page_title %>
 
-  <% if Spotlight::Engine.config.analytics_provider and Spotlight::Engine.config.analytics_provider.enabled? %>
-    <%= render 'analytics' %>
-  <% else %>
-    <div class="empty-page-block">
-      <p>In order to view exhibit analytics, the site administrator must <a href="https://github.com/projectblacklight/spotlight/wiki/Installation">configure an analytics provider.</a></p>
-    </div>
-  <% end %>
-</div>
+<% if current_exhibit.analytics_provider&.enabled? %>
+  <%= render 'analytics' %>
+<% else %>
+  <div class="empty-page-block">
+    <p>In order to view exhibit analytics, the site administrator must <a href="https://github.com/projectblacklight/spotlight/wiki/Installation">configure an analytics provider.</a></p>
+  </div>
+<% end %>