blacklight 7.1.0 → 7.2.0

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

@@ -1,6 +1,13 @@
 <div class="card facet-limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet-limit-active' if facet_field_in_params?(facet_field.key) %>">
-  <h3 class="card-header <%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle facet-field-heading" aria-expanded="false" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>" id="<%= facet_field_id(facet_field) %>-header">
-    <%= link_to facet_field_label(facet_field.key), "##{ facet_field_id(facet_field)}", "data-turbolinks": false %>
+  <h3 class="card-header p-0 facet-field-heading" id="<%= facet_field_id(facet_field) %>-header">
+    <button
+      class="btn btn-block p-2 text-left <%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle"
+      data-toggle="collapse"
+      data-target="#<%= facet_field_id(facet_field) %>"
+      aria-expanded="false"
+    >
+      <%= facet_field_label(facet_field.key) %>
+    </button>
   </h3>
   <div id="<%= facet_field_id(facet_field) %>" aria-labelledby="<%= facet_field_id(facet_field) %>-header" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'show' %>">
     <div  class="card-body">

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

@@ -1,4 +1,4 @@
 <% # container for facet groups -%>
 <% facet_group_names.each do |groupname| %>
-  <%= render partial: "facet_group", locals: {groupname: groupname} %>
+  <%= render 'facet_group', groupname: groupname %>
 <% end %>

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

@@ -2,7 +2,7 @@
 <span class="sr-only"><%= t('blacklight.search.per_page.title') %></span>
 <div id="per_page-dropdown" class="per-page-dropdown btn-group">
   <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-    <%= t(:'blacklight.search.per_page.button_label', :count => current_per_page) %> <span class="caret"></span>
+    <%= t(:'blacklight.search.per_page.button_label_html', :count => current_per_page) %> <span class="caret"></span>
   </button>
   <div class="dropdown-menu dropdown-menu-right" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>

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

@@ -15,7 +15,7 @@
     <% 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 form-control", id: "q", autofocus: presenter.autofocus?, data: { autocomplete_enabled: presenter.autocomplete_enabled?, autocomplete_path: search_action_path(action: :suggest) }  %>
