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

data/app/serializers/spotlight/exhibit_export_serializer.rb

@@ -11,7 +11,7 @@ module Spotlight
   class ConfigurationRepresenter < Roar::Decorator
     include Roar::JSON
 
-    (Spotlight::BlacklightConfiguration.attribute_names - %w(id exhibit_id)).each do |prop|
+    (Spotlight::BlacklightConfiguration.attribute_names - %w[id exhibit_id]).each do |prop|
       property prop
     end
 
@@ -36,7 +36,7 @@ module Spotlight
 
     include Roar::JSON
 
-    (Spotlight::Exhibit.attribute_names - %w(id slug masthead_id thumbnail_id)).each do |prop|
+    (Spotlight::Exhibit.attribute_names - %w[id slug masthead_id thumbnail_id]).each do |prop|
       property prop, if: config?(:config)
     end
 
@@ -46,7 +46,7 @@ module Spotlight
 
     collection :main_navigations, class: Spotlight::MainNavigation, decorator: MainNavigationRepresenter, if: config?(:config)
     collection :contact_emails, class: Spotlight::ContactEmail, if: config?(:config) do
-      (Spotlight::ContactEmail.attribute_names - %w(id exhibit_id confirmation_token)).each do |prop|
+      (Spotlight::ContactEmail.attribute_names - %w[id exhibit_id confirmation_token]).each do |prop|
         property prop
       end
     end
@@ -54,7 +54,7 @@ module Spotlight
     collection :searches, populator: ->(fragment, options) { options[:represented].searches.find_or_initialize_by(slug: fragment['slug']) },
                           if: config?(:pages),
                           class: Spotlight::Search do
-      (Spotlight::Search.attribute_names - %w(id scope exhibit_id masthead_id thumbnail_id)).each do |prop|
+      (Spotlight::Search.attribute_names - %w[id scope exhibit_id masthead_id thumbnail_id]).each do |prop|
         property prop
       end
 
@@ -86,7 +86,7 @@ module Spotlight
     collection :contacts, populator: ->(fragment, options) { options[:represented].contacts.find_or_initialize_by(slug: fragment['slug']) },
                           class: Spotlight::Contact,
                           if: config?(:pages) do
-      (Spotlight::Contact.attribute_names - %w(id exhibit_id)).each do |prop|
+      (Spotlight::Contact.attribute_names - %w[id exhibit_id]).each do |prop|
         property prop
       end
 
@@ -102,14 +102,14 @@ module Spotlight
     collection :custom_fields, populator: ->(fragment, options) { options[:represented].custom_fields.find_or_initialize_by(slug: fragment['slug']) },
                                class: Spotlight::CustomField,
                                if: config?(:blacklight_configuration) do
-      (Spotlight::CustomField.attribute_names - %w(id exhibit_id)).each do |prop|
+      (Spotlight::CustomField.attribute_names - %w[id exhibit_id]).each do |prop|
         property prop
       end
     end
 
     collection :solr_document_sidecars, class: Spotlight::SolrDocumentSidecar,
                                         if: config?(:resources) do
-      (Spotlight::SolrDocumentSidecar.attribute_names - %w(id document_type exhibit_id)).each do |prop|
+      (Spotlight::SolrDocumentSidecar.attribute_names - %w[id document_type exhibit_id]).each do |prop|
         property prop
       end
 
@@ -139,7 +139,7 @@ module Spotlight
     end
 
     collection :attachments, class: Spotlight::Attachment, if: config?(:attachments) do
-      (Spotlight::Attachment.attribute_names - %w(id exhibit_id file)).each do |prop|
+      (Spotlight::Attachment.attribute_names - %w[id exhibit_id file]).each do |prop|
         property prop
       end
 
@@ -160,7 +160,7 @@ module Spotlight
 
     collection :resources, class: ->(options) { options[:fragment].key?('type') ? options[:fragment]['type'].constantize : Spotlight::Resource },
                            if: config?(:resources) do
-      (Spotlight::Resource.attribute_names - %w(id upload_id exhibit_id)).each do |prop|
+      (Spotlight::Resource.attribute_names - %w[id upload_id exhibit_id]).each do |prop|
         property prop
       end
 
@@ -182,7 +182,7 @@ module Spotlight
     collection :languages, class: Spotlight::Language,
                            populator: ->(fragment, options) { options[:represented].languages.find_or_initialize_by(locale: fragment['locale']) },
                            if: config?(:config) do
-      (Spotlight::Language.attribute_names - %w(id exhibit_id)).each do |prop|
+      (Spotlight::Language.attribute_names - %w[id exhibit_id]).each do |prop|
         property prop
       end
     end

data/app/serializers/spotlight/featured_image_representer.rb

@@ -7,7 +7,7 @@ module Spotlight
   # Serialize mastheads and thumbnails
   class FeaturedImageRepresenter < Roar::Decorator
     include Roar::JSON
