arclight 0.1.4 → 0.3.3

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

@@ -0,0 +1,8 @@
+<% # overidden from Blacklight to handle our responsive needs %>
+<div id="sortAndPerPage" class="sort-pagination clearfix">
+  <div>
+    <%= render partial: "paginate_compact", object: @response if show_pagination? %>
+  </div>
+  <%= render partial: 'group_toggle' unless current_page?(controller: 'bookmarks')  %>
+  <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
+</div>

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

@@ -0,0 +1,26 @@
+<div class="input-group within-collection-dropdown flex-nowrap flex-shrink-1 mb-2 mb-md-0 mr-md-2">
+  <span class="input-group-prepend">
+    <label class="input-group-text" for="within_collection">
+      <%= t('arclight.within_collection_dropdown.label_html') %>
+    </label>
+  </span>
+  <select
+    id="within_collection"
+    class="custom-select search-field rounded-right"
+    <%= 'name="f[collection_sim][]"'.html_safe if within_collection_context? %>
+  >
+    <option
+      <%= "selected" unless within_collection_context? %>
+      value=""
+    >
+      <%= t('arclight.within_collection_dropdown.all_collections') %>
+    </option>
+    <option
+      value="<%= Array(params.dig(:f, :collection_sim)).first || @document && @document.collection_name %>"
+      <%= 'selected' if within_collection_context? %>
+      <%= 'disabled' unless within_collection_context? %>
+    >
+      <%= t('arclight.within_collection_dropdown.this_collection') %>
+    </option>
+  </select>
+</div>

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

@@ -1,15 +1,15 @@
-<div class='al-search-breadcrumb'>
+<nav class='al-search-breadcrumb' role='navigation' aria-label=<%= t('arclight.breadcrumbs.aria_label') %> >
   <%= link_to t('arclight.routes.home'), root_path %>
-  <%= t('arclight.breadcrumb_separator') %>
+  <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
   <% if collection_active? %>
     <%= t('arclight.routes.collections') %>
   <% elsif on_repositories_index? %>
     <%= t('arclight.routes.repositories') %>
   <% elsif on_repositories_show? %>
     <%= link_to t('arclight.routes.repositories'), arclight_engine.repositories_path %>
-    <%= t('arclight.breadcrumb_separator') %>
+    <span aria-hidden="true"><%= t('arclight.breadcrumb_separator') %></span>
     <%= @repository.name %>
   <% else %>
     <%= t('arclight.routes.search_results') %>
   <% end %>
-</div>
+</nav>

data/app/views/shared/_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/shared/_header_navbar.html.erb

@@ -1,53 +1,61 @@
-<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" >
+            <ul class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </ul>
+          </div>
+        </div>
+
+        <div class='row justify-content-md-center'>
+          <div class='col-12'>
+            <div class='navbar-search'>
+              <%= render_search_bar %>
+            </div>
+          </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" >
+            <span class="h1"><%= t('arclight.masthead_heading') %></span>
+          </div>
+
+          <div class="col-md-4 nav-links d-flex justify-content-end" >
+            <ul class="navbar-nav" aria-label="browse" role="navigation">
+              <%= render 'shared/main_menu_links' %>
+            </ul>
+          </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>
+    <div class="navbar-search navbar">
+      <div class="<%= container_classes %>">
         <%= render_search_bar  %>
       </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</header>

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

@@ -1,6 +1,6 @@
 <li class="nav-item <%= repositories_active_class %>">
   <%= link_to t('arclight.routes.repositories'), arclight_engine.repositories_path, class: 'nav-link' %>
 </li>
-<li class="nav-item <%= collection_active_class %>">
+<li class="nav-item ml-3 <%= collection_active_class %>">
   <%= link_to t('arclight.routes.collections'), arclight_engine.collections_path, class: 'nav-link' %>
 </li>

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

@@ -0,0 +1,27 @@
+<% parents = Arclight::Parents.from_solr_document(document).as_parents %>
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-home-link">
+      <%= link_to t('arclight.routes.home'), root_path %>
+    </li>
+    <li class="media breadcrumb-item  breadcrumb-item-1">
+      <% if document.repository_config.present? %>
+        <span class="media-body" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span>
+        <span class="col"><%= link_to(document.repository_config.name, arclight_engine.repository_path(document.repository_config.slug)) %></span>
+      <% else %>
+          <span class="media-body" aria-hidden="true"><%= blacklight_icon :repository, classes: 'al-repository-content-icon' %></span><span class="col"><%= t('arclight.show_breadcrumb_label') %></span>
+      <% end %>
+    </li>
+    <% parents.each_with_index.map do |parent, index| %>
+      <%= content_tag :li, class: "breadcrumb-item breadcrumb-item-#{index + 1} media" do %>
+        <span class="media-body" aria-hidden="true"><%= blacklight_icon document_or_parent_icon(parent) %></span>
+        <span class="col"><%= link_to parent.label, solr_document_path(parent.global_id) %></span>
+      <% end %> 
+    <% end %>
+  </ol>
+
+  <%= content_tag :h1, class: "breadcrumb-item breadcrumb-item-#{parents.length + 2} media" do %>
+    <span class="media-body" aria-hidden="true"><%= blacklight_icon document_or_parent_icon(document) %></span>
+    <span class="col"><%= document.normalized_title %></span>
+  <% end %>
+</nav>