+    <%= text_field_tag :q, params[:q], placeholder: t('blacklight.search.form.search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", 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">

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

@@ -7,6 +7,10 @@
   <%= json_api_link_tag %>
 <% end %>
 
+<% content_for(:skip_links) do -%>
+    <%= link_to t('blacklight.skip_links.first_result'), '#documents', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+<% end %>
+
 <% content_for(:container_header) do -%>
   <h1 class="sr-only top-content-title"><%= t('blacklight.search.header') %></h1>
 

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

@@ -1,7 +1,7 @@
 <% if show_sort_and_per_page? and active_sort_fields.many? %>
 <div id="sort-dropdown" class="sort-dropdown btn-group">
   <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-      <%= t('blacklight.search.sort.label', :field =>sort_field_label(current_sort_field.key)) %> <span class="caret"></span>
+      <%= t('blacklight.search.sort.label_html', :field =>sort_field_label(current_sort_field.key)) %> <span class="caret"></span>
   </button>
 
   <div class="dropdown-menu" role="menu">

data/app/views/layouts/blacklight.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 %> order-last" aria-label="<%= t('blacklight.search.documents.aria.search_results') %>">
       <%= yield %>
     </section>
 
-    <section id="sidebar" class="<%= sidebar_classes %> order-first">
+    <section id="sidebar" class="<%= sidebar_classes %> order-first" aria-label="<%= t('blacklight.search.documents.aria.limit_search') %>">
       <%= content_for(:sidebar) %>
     </section>
   <% else %>

data/app/views/layouts/blacklight/base.html.erb

@@ -17,19 +17,25 @@
     <%= content_for(:head) %>
   </head>
   <body class="<%= render_body_class %>">
-  <%= render partial: 'shared/header_navbar' %>
+    <div id="skip-link">
+      <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <%= content_for(:skip_links) %>
+    </div>
+    <%= render partial: 'shared/header_navbar' %>
 
-  <div id="main-container" class="<%= container_classes %>">
+  <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
     <%= content_for(:container_header) %>
 
-    <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
 
-    <div class="row">
-      <%= content_for?(:content) ? yield(:content) : yield %>
+      <div class="row">
+        <%= content_for?(:content) ? yield(:content) : yield %>
+      </div>
     </div>
-  </div>
+  </main>
 
-  <%= render partial: 'shared/footer' %>
-  <%= render partial: 'shared/modal' %>
+    <%= render partial: 'shared/footer' %>
+    <%= render partial: 'shared/modal' %>
   </body>
 </html>

data/config/locales/blacklight.de.yml

@@ -21,6 +21,10 @@ de:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Zum Hauptinhalt gehen'
+      search_field: 'Gehen Sie zur Suchleiste'
+      first_result: 'Gehe zum ersten Suchergebnis'
     header_links:
       login: 'Anmelden'
       logout: 'Ausloggen'
@@ -143,11 +147,13 @@ de:
         invalid_solr_id: "Entschuldigung, Sie haben einen nicht vorhandenen Datensatz angefordert."
       per_page:
         label: '%{count}<span class="sr-only"> pro Seite</span>'
-        button_label: '%{count} pro Seite'
+        button_label: '%{count} pro Seite' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> pro Seite</span>'
         title: 'Anzahl der Ergebnisse, die pro Seite angezeigt werden'
         submit: 'Aktualisieren'
       sort:
-        label: 'Ordnen nach %{field}'
+        label: 'Ordnen nach %{field}' # TODO: Remove during major release
+        label_html: 'Ordnen<span class="d-none d-sm-inline"> nach %{field}</span>'
         submit: 'Ergebnisse ordnen'
       form:
         search_field:
@@ -170,6 +176,9 @@ de:
         one: '<strong>1 von 1</strong>'
         other: '<strong>%{current}</strong> von <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Suchergebnisse'
+          limit_search: 'Suche beschränken'
         counter: '%{counter}. '
       facets:
         title: 'Suche beschränken'
@@ -215,5 +224,11 @@ de:
 
     entry_name:
       default: 'Eintrag'
+      grouped:
+        default: 'gruppiertes Ergebnis'
 
     did_you_mean: 'Meinten Sie: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Hauptinhalt'

data/config/locales/blacklight.en.yml

@@ -21,6 +21,10 @@ en:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Skip to main content'
+      search_field: 'Skip to search'
+      first_result: 'Skip to first result'
     header_links:
       login: 'Login'
       logout: 'Log Out'
@@ -143,11 +147,13 @@ en:
         invalid_solr_id: "Sorry, you have requested a record that doesn't exist."
       per_page:
         label: '%{count}<span class="sr-only"> per page</span>'
-        button_label: '%{count} per page'
+        button_label: '%{count} per page' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> per page</span>'
         title: 'Number of results to display per page'
         submit: 'Update'
       sort:
-        label: 'Sort by %{field}'
+        label: 'Sort by %{field}' # TODO: Remove during major release
+        label_html: 'Sort<span class="d-none d-sm-inline"> by %{field}</span>'
         submit: 'sort results'
       form:
         search_field:
@@ -170,6 +176,9 @@ en:
         one: '<strong>1 of 1</strong>'
         other: '<strong>%{current}</strong> of <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'search results'
+          limit_search: 'limit your search'
         counter: '%{counter}. '
       facets:
         title: 'Limit your search'
@@ -215,5 +224,11 @@ en:
 
     entry_name:
       default: 'entry'
+      grouped:
+        default: 'grouped result'
 
     did_you_mean: 'Did you mean to type: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Main content'

data/config/locales/blacklight.es.yml

@@ -21,6 +21,10 @@ es:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Saltar al contenido principal'
+      search_field: 'Salta a la búsqueda'
+      first_result: 'Salta al primer resultado de búsqueda'
     header_links:
       login: 'Entrar'
       logout: 'Salir'
@@ -143,11 +147,13 @@ es:
         invalid_solr_id: "Lo sentimos, usted ha solicitado un registro que no existe."
       per_page:
         label: '%{count}<span class="sr-only"> por página</span>'
-        button_label: '%{count} por página'
+        button_label: '%{count} por página' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> por página</span>'
         title: 'El número de resultados a mostrar por página'
         submit: 'Actualización'
       sort:
-        label: 'Ordenar por %{field}'
+        label: 'Ordenar por %{field}' # TODO: Remove during major release
+        label_html: 'Ordenar<span class="d-none d-sm-inline"> por %{field}</span>'
         submit: 'Resultados de ordenación'
       form:
         search_field:
@@ -170,6 +176,9 @@ es:
         one: '<strong>1 de 1</strong>'
         other: '<strong>%{current}</strong> de <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Resultados de la búsqueda'
+          limit_search: 'Limite su búsqueda'
         counter: '%{counter}.'
       facets:
         title: 'Limite su búsqueda'
@@ -215,5 +224,11 @@ es:
 
     entry_name:
       default: 'entrada'
+      grouped:
+        default: 'resultado agrupado'
 
     did_you_mean: '¿Quiere decir %{options}?'
+
+    main:
+      aria:
+        main_container: 'Contenido principal'

data/config/locales/blacklight.fr.yml

@@ -21,6 +21,10 @@ fr:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Aller au contenu principal'
+      search_field: 'Aller à la recherche'
+      first_result: 'Aller au premier résultat de recherche'
     header_links:
       login: 'Mon compte'
       logout: 'Me déconnecter'
@@ -146,11 +150,13 @@ fr:
         invalid_solr_id: "Vous avez demandé une notice qui n'existe pas."
       per_page:
         label: '%{count}<span class="sr-only"> par page</span>'
-        button_label: '%{count} par page'
+        button_label: '%{count} par page' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> par page</span>'
         title: 'Nombre de résultats à afficher par page'
         submit: 'mettre à jour'
       sort:
-        label: 'Trier par %{field}'
+        label: 'Trier par %{field}' # TODO: Remove during major release
+        label_html: 'Trier<span class="d-none d-sm-inline"> par %{field}</span>'
         submit: 'trier les résultats'
       form:
         search_field:
@@ -173,6 +179,9 @@ fr:
         one: '<b>1 sur 1</b>'
         other: '<b>%{current}</b> sur <b>%{total}</b>'
       documents:
+        aria:
+          search_results: 'Résultats de recherche'
+          limit_search: 'Limiter votre recherche'
         counter: '%{counter}. '
       facets:
         title: 'Limiter votre recherche'
@@ -219,5 +228,11 @@ fr:
 
     entry_name:
       default: 'résultat'
+      grouped:
+        default: 'résultat groupé'
 
     did_you_mean: 'Essayez peut-être avec : %{options}'
+
+    main:
+      aria:
+        main_container: 'Contenu principal'

data/config/locales/blacklight.hu.yml

@@ -13,7 +13,10 @@ hu:
 
   blacklight:
     application_name: 'Blacklight'
-
+    skip_links:
+      main_content: 'Ugrás a tartalomra'
+      search_field: 'Ugrás a keresésre'
+      first_result: 'Ugrás az első keresési eredményre'
     header_links:
       login: 'Belépés'
       logout: 'Kilépés'
@@ -136,11 +139,13 @@ hu:
         invalid_solr_id: "Elnézést, de az Ön által kért rekord nem létezik."
       per_page:
         label: '%{count}<span class="sr-only"> oldalanként</span>'
-        button_label: '%{count} oldalanként'
+        button_label: '%{count} oldalanként' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> oldalanként</span>'
         title: 'Az eredmények száma oldalanként'
         submit: 'Frissítés'
       sort:
-        label: 'Rendezés %{field}'
+        label: 'Rendezés %{field}' # TODO: Remove during major release
+        label_html: 'Rendezés<span class="d-none d-sm-inline"> %{field}</span>'
         submit: 'Eredmények rendezése'
       form:
         search_field:
@@ -163,6 +168,9 @@ hu:
         one: '<strong>1 / 1</strong>'
         other: '<strong>%{current}</strong> / <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Keresés eredményei'
+          limit_search: 'Szűrje tovább a keresését'
         counter: '%{counter}. '
       facets:
         title: 'Szűrje tovább a keresését'
@@ -208,5 +216,11 @@ hu:
 
     entry_name:
       default: 'bejegyzés'
+      grouped:
+        default: 'csoportosított eredmény'
 
     did_you_mean: 'Arra gondolt, hogy: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Központi téma'

data/config/locales/blacklight.it.yml

@@ -21,6 +21,10 @@ it:
 
   blacklight:
     application_name: 'Blacklight'
+    skip_links:
+      main_content: 'Vai al contenuto principale'
+      search_field: 'Vai alla ricerca'
+      first_result: 'Vai al primo risultato di ricerca'
     header_links:
       login: 'Login'
       logout: 'Log out'
@@ -143,11 +147,13 @@ it:
         invalid_solr_id: "Il numero di scheda richiesto non esiste."
       per_page:
         label: '%{count}<span class="sr-only"> per pagina</span>'
-        button_label: '%{count} per pagina'
+        button_label: '%{count} per pagina' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
         title: 'Risultati per pagina'
         submit: 'Aggiorna'
       sort:
-        label: 'Ordina per %{field}'
+        label: 'Ordina per %{field}' # TODO: Remove during major release
+        label_html: 'Ordina<span class="d-none d-sm-inline"> per %{field}</span>'
         submit: 'Ordina i risultati'
       form:
         search_field:
@@ -170,6 +176,9 @@ it:
         one: '<strong>1 di 1</strong>'
         other: '<strong>%{current}</strong> di <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Risultati della ricerca'
+          limit_search: 'Affina la ricerca'
         counter: '%{counter}. '
       facets:
         title: 'Affina la ricerca'
@@ -215,5 +224,11 @@ it:
 
     entry_name:
       default: 'termine di ricerca'
+      grouped:
+        default: 'risultato raggruppato'
 
     did_you_mean: 'Intendevi digitare: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Contenuto principale'

data/config/locales/blacklight.nl.yml

@@ -13,7 +13,10 @@ nl:
 
   blacklight:
     application_name: 'Blacklight'
-
+    skip_links:
+      main_content: 'Ga naar de hoofdinhoud'
+      search_field: 'Ga naar de zoekopdracht'
+      first_result: 'Ga naar het eerste zoekresultaat'
     header_links:
       login: 'Login'
       logout: 'Log Out'
@@ -136,11 +139,13 @@ nl:
         invalid_solr_id: "Sorry, u vroeg een onbestaande record op."
       per_page:
         label: '%{count}<span class="sr-only"> per pagina</span>'
-        button_label: '%{count} per pagina'
+        button_label: '%{count} per pagina' # TODO: Remove during major release
+        button_label_html: '%{count}<span class="d-none d-sm-inline"> per pagina</span>'
         title: 'Toon aantal zoekresultaten per pagina'
         submit: 'Update'
       sort:
-        label: 'Sorteer op %{field}'
+        label: 'Sorteer op %{field}' # TODO: Remove during major release
+        label_html: 'Sorteer<span class="d-none d-sm-inline"> op %{field}</span>'
         submit: 'sorteer resultaten'
       form:
         search_field:
@@ -163,6 +168,9 @@ nl:
         one: '<strong>1 van 1</strong>'
         other: '<strong>%{current}</strong> van <strong>%{total}</strong>'
       documents:
+        aria:
+          search_results: 'Zoek resultaten'
+          limit_search: 'Verfijn uw zoekopdracht'
         counter: '%{counter}. '
       facets:
         title: 'Verfijn uw zoekopdracht'
@@ -208,5 +216,11 @@ nl:
 
     entry_name:
       default: 'ingang'
+      grouped:
+        default: 'gegroepeerd resultaat'
 
     did_you_mean: 'Bedoelde u: %{options}?'
+
+    main:
+      aria:
+        main_container: 'Belangrijkste inhoud'