arclight 0.2.0 → 0.3.0

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

@@ -0,0 +1,20 @@
+<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 %>
+      <%= content_tag('div', class: 'al-document-abstract-or-scope') do %>
+        <%= content_tag('div', 'data-arclight-truncate' => true) do %>
+          <%= document.abstract_or_scope %>
+        <% end %>
+      <% end if document.abstract_or_scope %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,10 @@
+<div class="result-type-group mb-2 mb-lg-0 btn-group float-lg-left float-md-right" role="group" aria-label="<%= t('arclight.views.index.group_results') %>">
+  <%= link_to t('arclight.views.index.all_results'),
+              search_catalog_path(search_without_group),
+              class: "btn btn-outline-secondary #{'active' unless grouped?}"
+  %>
+  <%= link_to t('arclight.views.index.group_by_collection'),
+              search_catalog_path(search_with_group),
+              class: "btn btn-outline-secondary #{'active' if grouped?}"
+  %>
+</div>

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

@@ -1 +1 @@
-
+<% @page_title = t('arclight.views.home.title') %>

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

@@ -1,3 +1,6 @@
-<div class='breadcrumb-links'>
-  <%= parents_to_links(document) %>
+<div class="row">
+  <div class='breadcrumb-links media'>
+  	<span class="media-body ml-3" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span>
+    <span class="col ml-2 pl-0" ><%= parents_to_links(document) %></span>
+  </div>
 </div>

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

@@ -0,0 +1,53 @@
+<li id="<%= document.id %>" class="al-collection-context row d-flex align-items-start">
+  <div class="documentHeader row" data-document-id="<%= document.id %>">
+    <% requestable = item_requestable?('', { document: document }) %>
+    <% if document.children? %>
+      <div class="al-toggle-children-container">
+        <%= link_to(
+          blacklight_icon(:plus),
+          "##{document.id}-collapsible-hierarchy",
+          class: "al-toggle-view-children #{!show_expanded?(document) ? 'collapsed' : ''}",
+          'aria-label': t('arclight.hierarchy.view_all'),
+            data: {
+              toggle: 'collapse'
+            }
+          )
+        %>
+      </div>
+    <% end %>
+    <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="index_title document-title-heading my-w-75 w-md-100 order-0">
+        <% counter = document_counter_with_offset(document_counter) %>
+        <%= link_to_document document, document_show_link_field(document), counter: counter %>
+        <% if document.children? %>
+          <span class="badge badge-pill badge-secondary al-number-of-children-badge"><%= document.number_of_children %><span class="sr-only"><%= t(:'arclight.views.index.number_of_components', count: document.number_of_children) %></span></span>
+        <% end %>
+      </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-abstract-or-scope mb-0') 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 %>
+              <%= document.abstract_or_scope %>
+            <% end %>
+          <% end if document.abstract_or_scope %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <% if document.number_of_children > 0 %>
+    <%= content_tag(:div, id: "#{document.id}-collapsible-hierarchy",
+      class: "collapse al-collection-context-collapsible al-hierarchy-level-#{document.component_level} #{'show' if show_expanded?(document)}",
+      data: { resolved: false }
+    ) do %>
+      <%= generic_context_navigation(document, component_level: document.component_level + 1, original_parents: params[:original_parents]) %>
+    <% end %>
+  <% end %>
+</li>

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

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

data/app/views/catalog/_index_online_contents_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/_online_content_label.html.erb

@@ -0,0 +1,5 @@
+<% if document.online_content? %>
+  <div>
+    <%= blacklight_icon :online, classes: 'al-online-content-icon' %>
+  </div>
+<% end %>

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

@@ -0,0 +1,34 @@
+<%
+# Overridden from Blacklight to add a drop down that allows the user to choose to search w/i the collection or all collections
+%>
+<%= form_tag search_action_url, method: :get, class: 'search-query-form pr-0', role: 'search' do %>
+  <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8).merge(f: (search_state.params_for_search[:f] || {}).except(:collection_sim))) %>
+  <div class="d-md-flex">
+    <%= render 'catalog/within_collection_dropdown' %>
+
+    <% if search_fields.length > 1 %>
+      <label for="search_field" class="sr-only"><%= t('blacklight.search.form.search_field.label') %></label>
+    <% end %>
+    <div class="input-group flex-nowrap">
+      <% if search_fields.length > 1 %>
+          <%= select_tag(:search_field,
+                         options_for_select(search_fields, h(params[:search_field])),
+                         title: t('blacklight.search.form.search_field.title'),
+                         id: "search_field",
+                         class: "custom-select search-field") %>
+      <% elsif search_fields.length == 1 %>
+        <%= hidden_field_tag :search_field, search_fields.first.last %>
+      <% end %>
+
+      <label for="q" class="sr-only"><%= t('blacklight.search.form.search.label') %></label>
+      <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q rounded-0 form-control", id: "q", autofocus: presenter.autofocus?, data: { autocomplete_enabled: presenter.autocomplete_enabled?, autocomplete_path: search_action_path(action: :suggest) }  %>
+
+      <span class="input-group-append">
+        <button type="submit" class="btn btn-primary search-btn" id="search">
+          <span class="submit-search-text d-none d-lg-inline"><%= t('blacklight.search.form.submit') %></span>
+          <%= blacklight_icon :search, aria_hidden: true %>
+        </button>
+      </span>
+    </div>
+  </div>
+<% end %>

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

