arclight 0.2.0 → 0.3.0

data/app/views/arclight/_requests.html.erb

@@ -0,0 +1,7 @@
+<% if item_requestable?('', { document: document }) %>
+  <div class='mr-4 al-show-actions-box-request flex-md-fill'>
+    <% document.repository_config.available_request_types.each do |request_type| %>
+      <%= render partial: "arclight/requests/#{request_type}", locals: { document: document } %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -8,7 +8,7 @@
 </div>
 <div class='al-in-person-repository-location'>
   <address>
-    <% %i[building address1 address2 city_state_zip_country phone contact_info].each do |f| %>
+    <% %i[building address1 address2 city_state_zip_country].each do |f| %>
       <% if repository.send(f).present? %>
         <div class='al-repository-contact-<%= f %>'>
           <%= repository.send(f) %>

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

@@ -6,9 +6,9 @@
       </div>
 
       <div class="col-sm-12 col-lg-10 al-repository-information">
-        <h2>
+        <%= content_tag(params[:id] == repository.slug ? :h1 : :h2, class: 'h5 repo-name') do %>
           <%= link_to_unless(params[:id] == repository.slug, repository.name, arclight_engine.repository_path(repository.slug)) %>
-        </h2>
+        <% end %>
         <div class='row no-gutters justify-content-md-center'>
           <div class='col-4 col-md-3 al-repository-contact'>
             <address>

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

@@ -0,0 +1,9 @@
+<div class='al-in-person-repository-contact'>
+  <% %i[phone contact_info].each do |f| %>
+    <% if repository.send(f).present? %>
+      <div class='al-repository-contact-<%= f %>'>
+        <%= repository.send(f) %>
+      </div>
+    <% end %>
+  <% end %>
+</div>

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

@@ -1,4 +1,7 @@
+<h1 class="sr-only"><%= t('arclight.repositories') %></h1>
+
 <div class="al-repositories">
+  <% @page_title = t('arclight.views.repositories.title') %>
   <%= render 'shared/breadcrumbs' %>
   <%= render @repositories %>
 </div>

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

@@ -1,10 +1,11 @@
+<% @page_title = t(:'arclight.views.repositories.show', name: @repository.name) %>
 <%= render 'shared/breadcrumbs' %>
 <%= render @repository %>
 <div class="row al-repository-show-header">
   <div class="col col-md-8 col-lg-9">
-    <h3>
+    <h2 class="h4">
       <%= t('arclight.views.show.our_collections') %>
-    </h3>
+    </h2>
   </div>
   <div class="col text-right">
     <span class="al-repository-collections">
@@ -19,8 +20,8 @@
       <div class='al-document-title-bar'>
         <div class='row'>
           <div class='col-md-10 col-lg-9'>
-            <h5><%= link_to document.normalized_title, solr_document_path(document.id) %></h5>
-            <%= content_tag('div', class: 'al-document-abstract-or-scope', title: document.abstract_or_scope) do %>
+            <h3 class="h5"><%= link_to document.normalized_title, solr_document_path(document.id) %></h3>
+            <%= 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/arclight/requests/_aeon_external_request_endpoint.html.erb

@@ -0,0 +1,9 @@
+<% document ||= @document %>
+<% aeon_external_request ||= Arclight::Requests::AeonExternalRequest.new(document, show_presenter(document)) %>
+
+<%= form_tag aeon_external_request.url, method: :post, class: 'al-request-form' do |f| %>
+  <%= render_hash_as_hidden_fields(aeon_external_request.form_mapping) %>
+  <button type='submit' class='al-request-button btn-link'>
+    <%= t('arclight.request.container') %>
+  </button>
+<% end %>

data/app/views/arclight/requests/_aeon_web_ead.html.erb

@@ -0,0 +1,7 @@
+<% document ||= @document %>
+<% if parsed_files = ead_files(document) %>
+  <% aeon_web_ead ||= Arclight::Requests::AeonWebEad.new(document, parsed_files.href) %>
+  <% aeon_web_ead_url = aeon_web_ead.try(:url) %>
+
+  <%= link_to 'Request', aeon_web_ead_url, class: 'btn btn-secondary btn-sm' %>
+<% end %>

data/app/views/arclight/requests/_google_form.html.erb

@@ -5,7 +5,8 @@
   <% google_form.form_mapping.each do |key, value| %>
     <%= hidden_field_tag value, google_form.send(key) %>
   <% end %>
-  <button type='submit' class='al-request-button btn-link'>
+  <!-- Note: previous button class was 'al-request-button btn-link' -->
+  <button type='submit' class='btn btn-secondary btn-sm'>
     <%= t('arclight.request.container') %>
   </button>
 <% end %>

data/app/views/arclight/viewers/_oembed.html.erb