-    (Spotlight::FeaturedImage.attribute_names - %w(id image)).each do |prop|
+    (Spotlight::FeaturedImage.attribute_names - %w[id image]).each do |prop|
       property prop
     end
 

data/app/serializers/spotlight/main_navigation_representer.rb

@@ -6,7 +6,7 @@ module Spotlight
   class MainNavigationRepresenter < Roar::Decorator
     include Roar::JSON
 
-    (Spotlight::MainNavigation.attribute_names - %w(id exhibit_id)).each do |prop|
+    (Spotlight::MainNavigation.attribute_names - %w[id exhibit_id]).each do |prop|
       property prop
     end
   end

data/app/serializers/spotlight/page_representer.rb

@@ -7,7 +7,7 @@ module Spotlight
   # Serialize an exhibit page
   class PageRepresenter < Roar::Decorator
     include Roar::JSON
-    (Spotlight::Page.attribute_names - %w(id scope exhibit_id parent_page_id content thumbnail_id)).each do |prop|
+    (Spotlight::Page.attribute_names - %w[id scope exhibit_id parent_page_id content thumbnail_id]).each do |prop|
       property prop
     end
 

data/app/uploaders/spotlight/attachment_uploader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Spotlight

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

@@ -1,6 +1,6 @@
 <%# looks suspiciously similar to blacklight's _thumbnail, but skips all the search context + linking -%>
-<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, {}, :suppress_link => true) %>
-<div class="thumbnail">
+<%- if has_thumbnail?(document) && tn = render_thumbnail_tag(document, { alt: '' }, :suppress_link => true) %>
+<div class="img-thumbnail">
   <%= tn %>
-</div>  
+</div>
 <%- end %>

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

@@ -15,8 +15,8 @@
         <%= select_tag :id, options_for_select(current_exhibit.searches.map { |s| [s.title, s.id] }), include_blank: true, class: 'form-control' %>
         <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:qt, :page, :utf8)) %>
       </div>
-      <div class="modal-footer">
-        <%= f.submit nil, class: 'btn btn-primary float-right' %>
+      <div class="modal-footer d-flex flex-row-reverse justify-content-start">
+        <%= f.submit nil, class: 'btn btn-primary' %>
         <button type="button" class="btn btn-link" data-dismiss="modal"><%= t :cancel %></button>
       </div>
     </div>

data/app/views/layouts/spotlight/spotlight.html.erb

@@ -1,10 +1,10 @@
 <% content_for(:content) do %>
   <% if content_for? :sidebar %>
-    <section id="content" class="<%= main_content_classes %> order-last">
+    <section id="content" class="<%= main_content_classes %> <%= content_for(:content_position) || 'order-last' %>" aria-label="<%= t('blacklight.search.search_results') %>">
       <%= yield %>
     </section>
 
-    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) || 'order-first' %>">
+    <aside id="sidebar" class="<%= sidebar_classes %> <%= content_for(:sidebar_position) || 'order-first' %>" aria-label="<%= t('blacklight.search.documents.aria.limit_search') %>">
       <%= content_for(:sidebar) %>
     </aside>
   <% else %>

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

@@ -1,4 +1,4 @@
-<div class="container breadcrumbs-container">
+<div class="container breadcrumbs-container" role="navigation" aria-label="<%= t('spotlight.breadcrumb.label') %>">
   <div class="row">
     <div class="col-md-12">
       <%= render_breadcrumbs builder: Spotlight::BootstrapBreadcrumbsBuilder %>

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

@@ -1,5 +1,5 @@
-<div id="exhibit-navbar" class="exhibit-navbar navbar navbar-light navbar-expand-md" role="navigation">
-  <div class="container">
+<div id="exhibit-navbar" class="exhibit-navbar navbar navbar-light navbar-expand-md" role="navigation" aria-label="<%= t('spotlight.exhibitnavbar.label') %>">
+  <div class="container flex-column flex-md-row">
     <% if resource_masthead? %>
       <%= link_to(current_exhibit.title, spotlight.exhibit_path(current_exhibit), class: 'navbar-brand') %>
     <% end %>
@@ -11,7 +11,7 @@
       <% end %>
     </ul>
     <% if should_render_spotlight_search_bar? %>
-      <div class="navbar-right navbar-nav">
+      <div class="navbar-right navbar-nav exhibit-search-form mt-3 mt-md-0">
         <%= render_search_bar %>
       </div>
     <% end %>

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

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
+<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation" aria-label="<%= t('spotlight.topbar.label') %>">
   <div class="<%= container_classes %>">
     <%= link_to application_name, main_app.root_path, class: 'mb-0 navbar-brand navbar-logo' %>
     <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="<%= t :toggle_nav %>">

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

@@ -4,7 +4,7 @@
   </div>
 <% end %>
 
