arclight 0.1.4 → 0.2.0

data/app/assets/javascripts/arclight/arclight.js

@@ -3,6 +3,7 @@
 //= require arclight/collection_context
 //= require arclight/component_ancestors
 //= require arclight/oembed_viewer
+//= require arclight/search_results
 //= require arclight/truncator
 
 // Vendor Scripts

data/app/assets/javascripts/arclight/collection_navigation.js

@@ -9,13 +9,16 @@
     var $currentDoc;
     var $previousDocs;
     var $nextDocs;
-    var headers = $doc.find('article header[data-document-id="' + id + '"]')
-    if (headers.length == 0) {
+    var headers = $doc.find('article div[data-document-id="' + id + '"]');
+    if (headers.length === 0) {
       $.error('Document is missing id=' + id);
     }
     $currentDoc = $(headers[0].parentNode); // need article element
     $currentDoc.addClass('al-hierarchy-highlight');
 
+    // Unlink the current component - just show the title
+    $currentDoc.find('a').contents().unwrap();
+
     // We want to show 0-1 or 0-2 siblings depending on where highlighted component is
     $previousDocs = $currentDoc.prevUntil().slice(0, 2);
     $nextDocs = $currentDoc.nextUntil().slice(0, 2);

data/app/assets/javascripts/arclight/oembed_viewer.js

@@ -1,18 +1,24 @@
 Blacklight.onLoad(function () {
   'use strict';
+
   var onlineContentTabSelector = '[data-arclight-online-content-tab="true"]';
   var oEmbedViewerSelector = '[data-arclight-oembed="true"]';
 
-  $(onlineContentTabSelector).on('shown.bs.tab', function() {
+  $(onlineContentTabSelector).on('shown.bs.tab', function () {
     var $viewerElements = $(oEmbedViewerSelector);
-    if($viewerElements.length === 0) {
+    if ($viewerElements.length === 0) {
       return;
     }
 
     $viewerElements.each(function (i, element) {
       var $el = $(element);
+      var loadedAttr = $el.attr('loaded');
       var data = $el.data();
       var resourceUrl = data.arclightOembedUrl;
+      if (loadedAttr && loadedAttr === 'loaded') {
+        return;
+      }
+
       $.ajax({
         url: resourceUrl,
         dataType: 'html'
@@ -20,17 +26,18 @@ Blacklight.onLoad(function () {
         var links = $('<div>' + response.match(/<link .*>/g).join('') + '</div>'); // Parse out link elements so image assets are not loaded
         var oEmbedEndPoint = links.find('link[rel="alternate"][type="application/json+oembed"]').prop('href');
 
-        if(!oEmbedEndPoint || oEmbedEndPoint.length === 0) {
+        if (!oEmbedEndPoint || oEmbedEndPoint.length === 0) {
           return;
         }
 
         $.ajax({
           url: oEmbedEndPoint
         }).done(function (oEmbedResponse) {
-          if(oEmbedResponse.html) {
+          if (oEmbedResponse.html) {
             $el.hide()
                .html(oEmbedResponse.html)
                .fadeIn(500);
+            $el.attr('loaded', 'loaded');
           }
         });
       });

data/app/assets/javascripts/arclight/search_results.js

@@ -0,0 +1,15 @@
+Blacklight.onLoad(function () {
+  'use strict';
+
+  var histogramContent = $('#al-date-range-histogram-content');
+  var showSpan = $('#al-date-range-histogram-show');
+  var hideSpan = $('#al-date-range-histogram-hide');
+  histogramContent.on('show.bs.collapse', function () {
+    showSpan.attr('hidden', 'hidden');
+    hideSpan.removeAttr('hidden');
+  });
+  histogramContent.on('hide.bs.collapse', function () {
+    hideSpan.attr('hidden', 'hidden');
+    showSpan.removeAttr('hidden');
+  });
+});

data/app/assets/stylesheets/arclight/modules/hierarchy_and_online_contents.scss

@@ -54,7 +54,8 @@
   // Series level
   .blacklight-series .document-title-heading,
   .blacklight-file .document-title-heading,
-  .blacklight-otherlevel .document-title-heading {
+  .blacklight-binder .document-title-heading,
+  .blacklight-other .document-title-heading {
     font-size: $h5-font-size;
     font-weight: 400;
     margin-bottom: ($spacer / 2);
@@ -69,7 +70,8 @@
     // Additional for levels below series
     .blacklight-subseries .document-title-heading,
     .blacklight-file .document-title-heading,
-    .blacklight-otherlevel .document-title-heading {
+    .blacklight-binder .document-title-heading,
+    .blacklight-other .document-title-heading {
       font-size: $h6-font-size;
 
       .documentHeader {
@@ -80,7 +82,8 @@
     // Icongraphy for each level
     .blacklight-subseries .document-title-heading,
     .al-hierarchy-level-1 .blacklight-file .document-title-heading,
-    .al-hierarchy-level-1 .blacklight-otherlevel .document-title-heading {
+    .al-hierarchy-level-1 .blacklight-binder .document-title-heading,
+    .al-hierarchy-level-1 .blacklight-other .document-title-heading {
       padding-left: 10px;
 
       &:before {

data/app/assets/stylesheets/arclight/modules/layout.scss

@@ -4,6 +4,30 @@
   margin-bottom: $spacer;
 }
 
+.al-show-breadcrumb .breadcrumb {
+  background-color: transparent;
+  margin-bottom: 0;
+  padding: 0;
+}
+
+.al-show-breadcrumb h1 { font-size: 1.5rem; }
+
+.breadcrumb-item {
+  flex: 1 0 100%;
+
+  &.al-bc-item {
+    &::before {
+      content: '»' !important;
+    }
+  }
+}
+
+@for $i from 1 to 14 {
+  .breadcrumb-item.breadcrumb-item-#{$i} {
+    padding-left: ($i - 1) * 10px !important;
+  }
+}
+
 // Collapse arrow indicators
 .al-toggle-view-more,
 .al-toggle-view-all {

data/app/assets/stylesheets/arclight/modules/mastheads.scss

@@ -2,6 +2,12 @@
   border-bottom: $result-item-border-styling;
   padding: ($spacer * 2) $spacer $spacer;
 
+  .navbar-nav {
+    flex-direction: row;
+    font-weight: 700;
+    margin-bottom: ($spacer * 1);
+  }
+
   h1 {
     font-size: 2.25rem;
     margin-bottom: ($spacer * 2);
@@ -19,6 +25,18 @@
       font-weight: $font-weight-bold;
     }
   }
+
+  @media (max-width: 767px) {
+    .masthead-center {
+      text-align: center;
+    }
+    h2 {
+      display: inline-block;
+    }
+    .nav-links {
+      justify-content: center !important;
+    }
+  }
 }
 
 .al-masthead {
@@ -28,6 +46,15 @@
     padding: ($spacer * 1.5) ($spacer / 2);
   }
 
+  .navbar-nav {
+    flex-direction: row;
+    font-weight: 700;
+
+  .active a {
+      color: $gray-700;
+    }
+  }
+
   + .navbar-search {
     border-bottom: $result-item-border-styling;
     border-top: $result-item-border-styling;
@@ -51,6 +78,12 @@
     }
   }
 
+  @media (max-width: 767px) {
+    .nav-links {
+      justify-content: center !important;
+    }
+  }
+
   @media (max-width: 992px) {
     h1,
     + .navbar-search {

data/app/helpers/arclight_helper.rb

@@ -39,7 +39,7 @@ module ArclightHelper
   end
 
   def collection_count
-    facets_from_request.find { |f| f.name == 'collection_sim' }.try(:items).try(:count)
+    @response.response['numFound']
   end
 
   ##

data/app/models/concerns/arclight/search_behavior.rb

@@ -26,7 +26,7 @@ module Arclight
     ##
     # For the hierarchy view, set the sort order to preserve the order of components
     def add_hierarchy_sort(solr_params)
-      solr_params[:sort] = 'sort_ii asc' if blacklight_params[:view] == 'hierarchy'
+      solr_params[:sort] = 'sort_ii asc' if %w[hierarchy online_contents].include? blacklight_params[:view]
       solr_params
     end
 

data/app/views/arclight/repositories/_in_person_repository.html.erb

@@ -1,6 +1,6 @@
 <div class='al-in-person-repository-name'>
   <% if repository.thumbnail_url %>
-    <%= image_tag repository.thumbnail_url, alt: repository.name, class: 'img-fluid float-left' %>
+    <%= image_tag repository.thumbnail_url, alt: '', class: 'img-fluid float-left' %>
   <% end %>
   <div>
     <%= link_to(repository.name, arclight_engine.repository_path(repository.slug)) %>

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

@@ -0,0 +1,16 @@
+<% document ||= @document %>
+<% @sub_level ||= document.component_level + 1 %>
+
+
+<h2 class="sr-only">Component inventory</h2>
+<div class="component-level-only">
+  <%= content_tag(
+    :div, '',
+    class: 'al-contents',
+    data: {
+      arclight: {
+        hierarchy: true, level: @sub_level, path: search_catalog_path, name: document.collection_name, parent: document.reference
+      }
+    }
+  ) %>
+</div>

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

@@ -1,10 +1,4 @@
 <h2 class="sr-only">Component description</h2>
-<% unless blacklight_config.show.component_metadata_partials.nil? %>
-  <% blacklight_config.show.component_metadata_partials.each do |metadata| %>
-    <% next unless fields_have_content?(@document, metadata) %>
-    <%= render partial: 'custom_metadata', locals: { document: @document, field_accessor: metadata } %>
-  <% end %>
-<% end %>
 <!-- Section below will be moved into its own partial later -->
 <%= content_tag(:div, id: t("arclight.views.show.sections.collection_context_field").parameterize) do %>
   <h3 class='al-show-sub-heading'>

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

@@ -17,7 +17,7 @@
               <%= generic_render_document_field_label(field_accessor, document, field: field_name) %>
             </dt>
             <dd class="blacklight-<%= field_name.parameterize %>">
-              <%= doc_presenter.field_value field_name %>
+              <%= doc_presenter.field_value field %>
             </dd>
           <% end %>
         <% end %>

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

@@ -9,7 +9,7 @@
     <% generic_document_fields(field_accessor).each do |field_name, field| %>
       <% if generic_should_render_field?(field_accessor, document, field) %>
         <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= generic_render_document_field_label(field_accessor, document, field: field_name) %></dt>
-        <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field_name %></dd>
+        <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
       <% end %>
     <% end %>
   </dl>

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

@@ -6,7 +6,7 @@
   <%= document.extent %>
 <% end if document.extent %>
 
-<%= content_tag('div', class: 'al-document-abstract-or-scope', title: document.abstract_or_scope) do %>
+<%= content_tag('div', class: 'al-document-abstract-or-scope') do %>
   <%= content_tag('div', 'data-arclight-truncate' => true) do %>
     <%= document.abstract_or_scope %>
   <% end %>

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

@@ -1,7 +1,7 @@
 <%# header bar for doc items in index view -%>
-<header class="documentHeader row" data-document-id="<%= document.id %>">
+<div class="documentHeader row" data-document-id="<%= document.id %>">
   <h3 class="index_title document-title-heading col-md-12">
     <% counter = document_counter_with_offset(document_counter) %>
     <%= link_to_document document, document_show_link_field(document), counter: counter %>
   </h3>
-</header>
+</div>

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

@@ -1,4 +1,4 @@
-<header class="documentHeader row" data-document-id="<%= document.id %>">
+<div class="documentHeader row" data-document-id="<%= document.id %>">
   <% requestable = item_requestable?('', { document: document }) %>
   <h3 class="index_title document-title-heading col-md-8">
     <% if document.containers.present? %>
@@ -39,4 +39,4 @@
       <%= render partial: 'arclight/requests/google_form', locals: { document: document } %>
     <% end %>
   </div>
-</header>
+</div>

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

@@ -1,4 +1,4 @@
-<%= content_tag('div', class: 'al-document-abstract-or-scope', title: document.abstract_or_scope) do %>
+<%= content_tag('div', class: 'al-document-abstract-or-scope') do %>
   <%= content_tag(:h4, I18n.t('arclight.hierarchy.scope_and_contents'), class: 'al-hierarchy-sub-heading') %>
   <%= content_tag('div', 'data-arclight-truncate' => true) do %>
     <%= document.abstract_or_scope %>

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

@@ -4,7 +4,12 @@
       <%= render partial: 'arclight_rangelimit', locals: { field_name: :date_range_sim, solr_field: :date_range_sim } %>
     </div>
     <a class='float-right' data-toggle='collapse' href='#al-date-range-histogram-content' aria-expanded='false' aria-controls='al-date-range-histogram-content'>
-      <%= t('arclight.date_range_histogram.show_hide') %>
+      <span id="al-date-range-histogram-show">
+        <%= t('arclight.date_range_histogram.show') %>
+      </span>
+      <span id="al-date-range-histogram-hide" hidden="hidden">
+        <%= t('arclight.date_range_histogram.hide') %>
+      </span>
     </a>
   </div>
 </div>

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

@@ -1,7 +1,21 @@
+<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
 <div class='al-show-breadcrumb'>
-  <%= link_to t('arclight.routes.home'), root_path %>
-  <%= t('arclight.breadcrumb_separator') %>
-  <%= link_to t('arclight.routes.collections'), arclight_engine.collections_path %>
-  <%= t('arclight.breadcrumb_separator') %>
-  <%= safe_join([parents_to_links(document), document.normalized_title].reject(&:empty?), t('arclight.breadcrumb_separator'))  %>
+  <nav aria-label="breadcrumb">
+    <ol class="breadcrumb">
+      <li class="breadcrumb-item breadcrumb-item-1">
+        <%= link_to t('arclight.routes.home'), root_path %>
+      </li>
+      <li class="breadcrumb-item breadcrumb-item-2 al-bc-item">
+        <%= link_to t('arclight.routes.collections'), arclight_engine.collections_path %>
+      </li>
+      <% parents.each_with_index.map do |parent, index| %>
+        <%= content_tag :li, class: "breadcrumb-item breadcrumb-item-#{index + 3} al-bc-item" do %>
+          <%= link_to parent.label, solr_document_path(parent.global_id) %>
+        <% end %>
+      <% end %>
+    </ol>
+    <h1 class="breadcrumb-item breadcrumb-item-<%= parents.length + 3 %> al-bc-item">
+      <%= document.normalized_title %>
+    </h1>
+  </nav>
 </div>

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

@@ -9,6 +9,13 @@
           <%= t 'arclight.views.show.overview' %>
         </a>
       </li>
+      <% if document.children? %>
+        <li class='nav-item'>
+          <a class='nav-link disabled' data-toggle='pill' href='#contents' role='tab' data-hierarchy-enable-me='true'>
+            <%= t 'arclight.views.show.no_contents' %>
+          </a>
+        </li>
+      <% end %>
       <li class='nav-item'>
         <a class='nav-link <%= 'disabled' unless document.online_content? %>' data-toggle='pill' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
           <% if document.online_content? %>
@@ -23,6 +30,9 @@
       <div class='tab-pane active' id='overview' role='tabpanel'>
         <%= render 'component_overview' %>
       </div>
+      <div class='tab-pane' id='contents' role='tabpanel'>
+        <%= render 'component_contents' %>
+      </div>
       <div class='tab-pane' id='online-content' role='tabpanel'>
         <%= render_document_partial(document, 'arclight_viewer') %>
       </div>

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

@@ -1,13 +1,5 @@
 <div class='al-sticky-sidebar'>
   <h2 class="sr-only">Sidebar</h2>
-  <div class='card'>
-    <div class='card-header'>
-      <h3 class="mb-0">Search within this collection</h3>
-    </div>
-    <div class='card-body'>
-      <%= render 'search_within_form' %>
-    </div>
-  </div>
   <div class='al-sidebar-navigation-overview card'>
     <div class='card-header'>
       <h3 class="mb-0"><%= t('arclight.views.show.navigation_sidebar.title') %></h3>

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

@@ -0,0 +1 @@
+<% # intentionally left blank to not repeat collection level metadata that appears in the context overview %>

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

@@ -0,0 +1,14 @@
+<% if blacklight_config.show.component_metadata_partials.present? %>
+  <% parents = Arclight::Parents.from_solr_document(document).as_parents %>
+  <dl class="breadcrumb-item breadcrumb-item-<%= parents.length + 3 %>">
+    <% blacklight_config.show.component_metadata_partials.each do |metadata| %>
+      <% doc_presenter = show_presenter(document).with_field_group(metadata) %>
+      <% generic_document_fields(metadata).each do |field_name, field| %>
+        <% if generic_should_render_field?(metadata, document, field) %>
+          <dt class="blacklight-<%= field_name.parameterize %>"><%= generic_render_document_field_label(metadata, document, field: field_name) %></dt>
+          <dd class="blacklight-<%= field_name.parameterize %>"><%= doc_presenter.field_value field %></dd>
+        <% end %>
+      <% end %>
+    <% end %>
+  </dl>
+<% end %>

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

@@ -1,53 +1,65 @@
-<nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" role="navigation">
-  <div class="<%= container_classes %>">
-    <%= link_to application_name, root_path, class: "navbar-brand" %>
-    <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="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-
-    
+<header>
+  <nav class="navbar navbar-expand-md navbar-dark bg-dark topbar" aria-label="utilities" role="navigation">
+    <div class="<%= container_classes %>">
+      <%= link_to application_name, root_path, class: "navbar-brand" %>
+      <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="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
 
-    <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
-      <%= render 'shared/user_util_links' %>
+      <div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
+        <%= render 'shared/user_util_links' %>
+      </div>
     </div>
-  </div>
-</nav>
+  </nav>
 
-<% if controller_name == 'catalog' && !has_search_parameters? && action_name == 'index' %>
-  <div class='al-homepage-masthead jumbotron'>
-    <div class='d-flex justify-content-center'>
-      <h1 class='text-center'><%= t('arclight.masthead_heading') %></h1>
-    </div>
-    <div class='row justify-content-md-center'>
-      <div class='col-md-6 col-sm-12'>
-        <div class='navbar-search'>
-          <%= render_search_bar %>
+  <% if controller_name == 'catalog' && !has_search_parameters? && action_name == 'index' %>
+    <div class='al-homepage-masthead jumbotron'>
+      <div class="container">
+        <div class="row align-items-center">
+          <div class="col-md-8 masthead-center" >
+            <h1><%= t('arclight.masthead_heading') %></h1>
+          </div>
+
+          <div class="col-md-4 nav-links d-flex justify-content-end" >
+            <span class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </span>
+          </div>
+        </div>
+      </div>
+      <div class='row justify-content-md-center'>
+        <div class='col-md-6 col-sm-12'>
+          <div class='navbar-search'>
+            <%= render_search_bar %>
+          </div>
         </div>
       </div>
     </div>
-    <nav class="navbar justify-content-center" role="navigation">
-      <ul class="nav">
-        <%= render 'shared/main_menu_links' %>
-      </ul>
-    </nav>
-  </div>
-<% else %>
-  <div class='bg-faded al-masthead'>
-    <div class="container">
-      <h1><%= t('arclight.masthead_heading') %></h1>
+  <% else %>
+    <div class='bg-faded al-masthead'>
+      <div class="container">
+        <div class="row align-items-center">
+          <div class="col-md-8" >
+            <h1><%= t('arclight.masthead_heading') %></h1>
+          </div>
+
+          <div class="col-md-4 nav-links d-flex justify-content-end" >
+            <span class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </span>
+          </div>
+        </div>
+      </div>
     </div>
-  </div>
-  <div class="navbar-search navbar navbar-expand-sm bg-faded" role="navigation">
-    <div class="<%= container_classes %>">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
-          <%= render 'shared/main_menu_links' %>
-        </ul>
-        <%= render_search_bar  %>
+    <div class="navbar-search navbar navbar-expand-sm bg-faded">
+      <div class="<%= container_classes %>">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+          <%= render_search_bar  %>
+        </div>
       </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</header>