@@ -1,5 +1,3 @@
-<h2 class="sr-only top-content-title"><%= t('blacklight.search.search_results_header') %></h2>
-
 <% @page_title = t('blacklight.search.page_title.title', :constraints => render_search_to_page_title(params), :application_name => application_name) %>
 
 <% content_for(:head) do %>
@@ -9,10 +7,9 @@
 <% end %>
 
 <% content_for(:container_header) do %>
+  <h1 class="sr-only top-content-title"><%= search_results_header_text %></h1>
   <%= render 'shared/breadcrumbs' %>
   <%= render 'search_results_repository' %>
-  <%= render 'collection_count' %>
-  <%= render 'results_histogram' %>
   <%= render 'constraints' %>
 <% end %>
 

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

@@ -0,0 +1,27 @@
+<div class='al-show-actions-box'>
+  <div class="al-actions-box-container">
+    <% if document.unitid || document.containers.present? %>
+      <div class='al-collection-id'>
+        <% if document.unitid %>
+          <%= t(:'arclight.views.show.collection_id', id: document.unitid) %>
+        <% end %>
+
+        <% if document.unitid && document.containers.present? %>
+          <span> | </span>
+        <% end %>
+
+        <% if document.containers.present? %>
+          <span><%= document.containers.join(', ') %></span>
+        <% end %>
+      </div>
+    <% end %>
+    <div class='al-show-actions-box-options d-flex'>
+      <%= render partial: 'arclight/requests', locals: { document: document } %>
+      <div class='al-show-actions-box-bookmarks flex-md-fill'>
+        <%= render partial: 'catalog/bookmark_control', locals: { document: document } %>
+      </div>
+    </div>
+  </div>
+
+  <%= render document.downloads %>
+</div>

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

@@ -1,21 +1,6 @@
-<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
-<div class='al-show-breadcrumb'>
-  <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 class='d-md-flex justify-content-between al-show'>
+  <div class='al-show-breadcrumb'>
+    <%= render partial: 'shared/show_breadcrumbs', locals: {document: document} %>
+  </div>
+  <%= render_document_partial(document, :show_actions_box) %>
 </div>

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

@@ -1,48 +1,66 @@
+<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
 <div class='row'>
-  <div class='col-md-3'>
-    <%= render partial: 'show_sidebar' %>
-  </div>
-  <div class='col-md-9'>
+  <div class='col-md-12'>
+    <% if document.digital_objects.present? %>
+      <%= content_tag :p, class: "media breadcrumb-item breadcrumb-item-#{parents.length + 3}" do %>
+        <span class="media-body al-online-content-icon" aria-hidden="true"><%= blacklight_icon :online %></span>
+        <span class="col text-muted">
+          <%= t('arclight.views.show.online_content_upper') %>
+        </span>
+        <%= render_document_partial(document, 'arclight_viewer') %>
+      <% end %>
+    <% end %>    
     <div class='row'>
-      <div class='col-lg-9'>
-        <ul class='nav nav-pills' role='tablist'>
-          <li class='nav-item'>
-            <a class='nav-link active' data-toggle='pill' href='#overview' role='tab'>
+      <div class='col-lg-12'>
+        <ul class='nav nav-tabs nav-fill' role='tablist' aria-label='<%= t('arclight.views.show.tablist_nav') %>'>
+          <li class='nav-item flex-fill'>
+            <a class='nav-link p-1 p-sm-2 active' data-toggle='tab' href='#context' role='tab'>
               <%= t 'arclight.views.show.overview' %>
             </a>
           </li>
-          <li class='nav-item'>
-            <a class='nav-link disabled' data-toggle='pill' href='#contents' role='tab' data-hierarchy-enable-me='true'>
+          <li class='nav-item flex-fill'>
+            <a class='nav-link p-1 p-sm-2 disabled' data-toggle='tab' href='#contents' role='tab' data-hierarchy-enable-me='true'>
               <%= t 'arclight.views.show.no_contents' %>
             </a>
           </li>
-          <li class='nav-item'>
-            <a class='nav-link <%= 'disabled' unless document.digital_objects.present? || document.online_content? %>' data-toggle='pill' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
-              <% if document.digital_objects.present? || document.online_content? %>
+          <% if document.online_content? %>
+            <li class='nav-item flex-fill'>
+              <a class='nav-link p-1 p-sm-2' data-toggle='tab' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
                 <%= t 'arclight.views.show.online_content' %>
-              <% else %>
-                <%= t 'arclight.views.show.no_online_content' %>
-              <% end %>
+              </a>
+            </li>
+          <% end %>
+          <li class='nav-item flex-fill'>
+            <a class='nav-link p-1 p-sm-2' data-toggle='tab' href='#access' role='tab'>
+              <%= t 'arclight.views.show.access' %>
             </a>
           </li>
         </ul>
       </div>