-<div class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
+<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>" role="banner">
   <% if current_masthead %>
     <span class='background-container' style="background-image: url('<%= current_masthead.iiif_url %>')"></span>
     <span class='background-container-gradient'></span>
@@ -13,24 +13,21 @@
   <%= render 'shared/exhibit_navbar' if current_exhibit && resource_masthead? %>
 
   <div class="container site-title-container">
-    <div class="site-title h2">
-      <% if content_for? :masthead %>
+    <% if content_for? :masthead %>
+      <h1 class="site-title h2">
         <%= content_for :masthead %>
-      <% elsif current_exhibit %>
-        <%= current_exhibit.title %>
-        <% if current_exhibit.subtitle.present? %>
-          <small><%= current_exhibit.subtitle %></small>
-        <% end %>
-      <% else %>
-        <%= application_name %>
-        <% if current_site.subtitle.present? %>
-          <small><%= current_site.subtitle %></small>
-        <% end %>
+      </h1>
+    <% else %>
+      <h1 class="site-title h2">
+        <%= masthead_heading_content %>
+      </h1>
+      <% if masthead_subheading_content %>
+        <small><%= masthead_subheading_content %></small>
       <% end %>
-    </div>
+    <% end %>
   </div>
 
   <%= render 'shared/exhibit_navbar' if current_exhibit && !resource_masthead? %>
-</div>
+</header>
 
 <%= render 'shared/breadcrumbs' unless resource_masthead? %>

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

@@ -1,18 +1,18 @@
 <li class="dd-item dd3-item" data-id="<%= f.object.id %>" itemscope itemtype="http://schema.org/Person">
-  <div class="dd-handle dd3-handle"><%= t :drag %></div>
-  <div class="dd3-content card">
-    <div class="card-header page">
-      <%= f.check_box :show_in_sidebar, label: '' %>
-      <%= f.hidden_field :id %>
-      <%= f.hidden_field :weight, data: {property: "weight"} %>
-      <div class="main">
-        <div class="contact-links float-right">
-          <%= exhibit_edit_link f.object, :class => 'btn btn-link' %> &middot;
-          <%= exhibit_delete_link f.object, :class => 'btn btn-link' %>
-        </div>
+  <div class="card d-flex dd3-content">
+    <div class="dd-handle dd3-handle"><%= t :drag %></div>
+    <div class="card-body page d-flex">
+      <div class="flex-grow-1 d-flex">
+
+        <%= f.check_box :show_in_sidebar, hide_label: true, inline: true %>
+        <%= f.hidden_field :id %>
+        <%= 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>
     </div>
   </div>
-
 </li>

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

@@ -1,13 +1,17 @@
-<%= image_tag contact.avatar.iiif_url, class: 'contact-photo' if contact.avatar && contact.avatar.iiif_url.present? %>
-<div itemprop="name" class="name"><%= contact.name %></div>
-<% Spotlight::Contact.fields.each do |field, options| %>
-  <% if (value = contact.contact_info[field]).present? %>
-    <div itemprop="<%= options[:itemprop] || field %>">
-      <% if options[:helper] %>
-        <%= send(options[:helper], value) %>
-      <% else %>
-        <%= value %>
+<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 itemprop="name" class="name"><%= contact.name %></div>
+    <% Spotlight::Contact.fields.each do |field, options| %>
+      <% if (value = contact.contact_info[field]).present? %>
+        <div itemprop="<%= options[:itemprop] || field %>">
+          <% if options[:helper] %>
+            <%= send(options[:helper], value) %>
+          <% else %>
+            <%= value %>
+          <% end %>
+        </div>
       <% end %>
-    </div>
-  <% end %>
-<% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,4 +1,4 @@
-<h4 class='contacts-header'><%= t :'.header' %></h4>
+<h2 class='contacts-header nav-heading h4'><%= t :'.header' %></h2>
 <ol class="nav sidenav contacts flex-column">
   <% current_exhibit.contacts.published.each do |contact| %>
     <li itemscope itemtype="http://schema.org/Person">

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

@@ -1,6 +1,6 @@
 <%= bootstrap_form_for @exhibit, url: exhibit_contacts_path(@exhibit),
     style: :horizontal, html: {class: 'exhibit-contacts'} do |f| %>
-  <h3><%= t :".header" %></h3>
+  <h2 class="mt-4"><%= t :".header" %></h2>
   <p class="instructions"><%= t :'.instructions' %></p>
   <div class="panel-group dd contacts_admin" data-behavior="nestable" data-max-depth="1">
     <ol class="dd-list">
@@ -16,4 +16,4 @@
       <%= f.submit nil, class: 'btn btn-primary' %>
     </div>
   </div>
-<% end %>
+<% end %>

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

@@ -1,5 +1,5 @@
 <% cache_unless current_user, [current_exhibit, @page] do %>