@@ -1,6 +1,7 @@
+<% parents = Arclight::Parents.from_solr_document(viewer.document).as_parents %>
 <% viewer.resources.each do |resource| %>
   <%= content_tag(:div, viewer.attributes_for(resource)) do %>
-    <div class='al-digital-object'>
+    <div class="al-digital-object media breadcrumb-item breadcrumb-item-<%= parents.length + 6 %>"> 
       <%= link_to(resource.label, resource.href) %>
     </div>
   <% end %>

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

@@ -0,0 +1,15 @@
+<% doc_presenter = show_presenter(document).with_field_group(field_accessor) %>
+<div class="container">
+  <dl class="row dl-invert">
+    <% 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-2">
+          <%= generic_render_document_field_label(field_accessor, document, field: field_name).upcase %>
+        </dt>
+        <dd class="blacklight-<%= field_name.parameterize %> col-md-10">
+          <%= doc_presenter.field_value field %>
+        </dd>
+      <% end %>
+    <% end %>
+  </dl>
+</div>

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

@@ -0,0 +1,5 @@
+<%= content_tag('div', class: 'al-document-abstract-or-scope') do %>
+  <%= content_tag('div', data: { 'arclight-truncate': true, 'truncate-more': I18n.t('arclight.truncation.view_more'), 'truncate-less': I18n.t('arclight.truncation.view_less') } ) do %>
+    <%= content_tag(:span, I18n.t('arclight.hierarchy.scope_note')) %><%= document.abstract_or_scope %>
+  <% end %>
+<% end if document.abstract_or_scope %>

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

@@ -0,0 +1,38 @@
+<% if current_or_guest_user %>
+  <%-
+  # Note these two forms are pretty similar but for different :methods, classes, and labels.
+  # but it was simpler to leave them seperate instead of DRYing them, got confusing trying that.
+  # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
+  -%>
+  <% unless bookmarked? document %>
+    <%= form_tag(bookmark_path(document),
+                 method: :put,
+                 class: 'bookmark-toggle col-auto',
+                 data: {
+                   'doc-id' => document.id,
+                   present: "#{blacklight_icon(:bookmark)}<span class=\"sr-only\">#{t('blacklight.search.bookmarks.present')}",
+                   absent: "#{blacklight_icon(:bookmark)}<span class=\"sr-only\">#{t('blacklight.search.bookmarks.absent')}",
+                   inprogress: t('blacklight.search.bookmarks.inprogress')
+                }) do %>
+      <%= submit_tag(t('blacklight.bookmarks.add.button'),
+                     id: "bookmark_toggle_#{document.id.to_s.parameterize}",
+                     class: "bookmark-add btn btn-outline-secondary") %>
+    <% end %>
+  <% else %>
+    <%= form_tag(bookmark_path(document),
+                 method: :delete,
+                 class: "bookmark-toggle col-auto",
+                 data: {
+                   'doc-id' => document.id,
+                   present: "#{blacklight_icon(:bookmark)}<span class=\"sr-only\">#{t('blacklight.search.bookmarks.present')}",
+                   absent: "#{blacklight_icon(:bookmark)}<span class=\"sr-only\">#{t('blacklight.search.bookmarks.absent')}",
+                   inprogress: t('blacklight.search.bookmarks.inprogress')
+                }) do %>
+      <%= submit_tag(t('blacklight.bookmarks.remove.button'),
+                     id: "bookmark_toggle_#{document.id.to_s.parameterize}",
+                     class: "bookmark-remove btn btn-outline-secondary") %>
+    <% end %>
+  <% end %>
+<% else %>
+  &nbsp;
+<% end %>

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

@@ -0,0 +1 @@
+<%= blacklight_icon document_or_parent_icon(document) %>

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

@@ -1,15 +1,22 @@
-<div class="row">
-  <div class="col-5">
-    <% counter = document_counter_with_offset(document_counter) %>
-    <%= link_to_document document, document_show_link_field(document), counter: counter %>
+<div class="documentHeader row">
+  <div class="col-auto">
+    <%= blacklight_icon document_or_parent_icon(document) %>
   </div>
-  <div class="col-5">
-    <%= render_document_partial(document, :index_breadcrumb) %>
-    <div class='al-repository-footer'>
-      <%= document.repository %>
+  <div class="col col-no-left-padding col-no-right-padding">
+    <div class="d-flex justify-content-between">
+      <h3 class="col col-no-left-padding">
+        <%= link_to_document document, document_show_link_field(document), counter: document_counter %>
+      </h3>
+      <%= render_index_doc_actions document %>
+    </div>
+    <div class="row">
+      <%= content_tag('div', class: 'al-document-highlight col') do %>
+        <%= document.highlights.join('<br/>').html_safe %>
+      <% end if document.highlights %>
+    </div>
+    <div class='breadcrumb-links media'>
+      <span class="media-body" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span>
+    <span class="col ml-2 pl-0" ><%= regular_compact_breadcrumbs(document) %></span>
     </div>