data/arclight.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'arclight/version'
 
@@ -23,19 +22,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'blacklight', '7.0.0.rc1'
-  spec.add_dependency 'blacklight_range_limit', '7.0.0.rc2'
-  spec.add_dependency 'rails', '~> 5.0'
-  spec.add_dependency 'solr_ead'
+  spec.add_dependency 'blacklight', '~> 7.2'
+  spec.add_dependency 'blacklight_range_limit', '~> 7.1'
+  spec.add_dependency 'rails', '>= 5.2.3', '< 6.1'
+  spec.add_dependency 'sprockets-bumble_d'
+  spec.add_dependency 'traject', '~> 3.0'
+  spec.add_dependency 'traject_plus', '~> 1.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '> 1.14'
   spec.add_development_dependency 'capybara'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'engine_cart'
-  spec.add_development_dependency 'poltergeist'
+  spec.add_development_dependency 'i18n-tasks'
   spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rubocop', '~> 0.48.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.15.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.0'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.35'
+  spec.add_development_dependency 'selenium-webdriver'
+  spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'solr_wrapper'
+  spec.add_development_dependency 'webdrivers'
 end

data/config/i18n-tasks.yml

@@ -0,0 +1,133 @@
+# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
+
+# The "main" locale.
+base_locale: en
+## All available locales are inferred from the data by default. Alternatively, specify them explicitly:
+# locales: [es, fr]
+## Reporting locale, default: en. Available: en, ru.
+# internal_locale: en
+
+# Read and write translations.
+data:
+  ## Translations are read from the file system. Supported format: YAML, JSON.
+  ## Provide a custom adapter:
+  # adapter: I18n::Tasks::Data::FileSystem
+
+  # Locale files or `File.find` patterns where translations are read from:
+  read:
+    ## Default:
+    # - config/locales/%{locale}.yml
+    ## More files:
+    - config/locales/**/*.%{locale}.yml
+
+  # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
+  # `i18n-tasks normalize -p` will force move the keys according to these rules
+  write:
+    ## For example, write devise and simple form keys to their respective files:
+    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
+    ## Catch-all default:
+    # - config/locales/%{locale}.yml
+
+  # External locale data (e.g. gems).
+  # This data is not considered unused and is never written to.
+  external:
+    ## Example (replace %#= with %=):
+    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
+
+  ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
+  # router: conservative_router
+
+  yaml:
+    write:
+      # do not wrap lines at 80 characters
+      line_width: -1
+
+  ## Pretty-print JSON:
+  # json:
+  #   write:
+  #     indent: '  '
+  #     space: ' '
+  #     object_nl: "\n"
+  #     array_nl: "\n"
+
+# Find translate calls
+search:
+  ## Paths or `File.find` patterns to search in:
+  # paths:
+  #  - app/
+
+  ## Root directories for relative keys resolution.
+  # relative_roots:
+  #   - app/controllers
+  #   - app/helpers
+  #   - app/mailers
+  #   - app/presenters
+  #   - app/views
+
+  ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
+  ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
+  exclude:
+    - app/assets/images
+    - app/assets/fonts
+    - app/assets/videos
+
+  ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
+  ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
+  # only: ["*.rb", "*.html.slim"]
+
+  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
+  # strict: true
+
+  ## Multiple scanners can be used. Their results are merged.
+  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
+  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
+
+## Translation Services
+# translation:
+#   # Google Translate
+#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
+#   google_translate_api_key: "AbC-dEf5"
+#   # DeepL Pro Translate
+#   # Get an API key and subscription at https://www.deepl.com/pro to use DeepL Pro
+#   deepl_api_key: "48E92789-57A3-466A-9959-1A1A1A1A1A1A"
+
+## Do not consider these keys missing:
+ignore_missing:
+- '{blacklight}.*'
+
+## Consider these keys used:
+ignore_unused:
+  - '{blacklight}.*'
+# - 'activerecord.attributes.*'
+# - '{devise,kaminari,will_paginate}.*'
+# - 'simple_form.{yes,no}'
+# - 'simple_form.{placeholders,hints,labels}.*'
+# - 'simple_form.{error_notification,required}.:'
+
+## Exclude these keys from the `i18n-tasks eq-base' report:
+# ignore_eq_base:
+#   all:
+#     - common.ok
+#   fr,es:
+#     - common.brand
+
+## Exclude these keys from the `i18n-tasks check-consistent-interpolations` report:
+# ignore_inconsistent_interpolations:
+# - 'activerecord.attributes.*'
+
+## Ignore these keys completely:
+# ignore:
+#  - kaminari.*
+
+## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
+## e.g. in case of a relative key defined in a helper method.
+## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       only: %w(*.html.haml *.html.slim),
+#       patterns: [['= title\b', '.page_title']] %>
+#
+# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
+#
+# <%# I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
+#       patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>