-  <h4 class="nav-heading"><%= current_exhibit.main_navigations.about.label_or_default %></h4>
+  <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| %>
       <li class="nav-item <%= 'active' if current_page? [spotlight, current_exhibit, page] %>">

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

@@ -18,14 +18,14 @@
   <% end %>
   <div role="tabpanel">
     <ul class="nav nav-tabs" role="tablist">
-      <% if Spotlight::Engine.config.exhibit_themes.many? %>
+      <% if current_exhibit.themes.many? %>
         <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="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>
+        <a href="#site-masthead" aria-controls="site-masthead" role="tab" data-toggle="tab" class="nav-link <%= 'active' unless current_exhibit.themes.many? %>"><%= t(:'.site_masthead.heading') %></a>
       </li>
 
       <li role="presentation" class="nav-item">
@@ -37,11 +37,11 @@
       </li>
     </ul>
     <div class="tab-content">
-      <% if Spotlight::Engine.config.exhibit_themes.many? %>
+      <% if current_exhibit.themes.many? %>
       <div role="tabpanel" class="tab-pane active" id="site-theme">
         <p class="instructions"><%= t(:'.site_theme.help') %></p>
         <%= f.form_group :theme, label: { text: t(:'.site_theme.label') } do %>
-          <% Spotlight::Engine.config.exhibit_themes.each do |theme| %>
+          <% current_exhibit.themes.each do |theme| %>
             <div class="col-md-6">
               <%= image_tag "spotlight/themes/#{theme}_preview.png", width: 100, height: 100 %>
               <%= f.radio_button :theme, theme, label: t(:".site_theme.#{theme}", default: theme.to_s.titleize), inline: true %>
@@ -51,7 +51,7 @@
       </div>
       <% end %>
 
-      <div role="tabpanel" class="tab-pane <%= 'active' unless Spotlight::Engine.config.exhibit_themes.many? %>" id="site-masthead">
+      <div role="tabpanel" class="tab-pane <%= 'active' unless current_exhibit.themes.many? %>" id="site-masthead">
         <p class="instructions"><%= t(:'.site_masthead.help') %></p>
         <%= f.fields_for(:masthead, current_exhibit.masthead || current_exhibit.build_masthead) do |m| %>
           <%= render '/spotlight/featured_images/form', f: m, initial_crop_selection: Spotlight::Engine.config.masthead_initial_crop_selection, crop_type: :masthead %>
@@ -71,33 +71,29 @@
           <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 card">
-                        <div class="dd-handle dd3-handle"><%= t :drag %></div>
-                        <div class="card-body container" data-behavior="restore-default">
-                          <%= label.hidden_field :id %>
-                          <div class="row">
-                            <div class="col-sm-8">
-                              <div class="main">
-                                <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-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"} %>
-                        </div>
+                <li class="dd-item dd3-item" data-id="<%= label.object.id %>">
+                  <div class="card d-flex dd3-content">
+                    <div class="dd-handle dd3-handle"><%= t :drag %></div>
+                    <div class="card-body d-flex" data-behavior="restore-default">
+                      <%= label.hidden_field :id %>
+                      <div class="flex-grow-1 py-2">
+                        <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>
-                    </li>
+                      <div class="">
+                        <%= button_tag t(:'.restore_default'), data: {:"restore-default" => true}, class: "btn restore-default btn-secondary btn-sm float-right #{'d-none' if label.object.label.blank? || label.object.label == label.object.default_label}" %>
+                      </div>
+                      <%= label.hidden_field :weight, data: {property: "weight"} %>
+                    </div>
+                  </div>
+                </li>
               <% end %>
             </ol>
           </div>

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

@@ -2,7 +2,7 @@
   <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') %>
+        <%= image_tag(search.thumbnail_image_url || 'spotlight/default_browse_thumbnail.jpg', class: 'img-responsive', alt: '') %>
         <div class="text-overlay">
            <h2 class="browse-category-title">
              <%= search.title%>

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

@@ -1,5 +1,5 @@
 <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 %>
+  <%= form_tag exhibit_browse_path(current_exhibit, search), method: :get, class: 'browse-search-form search-query-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 row">
       <label class="col-sm-4 col-form-label h6" for="browse_q"><%= t(:'.label') %></label>
@@ -7,7 +7,7 @@
         <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 input-group-append">
-              <button class="btn btn-reset" type="reset">
+              <button class="btn btn-reset btn-sm" type="reset">
                 <span class="sr-only"><%= t(:'.reset') %></span>
                 <%= blacklight_icon('remove_circle_outline') %>
               </button>

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

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="sort-pagination clearfix">
+<div id="sortAndPerPage" class="sort-pagination clearfix" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label', default: 'Results navigation')%>">
   <div class="search-widgets float-md-right">
     <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
   </div>