-  </div>
-  <div class="col-2">
-    <%= render_document_partial(document, :arclight_online_content_indicator) %>
   </div>
 </div>

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

@@ -0,0 +1,45 @@
+<div class="al-search-result-index-article row d-flex align-items-start">
+  <% counter = document_counter_with_offset(document_counter) %>
+  <div class="col-auto">
+    <%= render partial: 'arclight_document_header_icon', locals: { document: document }  %>
+  </div>
+
+  <div class="col col-no-left-padding d-flex flex-wrap">
+    <div class="documentHeader my-w-75 w-md-100 order-0" data-document-id="<%= document.id %>">
+      <h3 class="index_title document-title-heading">
+        <%= link_to_document document, document_show_link_field(document), counter: counter %>
+        <%= content_tag('span', class: 'al-document-extent badge') do %>
+          <%= document.extent %>
+        <% end if document.extent %>
+      </h3>
+    </div>
+
+    <div class="my-w-25 w-md-100 order-12 order-md-1">
+      <%= render_index_doc_actions document, wrapping_class: 'd-flex justify-content-end' %>
+    </div>
+
+    <div class="order-2">
+      <div class="row">
+        <%= content_tag('div', class: 'al-document-highlight col') do %>
+          <%= document.highlights.join('<br/>').html_safe %>
+        <% end if document.highlights %>
+      </div>
+
+      <div class="row">
+        <%= content_tag('div', class: 'al-document-creator col') do %>
+          <%= document.creator %>
+        <% end if document.creator %>
+      </div>
+
+      <div class="row">
+        <%= content_tag('div', class: 'al-document-abstract-or-scope col') do %>
+          <%= content_tag('div', 'data-arclight-truncate' => true) do %>
+            <%= document.abstract_or_scope %>
+          <% end %>
+        <% end if document.abstract_or_scope %>
+      </div>
+
+      <%= render partial: 'index_breadcrumb_default', locals: { document: document } %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,19 @@
+<article class="document">
+  <% breadcrumbs = component_top_level_parent_to_links(document) %>
+  <div class="documentHeader row">
+    <div class="col-auto">
+      <%= blacklight_icon document_or_parent_icon(document) %>
+    </div>
+    <div class="col col-no-left-padding">
+      <h4>
+        <%= link_to_document document, document_show_link_field(document), counter: document_counter %>
+      </h4>
+      <div class='breadcrumb-links media'>
+        <% unless breadcrumbs.nil? %>
+          <span class="media-body" aria-hidden="true"><%= blacklight_icon :folder, classes: 'al-folder-icon' %></span>
+          <span class="col" ><%= component_top_level_parent_to_links(document) %></span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</article>

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

@@ -0,0 +1,18 @@
+<article class="document">
+  <% breadcrumbs = parents_to_links(document) %>
+  <div class="documentHeader row">
+    <div class="col-auto">
+      <%= blacklight_icon document_or_parent_icon(document) %>
+    </div>
+    <div class="col col-no-left-padding">
+      <h4>
+        <%= link_to_document document, document_show_link_field(document), counter: document_counter %>
+      </h4>
+      <div class='breadcrumb-links media'>
+        <% unless breadcrumbs.nil? %>
+          <span class="media-body" aria-hidden="true"><%= blacklight_icon :folder, classes: 'al-folder-icon' %></span>
+          <span class="col" ><%= parents_to_links(document) %></span>
+        <% end %>
+    </div>
+  </div>
+</article>

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

@@ -1,5 +1,3 @@
 <% if document.online_content? %>
-  <span class='badge badge-success'>
-    <%= t(:'arclight.views.online_content_indicator') %>
-  </span>
+  <%= blacklight_icon :online, classes: 'al-online-content-icon' %>
 <% end %>

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

@@ -1,12 +1,4 @@
 <% document ||= @document %>
 
-<h2 class="sr-only">Collection inventory</h2>
-<%= content_tag(
-  :div, '',
-  class: 'al-contents',
-  data: {
-    arclight: {
-      hierarchy: true, level: 1, path: search_catalog_path, name: document.collection_name
-    }
-  }
-) %>
+<h2 class="sr-only" data-sr-enable-me='true' data-has-contents=<%= t 'arclight.views.show.has_content' %>></h2>
+<%= generic_context_navigation(document) %>

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