-
-      <div class='col'>
-        <%= render partial: 'collection_downloads', locals: { downloads: collection_downloads(document) } %>
-      </div>
     </div>
 
     <div class='tab-content'>
-      <div class='tab-pane active' id='overview' role='tabpanel'>
-        <%= render 'collection_overview' %>
+      <div class='tab-pane active' id='context' role='tabpanel'>
+        <%= render 'collection_context' %>
       </div>
       <div class='tab-pane' id='contents' role='tabpanel'>
         <%= render 'collection_contents' %>
       </div>
-      <div class='tab-pane' id='online-content' role='tabpanel'>
-        <%= render partial: 'collection_online_contents', locals: { document: document }  %>
+      <% if document.online_content? %>
+        <div class='tab-pane' id='online-content' role='tabpanel'>
+          <%= render partial: 'collection_online_contents', locals: { document: document }  %>
+        </div>
+      <% end %>
+      <div class='tab-pane' id='access' role='tabpanel'>
+        <h2 class="sr-only"><%= t 'arclight.views.show.access' %></h2>
+        <% unless blacklight_config.show.context_access_tab_items.nil? %>
+          <% items = blacklight_config.show.context_access_tab_items.select { |i|  fields_have_content?(@document, i) }  %>
+          <% items.each_with_index do |item, index| %>
+            <%= render partial: 'access_contents', locals: { document: @document, field_accessor: item, card_index: index} %>
+          <% end %>
+        <% end %>
       </div>
     </div>
   </div>
+
 </div>

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

@@ -1,42 +1,70 @@
+<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
 <div class='row'>
-  <div class='col-md-3'>
-    <%= render partial: 'show_component_sidebar' %>
-  </div>
-  <div class='col-md-9'>
-    <ul class='nav nav-pills' role='tablist'>
-      <li class='nav-item'>
-        <a class='nav-link active' data-toggle='pill' href='#overview' role='tab'>
-          <%= 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>
+  <div class='col-md-12'>
+    <% if document.digital_objects.present? %>
+      <%= content_tag :p, class: "media breadcrumb-item breadcrumb-item-#{parents.length + 3}" do %>
+        <span class="media-body al-online-content-icon" aria-hidden="true"><%= blacklight_icon :online %></span>
+        <span class="col text-muted">
+          <%= t('arclight.views.show.online_content_upper') %>
+        </span>
+        <%= render_document_partial(document, 'arclight_viewer') %>
       <% 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? %>
-            <%= t 'arclight.views.show.online_content' %>
-          <% else %>
-            <%= t 'arclight.views.show.no_online_content' %>
+    <% end %>
+    <div class='row'>
+      <div class='col-md-12'>
+        <ul class='nav nav-tabs nav-fill' role='tablist' aria-label='<%= t('arclight.views.show.tablist_nav') %>'>
+          <li class='nav-item flex-fill'>
+            <a class='nav-link p-1 p-sm-2 active' data-toggle='tab' href='#context' role='tab'>
+              <%= t 'arclight.views.show.context' %>
+            </a>
+          </li>
+          <% if document.online_content? && document.children? %>
+            <li class='nav-item flex-fill'>
+              <a class='nav-link p-1 p-sm-2' data-toggle='tab' href='#online-content' role='tab' data-arclight-online-content-tab='true'>
+                <%= t 'arclight.views.show.online_content' %>
+                <span data-arclight-online-content-tab-count/>
+              </a>
+            </li>
           <% end %>
-        </a>
-      </li>
-    </ul>
-    <div class='tab-content'>
-      <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') %>
+          <li class='nav-item flex-fill'>
+            <a class='nav-link p-1 p-sm-2' data-toggle='tab' href='#access' role='tab'>
+              <%= t 'arclight.views.show.access' %>
+            </a>
+          </li>
+        </ul>
+        <div class='tab-content'>
+          <div class='tab-pane active' id='context' role='tabpanel'>
+            <%= render 'component_context' %>
+          </div>
+          <% if document.online_content? && document.children? %>
+            <div class='tab-pane' id='online-content' role='tabpanel'>
+              <%= content_tag(
+                :div, '',
+                class: 'al-contents',
+                data: {
+                  arclight: {
+                    path: search_catalog_path,
+                    name: document.collection_name,
+                    access: 'online',
+                    view: 'online_contents',
+                    parent: document.reference,
+                    search_field: 'within_collection'
+                  }
+                }
+              ) %>
+            </div>
+          <% end %>
+          <div class='tab-pane' id='access' role='tabpanel'>
+            <h2 class="sr-only"><%= t 'arclight.views.show.access' %></h2>
+            <% unless blacklight_config.show.component_access_tab_items.nil? %>
+              <% items = blacklight_config.show.component_access_tab_items.select { |i|  fields_have_content?(@document, i) }  %>
+              <% items.each_with_index do |item, index| %>
+                <%= render partial: 'access_contents', locals: { document: @document, field_accessor: item, card_index: index} %>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
       </div>
     </div>
   </div>
-
 </div>

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

@@ -1,6 +1,6 @@
 <% 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 %>">
+  <dl class="al-metadata-section 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| %>