data/config/locales/arclight.en.yml

@@ -1,65 +1,99 @@
+---
 en:
   arclight:
-    masthead_heading: 'Archival Collections at Institution'
-    date_range_histogram:
-      show_hide: 'Show/hide date distribution'
+    breadcrumb_separator: " » "
+    breadcrumbs:
+      aria_label: breadcrumb
     hierarchy:
-      view_all: 'View'
-      scope_and_contents: 'Scope and Contents'
+      scope_and_contents: Scope and Contents
+      scope_note: 'Scope note: '
+      view_all: View
+    masthead_heading: Archival Collections at Institution
+    repositories: Repositories
     request:
-      container: 'Request'
+      container: Request
     routes:
-      home: 'Home'
-      collections: 'Collections'
-      repositories: 'Repositories'
-      search_results: 'Search results'
+      collections: Collections
+      home: Home
+      repositories: Repositories
+      search_results: Search results
+    search:
+      collections_header: Collections
+      repository_header: 'Collections : [%{repository}]'
+    show_breadcrumb_label: Repository
+    truncation:
+      view_less: view less ▼
+      view_more: view more ▶
     views:
+      home:
+        title: Archival Collections at Institution - Arclight
       index:
-        number_of_children:
-          zero: 'No children'
-          one: '1 child'
-          other: '%{count} children'
-        collection_search:
-          count: 'collection'
-      online_content_indicator: 'online content'
+        all_group_results: view all %{count}
+        all_results: All results
+        group_by_collection: Grouped by collection
+        group_results: Group results
+        group_results_count:
+          one: 1 result
+          other: "%{count} results"
+          zero: 0 results
+        number_of_components:
+          one: component
+          other: components
+        top_group_results:
+          one: Top %{count} result
+          other: Top %{count} results
+      repositories:
+        number_of_collections:
+          one: 1 collection
+          other: "%{count} collections"
+          zero: No collections
+        show: "%{name} - Arclight"
+        title: Repositories - Arclight
+        view_all_collections: View all of our collections
+        view_more: View more
       show:
+        access: Access
+        collapse: Collapse
         collection_id: 'Collection ID: %{id}'
-        overview: 'Overview'
-        online_content: 'Online content'
-        no_online_content: 'No online content'
-        no_contents: 'No content inventory'
-        search_within: 'Search within this collection'
-        navigation_sidebar:
-          title: 'Navigation overview'
-        context_sidebar:
-          in_person_field: 'In person'
-          terms_field: 'Terms & Conditions'
-          cite_field: 'How to cite this collection'
-          component_terms_field: "Terms & Conditions"
-        sections:
-          summary_field: 'Summary'
-          access_field: 'Access and Use'
-          background_field: 'Background'
-          scope_and_arrangement_field: 'Scope and Arrangement'
-          related_field: 'Related'
-          indexed_terms_field: 'Indexed Terms'
-          admin_info_field: 'Administrative Information'
-          component_field: 'About this %{level}'
-          component_indexed_terms_field: 'Indexed Terms'
-          collection_context_field: 'Collection Context'
-        our_collections: 'Our Collections'
+        context: Collection context
+        context_nav:
+          title: Collection context navigation
         download:
-          default: 'Download'
-          pdf: 'Collection PDF (%{size})'
-          ead: 'Collection EAD (%{size})'
-      repositories:
-        number_of_collections:
-          zero: 'No collections'
-          one: '1 collection'
-          other: '%{count} collections'
-        view_more: 'View more'
-        view_all_collections: 'View all of our collections'
-    breadcrumb_separator: ' » '
-    truncation:
-      view_more: 'view more ▶'
-      view_less: 'view less ▼'
+          default: Download
+          ead: Download EAD
+          pdf: Download finding aid
+        download_with_size:
+          default: Download (%{size})
+          ead: Download EAD (%{size})
+          pdf: Download finding aid (%{size})
+        expand: Expand
+        has_content: Contents
+        no_contents: No content inventory
+        online_content: Online content
+        online_content_upper: ONLINE CONTENT
+        our_collections: Our Collections
+        overview: Overview
+        sections:
+          access_field: Access and Use
+          background_field: Background
+          collection_context_field: Collection Context
+          component_field: About this %{level}
+          component_indexed_terms_field: Indexed Terms
+          indexed_terms_field: Indexed Terms
+          related_field: Related
+          scope_and_arrangement_field: Scope and Arrangement
+          summary_field: Summary
+        tablist_nav: Context
+    within_collection_dropdown:
+      all_collections: all collections
+      label_html: Search<span class="sr-only"> within</span>
+      this_collection: this collection
+  blacklight:
+    entry_name:
+      grouped:
+        collection_ssi: collection
+    search:
+      pagination_info:
+        pages:
+          one: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num} %{entry_name}</strong>"
+          other: "<strong>%{start_num}</strong> - <strong>%{end_num}</strong> of <strong>%{total_num} %{entry_name}</strong>"