@@ -0,0 +1,15 @@
+<div class="row">
+  <div class="col-md-3 order-md-2">
+    <%= render partial: 'collection_context_nav' %>
+  </div>
+
+  <div class="col-md-9 order-md-1">
+    <h2 class="sr-only"><%= t 'arclight.views.show.context' %></h2>
+    <% unless blacklight_config.show.metadata_partials.nil? %>
+      <% blacklight_config.show.metadata_partials.each do |metadata| %>
+        <% next unless fields_have_content?(@document, metadata) %>
+        <%= render partial: 'custom_metadata', locals: { document: @document, field_accessor: metadata } %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<nav class='al-sidebar-navigation-context al-sticky-sidebar' aria-label='<%= t('arclight.views.show.context_nav.title') %>'>
+  <ul class='nav nav-pills flex-sm-row flex-md-column text-sm-left text-md-right'>
+    <% unless blacklight_config.show.metadata_partials.nil? %>
+      <% blacklight_config.show.metadata_partials.each do |item| %>
+        <% next unless fields_have_content?(@document, item) %>
+        <li class='nav-item'>
+          <%= link_to t("arclight.views.show.sections.#{item}"), "##{t("arclight.views.show.sections.#{item}").parameterize}", class: 'nav-link' %>
+        </li>
+      <% end %>
+    <% end %>
+  </ul>
+</nav>

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

@@ -1,6 +1,6 @@
-<% if document.digital_objects.present? %>
-  <%= render_document_partial(document, 'arclight_viewer') %>
-<% elsif document.online_content? %>
+<h2 class="sr-only"><%= t 'arclight.views.show.online_content' %></h2>
+
+<% if document.online_content? %>
   <%= content_tag(
     :div, '',
     class: 'al-contents',

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

@@ -0,0 +1,5 @@
+<h2 class="sr-only"><%= t 'arclight.views.show.context' %></h2>
+<!-- Section below will be moved into its own partial later -->
+<%= content_tag(:div, id: t("arclight.views.show.sections.collection_context_field").parameterize) do %>
+  <%= generic_context_navigation(@document) %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<%= content_tag('div', class: 'al-document-container col col-no-left-padding text-muted') do %>
+  <%= document.containers.join(', ') %>
+<% end if document.containers.present? && !online_contents_context? %>

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

@@ -1,6 +1,6 @@
-<% unless blacklight_config.show.context_sidebar_items.nil? %>
+<% unless blacklight_config.show.context_access_tab_items.nil? %>
   <div id="accordion" role="tablist" aria-multiselectable="true">
-    <% items = blacklight_config.show.context_sidebar_items.select { |i|  fields_have_content?(@document, i) }  %>
+    <% items = blacklight_config.show.context_access_tab_items.select { |i|  fields_have_content?(@document, i) }  %>
     <% items.each_with_index do |item, index| %>
       <%= render partial: 'context_card', locals: { document: @document, field_accessor: item, card_index: index} %>
     <% end %>

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

@@ -0,0 +1,14 @@
+<% if document_downloads.files.present? %>
+  <div class=" al-show-actions-box-downloads-container">
+    <% document_downloads.files.each do |file| %>
+      <div class="al-show-actions-box-downloads media">
+        <%= blacklight_icon(file.type, classes: "al-show-actions-box-downloads-file") %>
+        <% if file.size %>
+          <%= link_to(t("arclight.views.show.download_with_size.#{file.type}", size: file.size), file.href, class: "media-body") %>
+        <% else %>
+          <%= link_to(t("arclight.views.show.download.#{file.type}"), file.href, class: "media-body") %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,21 @@
+<% # container for all groups in index view -%>
+<div class='al-grouped-results'>
+  <% @response.groups.each do |g| %>
+    <% parent_document = g.docs.first.parent_document %>
+    <%= render_document_partial(parent_document, :group_header) %>
+    <div class="grouped-documents">
+      <div class="al-grouped-more">
+        <% if g.total > 3 %>
+          <%= t('arclight.views.index.top_group_results', count: 3) %>
+          <%= link_to(
+            t('arclight.views.index.all_group_results', count: g.total),
+            search_catalog_path(search_within_collection(parent_document.collection_name, search_without_group)))
+          %>
+        <% else %>
+          <%= t('arclight.views.index.group_results_count', count: g.total) %>
+        <% end %>
+      </div>
+      <%= render_grouped_documents(g.docs) %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,15 @@
+<div class='al-grouped-title-bar'>
+  <div class='row'>
+    <div class='col-md-12'>
+      <% if document.repository_config.present? %>
+        <div class='al-grouped-repository breadcrumb-links'>
+          <%= link_to(document.repository_config.name, arclight_engine.repository_path(document.repository_config.slug)) %>
+        </div>
+      <% end %>
+      <h3><%= link_to_document document, document_show_link_field(document) %></h3>
+      <%= content_tag('span', class: 'al-document-extent badge') do %>
+        <%= document.extent %>
+      <% end if document.extent %>
+    </div>
+  </div>
+</div>