blacklight-spotlight 3.0.0.alpha.3 → 3.0.0.alpha.4

data/app/assets/stylesheets/spotlight/_sir-trevor_overrides.scss

@@ -13,8 +13,8 @@
 }
 
 .content-block {
-  margin-top: 3*$padding-large-vertical;
-  margin-bottom: 3*$padding-large-vertical;
+  margin-top: 3*$spacer;
+  margin-bottom: 3*$spacer;
 }
 
 // Sir-trevor sets the overflow to hidden which
@@ -76,10 +76,9 @@
 .st-block-controls__button {
   @extend .btn;
   @extend .btn-secondary;
+  @extend .btn-outline-secondary;
 
-  background-color: theme-colors("secondary");
   border: 1px solid $gray-700;
-  color: theme-colors("light");
 
   .st-icon {
     margin-left: auto;

data/app/assets/stylesheets/spotlight/_slideshow_block.scss

@@ -70,6 +70,7 @@
       margin: 0;
       border: none;
       border-radius: 0;
+      opacity: 1;
 
       @extend .list-group-item;
     }

data/app/assets/stylesheets/spotlight/_spotlight.scss

@@ -5,7 +5,6 @@
 @import "spotlight/sir-trevor_overrides";
 @import "spotlight/attachments";
 @import "spotlight/pages";
-@import 'blacklight_gallery/default';
 @import "spotlight/browse";
 @import "spotlight/header";
 @import "spotlight/footer";

data/app/assets/stylesheets/spotlight/_translations.scss

@@ -4,7 +4,7 @@
   }
 
   .browse-category-title {
-    margin-bottom: $padding-base-vertical;
+    margin-bottom: $spacer;
 
     label {
       font-weight: normal;
@@ -12,7 +12,7 @@
   }
 
   .browse-category-description {
-    margin-bottom: $padding-large-vertical * 2;
+    margin-bottom: $spacer * 2;
   }
 
   .table.table-striped th {
@@ -28,11 +28,11 @@
 
 .form-group.translation-form {
   .col-form-label {
-    padding-top: $card-spacer-y + $padding-base-vertical;
+    padding-top: $card-spacer-y + $spacer;
   }
 
   .translation-complete {
-    padding-top: $card-spacer-y + $padding-base-vertical;
+    padding-top: $card-spacer-y + $spacer;
   }
 }
 
@@ -73,7 +73,7 @@
   display: block;
   font-size: $h4-font-size;
   font-weight: bold;
-  margin-bottom: $padding-large-vertical * 2;
-  margin-top: $padding-large-vertical;
+  margin-bottom: $spacer * 2;
+  margin-top: $spacer;
   padding-bottom: 3px;
 }

data/app/assets/stylesheets/spotlight/_utilities.scss

@@ -1,3 +1,7 @@
 .inline-block {
   display: inline-block;
 }
+
+.btn-sizing {
+  @include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
+}

data/app/controllers/spotlight/translations_controller.rb

@@ -7,7 +7,9 @@ module Spotlight
     before_action :authenticate_user!, :set_language, :set_tab
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
-    def edit; end
+    def edit
+      attach_breadcrumbs
+    end
 
     def update
       if current_exhibit.update(exhibit_params)
@@ -21,6 +23,12 @@ module Spotlight
 
     private
 
+    def attach_breadcrumbs
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.curation.sidebar.translations')
+    end
+
     def exhibit_params
       params.require(:exhibit).permit(translations_attributes: %i[id locale key value])
     end

data/app/helpers/spotlight/pages_helper.rb

@@ -67,8 +67,9 @@ module Spotlight
       end
     end
 
+    # Insert soft breaks into email addresses so they wrap nicely
     def render_contact_email_address(address)
-      mail_to address, address
+      mail_to address, sanitize(address).gsub(/([@\.])/, '\1<wbr />').html_safe
     end
 
     def configurations_for_current_page

data/app/models/spotlight/field_metadata.rb

@@ -19,8 +19,7 @@ module Spotlight
     def field(key)
       {
         document_count: document_counts.fetch(field_name(key), 0),
-        value_count: terms.fetch(field_name(key), []).length,
-        terms: terms.fetch(field_name(key), [])
+        value_count: terms.fetch(field_name(key), []).length
       }
     end
 

data/app/views/shared/_masthead.html.erb

@@ -13,18 +13,20 @@
   <%= render 'shared/exhibit_navbar' if current_exhibit && resource_masthead? %>
 
   <div class="container site-title-container">
-    <% if content_for? :masthead %>
-      <h1 class="site-title h2">
-        <%= content_for :masthead %>
-      </h1>
-    <% else %>
-      <h1 class="site-title h2">
-        <%= masthead_heading_content %>
-      </h1>
-      <% if masthead_subheading_content %>
-        <small><%= masthead_subheading_content %></small>
+    <div class="site-title-wrapper">
+      <% if content_for? :masthead %>
+        <h1 class="site-title h2">
+          <%= content_for :masthead %>
+        </h1>
+      <% else %>
+        <h1 class="site-title h2">
+          <%= masthead_heading_content %>
+        </h1>
+        <% if masthead_subheading_content %>
+          <small><%= masthead_subheading_content %></small>
+        <% end %>
       <% end %>
-    <% end %>
+    </div>
   </div>
 
   <%= render 'shared/exhibit_navbar' if current_exhibit && !resource_masthead? %>

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

@@ -9,9 +9,9 @@
         <%= f.hidden_field :weight, data: {property: "weight"} %>
         <%= render partial: "contact_properties", locals: {contact: f.object} %>
       </div>
-      <div class="contact-links">
-        <%= exhibit_edit_link f.object, :class => 'btn btn-link' %> &middot;
-        <%= exhibit_delete_link f.object, :class => 'btn btn-link' %>
+      <div class="contact-links page-links">
+        <%= exhibit_edit_link f.object %> &middot;
+        <%= exhibit_delete_link f.object %>
       </div>
     </div>
   </div>

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

@@ -1,6 +1,6 @@
 <div class="d-flex w-100">
   <%= image_tag contact.avatar.iiif_url, class: 'contact-photo', alt: '' if contact.avatar && contact.avatar.iiif_url.present? %>
-  <div>
+  <div class="contact-properties">
     <div itemprop="name" class="name"><%= contact.name %></div>
     <% Spotlight::Contact.fields.each do |field, options| %>
       <% if (value = contact.contact_info[field]).present? %>

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

@@ -1,90 +1,96 @@
 <%= page_title(t('.section'), t('.page_title')) %>
 <%= bootstrap_form_for Spotlight::Engine.user_class.new, html: { class: 'admin-users' }, url: spotlight.admin_users_path do |f| %>
-  <h3 class="instructions"><%= t :'.instructions' %></h3>
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th><%= Spotlight::Engine.user_class.human_attribute_name(:email)  %></th>
-      </tr>
-    </thead>
-    <tbody class="table">
-      <% @site.roles.map(&:user).each do |user| %>
+  <div class="mb-4">
+    <h3 class="instructions"><%= t :'.instructions' %></h3>
+    <table class="table table-striped">
+      <thead>
         <tr>
-          <td class="<%= 'invite-pending' if user.invite_pending? %>">
-            <%= user.email %>
-            <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
+          <th colspan="2"><%= Spotlight::Engine.user_class.human_attribute_name(:email)  %></th>
+        </tr>
+      </thead>
+      <tbody class="table">
+        <% @site.roles.map(&:user).each do |user| %>
+          <tr>
+            <td class="<%= 'invite-pending' if user.invite_pending? %>">
+              <%= user.email %>
+              <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
+            </td>
+            <td>
+              <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-sm btn-danger float-right') unless user == current_user %>
+            </td>
+          </tr>
+        <% end %>
+        <tr data-edit-for='new'>
+          <td>
+            <%= f.email_field :email, hide_label: true %>
+            <span data-user-role='admin'></span>
           </td>
           <td>
-            <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger float-right') unless user == current_user %>
+            <div class="form-actions">
+              <div class="primary-actions">
+              <%= cancel_link f.object, '#', class: 'btn-sizing', data: { behavior: 'cancel-edit' } %>
+              <%= f.submit t('.save'), class: 'btn btn-primary'%>
+              </div>
+            </div>
           </td>
         </tr>
-      <% end %>
-      <tr data-edit-for='new'>
-        <td>
-          <%= f.email_field :email, hide_label: true %>
-          <span data-user-role='admin'></span>
-        </td>
-        <td>
-          <div class="form-actions">
-            <div class="primary-actions">
-            <%= cancel_link f.object, '#', class: 'btn btn-link', data: { behavior: 'cancel-edit' } %>
-            <%= f.submit t('.save'), class: 'btn btn-primary'%>
-            </div>
-          </div>
-        </td>
-      </tr>
-      <tr data-edit-for='new'>
-        <td colspan='2'>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+        <tr data-edit-for='new'>
+          <td colspan='2'>
+          </td>
+        </tr>
+      </tbody>
+    </table>
 
-  <div class="form-actions">
-    <div class="primary-actions">
-      <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-secondary', data: { behavior: 'new-user' }) %>
+    <div class="form-actions">
+      <div class="primary-actions">
+        <%= link_to(t('.create'), 'javascript:;', class: 'btn btn-secondary', data: { behavior: 'new-user' }) %>
+      </div>
     </div>
   </div>
 
-  <h3 class="instructions"><%= t :'.admins_curators' %></h3>
-  <div id="admins_curators" class="card card-body bg-light">
-    <div class='btn-toolbar float-right'>
-      <button class="btn btn-sm btn-secondary copy-email-addresses" data-clipboard-target="#admins_curators">
-          <%= t('.copy') %>
-      </button>
+  <div class="mb-4">
+    <h3 class="instructions"><%= t :'.admins_curators' %></h3>
+    <div id="admins_curators" class="card card-body bg-light">
+      <div class='btn-toolbar float-right'>
+        <button class="btn btn-sm btn-secondary copy-email-addresses" data-clipboard-target="#admins_curators">
+            <%= t('.copy') %>
+        </button>
+      </div>
+      <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
     </div>
-    <%= Spotlight::Engine.user_class.with_roles.pluck(:email).sort.join(', ') %>
   </div>
 
-  <h3 class="instructions"><%= t :'.all_users' %></h3>
-  <table class="table table-striped ">
-    <thead>
-      <tr>
-        <th><%= Spotlight::Engine.user_class.human_attribute_name(:email)  %></th>
-        <th><%= Spotlight::Engine.user_class.human_attribute_name(:role)  %></th>
-      </tr>
-    </thead>
-    <tbody class="table">
-      <% @users.each do |user| %>
+  <div class="mb-4">
+    <h3 class="instructions"><%= t :'.all_users' %></h3>
+    <table class="table table-striped ">
+      <thead>
         <tr>
-          <td class="<%= 'invite-pending' if user.invite_pending? %>">
-            <%= user.email %>
-            <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
-          </td>
-          <td class="role">
-            <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
-          </td>
-          <td class="text-right">
-            <% if user.superadmin? %>
-              <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-danger') unless user == current_user %>
-            <% else %>
-              <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-default') %>
-            <% end %>
-          </td>
+          <th><%= Spotlight::Engine.user_class.human_attribute_name(:email)  %></th>
+          <th><%= Spotlight::Engine.user_class.human_attribute_name(:role)  %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody class="table">
+        <% @users.each do |user| %>
+          <tr>
+            <td class="<%= 'invite-pending' if user.invite_pending? %>">
+              <%= user.email %>
+              <span class='badge badge-warning pending-label'><%= t('.pending') %></span>
+            </td>
+            <td class="role">
+              <%= user.roles.map { |r| r.role.titleize }.uniq.join(", ") %>
+            </td>
+            <td class="text-right">
+              <% if user.superadmin? %>
+                <%= link_to(t('.destroy'), admin_user_path(user), method: :delete, class: 'btn btn-sm btn-danger') unless user == current_user %>
+              <% else %>
+                <%= link_to(t('.update'), admin_user_path(user), method: :patch, class: 'btn btn-sm btn-secondary') %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% end %>
 
 <% content_for(:sidebar_position) { 'order-last' } %>

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

@@ -9,7 +9,7 @@
             <span class="input-group-btn input-group-append">
               <button class="btn btn-reset btn-sm" type="reset">
                 <span class="sr-only"><%= t(:'.reset') %></span>
-                <%= blacklight_icon('remove_circle_outline') %>
+                <%= blacklight_icon('highlight_off') %>
               </button>
               <button type="submit" class="btn btn-primary search-btn" id="browse-search">
                 <span class="submit-search-text"><%= t(:'.submit') %></span>

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

@@ -1,30 +1,27 @@
 <% set_html_page_title @search.title %>
 <% render partial: 'tophat' %>
-<div class="col-md-12">
-  <%= 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 %>
-    <% end %>
-  <% else %>
-    <h1><%= render 'search_title', search: @search %></h1>
-  <% end %>
-  <% if @search.long_description.present? %>
-    <div class="long-description-text <%= 'very-long-description-text' if @search.long_description.length > 600 %>">
-      <%= render_markdown @search.long_description %>
-    </div>
-  <% end %>
-</div>
 
-<div class="col-md-12">
-  <%= render 'sort_and_per_page' %>
-  <% if @search.search_box? %>
-    <%= render partial: 'search_box', locals: {search: @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 %>
   <% end %>
-  <% if @search.default_index_view_type && params[:view].blank? %>
-    <%= render_document_index_with_view(@search.default_index_view_type, @document_list) %>
-  <% else %>
-    <%= render_document_index(@document_list) %>
-  <% end %>
-  <%= render 'results_pagination' %>
-</div>
+<% else %>
+  <h1><%= render 'search_title', search: @search %></h1>
+<% end %>
+<% if @search.long_description.present? %>
+  <div class="long-description-text <%= 'very-long-description-text' if @search.long_description.length > 600 %>">
+    <%= render_markdown @search.long_description %>
+  </div>
+<% end %>
+
+<%= render 'sort_and_per_page' %>
+<% if @search.search_box? %>
+  <%= render partial: 'search_box', locals: {search: @search} %>
+<% end %>
+<% if @search.default_index_view_type && params[:view].blank? %>
+  <%= render_document_index_with_view(@search.default_index_view_type, @document_list) %>
+<% else %>
+  <%= render_document_index(@document_list) %>
+<% end %>
+<%= render 'results_pagination' %>

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

@@ -18,7 +18,7 @@
   <% end %>
   <div class="form-actions">
     <div class="primary-actions">
-      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]), class: 'btn btn-link' %>
+      <%= cancel_link document, spotlight.polymorphic_path([current_exhibit, document]) %>
       <%= f.submit nil, class: 'btn btn-primary' %>
       </div>
   </div>

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

@@ -6,8 +6,8 @@
   <%= render_document_partial document, 'admin_index_header', document_counter: document_counter %>
 
   <div class="page-links">
-  <%= view_link document, url_for_document(document), class: 'btn btn-link' %> &middot;
-  <%= exhibit_edit_link document, [:edit, current_exhibit, document], class: 'btn btn-link' %>
+  <%= view_link document, url_for_document(document) %> &middot;
+  <%= exhibit_edit_link document, [:edit, current_exhibit, document] %>
   </div>
 </td>
 

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

@@ -25,7 +25,7 @@
   <% end %>
 
   <div class="form-group primary-actions">
-    <%= cancel_link @contact, exhibit_about_pages_path(@contact.exhibit), class: "btn btn-link" %>
+    <%= cancel_link @contact, exhibit_about_pages_path(@contact.exhibit) %>
     <%= f.submit nil, class: 'btn btn-primary' %>
   </div>
 <% end %>