blacklight 9.0.0.beta1 → 9.0.0

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

@@ -5,16 +5,16 @@
              method: :post do %>
 <div class="modal-body">
   <%= render '/shared/flash_msg' %>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="to">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="to">
         <%= t('blacklight.sms.form.to') %>
       </label>
       <div class="col-sm-10">
         <%= telephone_field_tag :to, params[:to], class: 'form-control', required: true %>
       </div>
     </div>
-    <div class="form-group row">
-      <label class="control-label col-sm-2" for="carrier">
+    <div class="row">
+      <label class="col-form-label col-sm-2" for="carrier">
         <%= t('blacklight.sms.form.carrier') %>
       </label>
       <div class="col-sm-10">

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

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="sort-pagination pb-3 d-md-flex justify-content-between" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label')%>">
+<div id="sortAndPerPage" class="sort-pagination pb-3 mb-3 d-md-flex justify-content-between" role="navigation" aria-label="<%= t('blacklight.search.per_page.aria_label')%>">
   <%= render partial: "paginate_compact", object: @response if show_pagination? %>
   <%= render_results_collection_tools wrapping_class: "search-widgets" %>
 </div>

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

@@ -1,7 +1,7 @@
 <% @page_title = t('blacklight.advanced_search.page_title', application_name: application_name) %>
 
 <div class="advanced-search-form col-sm-12">
-  <h1 class="advanced page-header">
+  <h1>
       <%= t('blacklight.advanced_search.form.title') %>
   </h1>
 

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

@@ -1,14 +1,12 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.with_prefix do %>
-    <div class="facet-pagination top d-flex w-100 justify-content-between">
-      <%= render :partial=>'facet_pagination' %>
-    </div>
-  <% end %>
-
   <% component.with_title { facet_field_label(@facet.key) } %>
-  <%= render Blacklight::Search::FacetSuggestInput.new(facet: @facet, presenter: @presenter) %>
+  <% view_config = blacklight_config.view_config(document_index_view_type) %>
 
-  <%= render partial: 'facet_index_navigation' if @facet.index_range && @display_facet.index? %>
+  <%= render view_config.facet_filters_component.new(presenter: @presenter) %>
+
+  <div class="facet-pagination top d-flex flex-wrap w-100 justify-content-between border-bottom pb-3 mb-3">
+    <%= render view_config.facet_pagination_component.new(facet_field: @presenter) %>
+  </div>
 
   <div class="facet-extended-list">
     <%= render Blacklight::FacetComponent.new(display_facet: @display_facet,
@@ -17,8 +15,8 @@
   </div>
 
   <% component.with_footer do %>
-    <div class="facet-pagination bottom flex-row justify-content-between">
-      <%= render :partial=>'facet_pagination' %>
+    <div class="facet-pagination bottom d-flex flex-wrap w-100 justify-content-between">
+      <%= render view_config.facet_pagination_component.new(facet_field: @presenter) %>
     </div>
   <% end %>
 <% end %>

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

@@ -11,7 +11,6 @@
 <% unless has_search_parameters? %>
   <%# if there are no input/search related params, display the "home" partial -%>
   <%= render 'home' %>
-  <%= render 'shared/sitelinks_search_box' %>
 <% else %>
   <%= render 'search_results' %>
 <% end %>

data/app/views/catalog/index.json.jbuilder

@@ -42,9 +42,11 @@ json.included do
     json.id facet.name
     json.attributes do
       facet_config = facet_configuration_for_field(facet.name)
-      json.label facet_field_label(facet_config.key)
+      facet_presenter = facet_field_presenter(facet_config, facet)
+      json.label facet_presenter.label
       json.items do
         json.array! facet.items do |item|
+          item_presenter = facet_presenter.item_presenter(item)
           json.id
           json.attributes do
             json.label item.label
@@ -52,10 +54,10 @@ json.included do
             json.hits item.hits
           end
           json.links do
-            if search_state.filter(facet_config).include?(facet_value_for_facet_item(item.value))
+            if search_state.filter(facet_config).include?(item.value)
               json.remove search_action_path(search_state.filter(facet.name).remove(item.value))
             else
-              json.self facet_item_presenter(facet_config, item.value, facet.name).href(only_path: false)
+              json.self item_presenter.href(only_path: false)
             end
           end
         end

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

@@ -1,6 +1,6 @@
-<%= render 'show_main_content' %>
+<% presenter = document_presenter(@document) %>
+<%= render 'show_main_content', presenter: presenter %>
 
 <% content_for(:sidebar) do %>
-  <% presenter = document_presenter(@document) %>
   <%= render presenter.view_config.sidebar_component.new(presenter: presenter) %>
 <% end %>

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

@@ -32,7 +32,7 @@
     <main id="main-container" class="<%= container_classes %>" aria-label="<%= t('blacklight.main.aria.main_container') %>">
       <%= content_for(:container_header) %>
 
-      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+      <%= render 'shared/flash_msg', layout: 'shared/flash_messages' if flash.any? %>
 
       <div class="row">
         <%= content_for?(:content) ? yield(:content) : yield %>

data/blacklight.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
   s.add_dependency "i18n", '>= 1.7.0' # added named parameters
   s.add_dependency "ostruct", '>= 0.3.2'
-  s.add_dependency "view_component", '~> 3.9'
+  s.add_dependency "view_component", '>= 3.0', '< 5.0'
   s.add_dependency "zeitwerk"
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.

data/config/locales/blacklight.ar.yml

@@ -36,29 +36,29 @@ ar:
       apa: الجمعية الأمريكية لعلم النفس APA
       chicago: شيكاغو
       mla: جمعية اللغة الحديثة MLA
-    did_you_mean: 'هل كنت تقصد كتابة: %{options}؟'
+    did_you_mean: "هل كنت تقصد كتابة: %{options}؟"
     email:
       errors:
         to:
           blank: يجب إدخال مُستلم من أجل إرسال هذه الرسالة
           invalid: يجب إدخال عنوان بريد إلكتروني صحيح
       form:
-        message: 'الرسالة:'
+        message: "الرسالة:"
         submit: إرسال
         title: إرسله عبرالبريد الإلكتروني
-        to: 'بريد إلكتروني:'
+        to: "بريد إلكتروني:"
       success: تم إرسال البريد الإلكتروني
       text:
         default_title: لا يوجد
-        message: 'الرسالة: %{message}'
+        message: "الرسالة: %{message}"
         subject:
           few: سجلات المادة
           many: سجلات المادة
-          one: 'سجل المادة: %{title}'
+          one: "سجل المادة: %{title}"
           other: سجلات المادة
           two: سجلان للمادة
           zero: لا يوجد سجل للمادة
-        url: 'الرابط: %{url}'
+        url: "الرابط: %{url}"
     entry_name:
       default: إدخال
       grouped:
@@ -112,15 +112,15 @@ ar:
           count: ترتيب رقمي
           index: ترتيب أبجدي
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: الفلتر %{field_label}
+          placeholder: فلتر...
         title: تحديد نطاق البحث
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'إزالة القيد %{label}: %{value}'
+          label_value: "إزالة القيد %{label}: %{value}"
           value: إزالة القيد %{value}
-        title: 'لقد بحثت عن:'
+        title: "اختياراتك:"
       form:
         search:
           label: ابحث عن
@@ -139,6 +139,7 @@ ar:
         constraint: "%{label}: %{value}"
         many_constraint_values: تم تحديد %{values}
         title: "%{constraints} - %{application_name} نتائج البحث"
+        joiner: " / "
       pagination:
         title: تصفح النتائج
       pagination_info:
@@ -159,7 +160,6 @@ ar:
         submit: تحديث
         title: عدد النتائج المعروضة في الصفحة
       rss_feed: خلاصات RSS للنتائج
-      search_constraints_header: قيود البحث
       search_results: نتائج البحث
       show:
         label: "%{label}:"
@@ -171,7 +171,7 @@ ar:
       start_over: البدء من جديد
       view:
         list: قائمة
-      view_title: 'عرض النتائج ك: '
+      view_title: "عرض النتائج ك: "
       zero_results:
         modify_search: حاول تعديل معايير البحث
         search_everything: حاول البحث عن كل شيء
@@ -208,10 +208,10 @@ ar:
         carrier_prompt: يرجى تحديد شركة الاتصالات
         submit: إرسال
         title: إرسله كرسالة نصية قصيرة
-        to: 'رقم الهاتف:'
+        to: "رقم الهاتف:"
       success: تم الإرسال كرسالة نصية قصيرة
       text:
-        url: 'الرابط: %{url}'
+        url: "الرابط: %{url}"
     tools:
       citation: استشهاد مرجعي
       clear: مسح

data/config/locales/blacklight.ca.yml

@@ -134,8 +134,8 @@ ca:
         title: "%{constraints} - %{application_name} Resultats de la cerca"
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} seleccionat"
+        joiner: " / "
       header: "Cerca"
-      search_constraints_header: "Filtres de la cerca"
       search_results: "Resultats de la cerca"
       errors:
         invalid_solr_id: "El registre que heu sol·licitat no existeix."
@@ -193,7 +193,7 @@ ca:
       group:
         more: "més »"
       filters:
-        title: "Heu cercat per:"
+        title: "Les teves seleccions:"
         label: "%{label}:"
         remove:
           value: "Eliminar el filtre %{value}"

data/config/locales/blacklight.de.yml

@@ -32,25 +32,25 @@ de:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Meinten Sie: %{options}?'
+    did_you_mean: "Meinten Sie: %{options}?"
     email:
       errors:
         to:
           blank: Sie müssen einen Empfänger eingeben, um diese Mitteilung zu schicken
           invalid: Sie müssen eine gültige E-Mail-Addresse eingeben
       form:
-        message: 'Nachricht:'
+        message: "Nachricht:"
         submit: Senden
         title: E-Mail
-        to: 'E-Mail-Adresse:'
+        to: "E-Mail-Adresse:"
       success: E-Mail verschickt
       text:
         default_title: N/A
-        message: 'Mitteilung: %{message}'
+        message: "Mitteilung: %{message}"
         subject:
-          one: 'Artikeldatensatz: %{title}'
+          one: "Artikeldatensatz: %{title}"
           other: Artikeldatensätze
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: Eintrag
@@ -92,7 +92,7 @@ de:
           close: Facetten ausblenden
           open: Facetten zeigen
         missing:
-        - fehlt
+          - fehlt
         more_html: mehr <span class="visually-hidden">%{field_name}</span> »
         pivot:
           hide: Schließen
@@ -109,9 +109,9 @@ de:
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Filter %{label}: %{value} entfernen'
+          label_value: "Filter %{label}: %{value} entfernen"
           value: Filter %{value} entfernen
-        title: 'Sie suchten nach:'
+        title: "Ihre Auswahl:"
       form:
         search:
           label: suchen nach
@@ -130,6 +130,7 @@ de:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} ausgewählt"
         title: "%{constraints} - %{application_name} Suchergebnisse"
+        joiner: " / "
       pagination:
         title: Ergebnisse Navigation
       pagination_info:
@@ -146,7 +147,6 @@ de:
         submit: Aktualisieren
         title: Anzahl der Ergebnisse, die pro Seite angezeigt werden
       rss_feed: RSS für Ergebnisse
-      search_constraints_header: Suchen
       search_results: Suchergebnisse
       show:
         label: "%{label}:"
@@ -158,7 +158,7 @@ de:
       start_over: Neu anfangen
       view:
         list: Liste
-      view_title: 'Ergebnisse ansehen als: '
+      view_title: "Ergebnisse ansehen als: "
       zero_results:
         modify_search: Ändern Sie Ihre Suche
         search_everything: Suchen Sie nach allem
@@ -195,10 +195,10 @@ de:
         carrier_prompt: Bitte wählen Sie Ihren Netzbetreiber aus
         submit: Schicken
         title: SMS
-        to: 'Telefonnummer:'
+        to: "Telefonnummer:"
       success: SMS verschickt
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Zitieren
       clear: Löschen

data/config/locales/blacklight.en.yml

@@ -11,7 +11,7 @@ en:
         sort_label: Sort results by
         start_over_html: Start over
         title: Advanced search
-      more_options: More options
+      more_options: Advanced search
       op:
         label: search operator
         must: all
@@ -129,7 +129,7 @@ en:
         remove:
           label_value: "Remove constraint %{label}: %{value}"
           value: Remove constraint %{value}
-        title: "You searched for:"
+        title: "Your selections:"
       form:
         search:
           label: search for
@@ -148,6 +148,7 @@ en:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} selected"
         title: "%{constraints} - %{application_name} Search Results"
+        joiner: " / "
       pagination:
         title: Results navigation
       pagination_info:
@@ -164,7 +165,6 @@ en:
         submit: Update
         title: Number of results to display per page
       rss_feed: RSS for results
-      search_constraints_header: Search Constraints
       search_results: Search Results
       show:
         label: "%{label}:"

data/config/locales/blacklight.es.yml

@@ -39,18 +39,18 @@ es:
           blank: Debe introducir un destinatario para enviar este mensaje
           invalid: Debe entrar un email válido
       form:
-        message: 'Mensaje:'
+        message: "Mensaje:"
         submit: Enviar
         title: Enviar
-        to: 'Email:'
+        to: "Email:"
       success: Email enviado
       text:
         default_title: N/A
-        message: 'Mensaje: %{message}'
+        message: "Mensaje: %{message}"
         subject:
-          one: 'Ficha artículo: %{title}'
+          one: "Ficha artículo: %{title}"
           other: Ficha artículos
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default:
         one: entrada
@@ -102,15 +102,15 @@ es:
           count: Ordenación numérica
           index: Ordenación A-Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtro %{field_label}
+          placeholder: Filtrar...
         title: Limite su búsqueda
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Eliminar la restricción%{label}: %{value}'
+          label_value: "Eliminar la restricción%{label}: %{value}"
           value: Eliminar la restricción %{value}
-        title: 'Usted ha buscado:'
+        title: "Tus selecciones:"
       form:
         search:
           label: buscar
@@ -129,6 +129,7 @@ es:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} seleccionado"
         title: "%{constraints} - %{application_name} Resultados de la búsqueda"
+        joiner: " / "
       pagination:
         title: Resultados de navegación
       pagination_info:
@@ -145,7 +146,6 @@ es:
         submit: Actualización
         title: El número de resultados a mostrar por página
       rss_feed: RSS de los resultados
-      search_constraints_header: Buscar
       search_results: Resultados de la búsqueda
       show:
         label: "%{label}:"
@@ -157,7 +157,7 @@ es:
       start_over: Volver a empezar
       view:
         list: Lista
-      view_title: 'Ver Resultados por: '
+      view_title: "Ver Resultados por: "
       zero_results:
         modify_search: Intente modificar su búsqueda
         search_everything: Pruebe a buscar de todo
@@ -194,10 +194,10 @@ es:
         carrier_prompt: Por favor, seleccione su compañía telefónica
         submit: Enviar
         title: Enviar SMS
-        to: 'Número de teléfono:'
+        to: "Número de teléfono:"
       success: SMS enviado
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Cité
       clear: Borrar

data/config/locales/blacklight.fr.yml

@@ -32,25 +32,25 @@ fr:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Essayez peut-être avec : %{options}'
+    did_you_mean: "Essayez peut-être avec : %{options}"
     email:
       errors:
         to:
           blank: Vous devez saisir l'adresse de votre destinataire.
           invalid: Vous devez saisir une adresse correcte.
       form:
-        message: 'Message :'
+        message: "Message :"
         submit: Envoyer
         title: Envoyer par courriel
-        to: 'Courriel :'
+        to: "Courriel :"
       success: Message envoyé
       text:
         default_title: N/A
-        message: 'Message : %{message}'
+        message: "Message : %{message}"
         subject:
-          one: 'Une référence : %{title}'
+          one: "Une référence : %{title}"
           other: Des références bibliographiques
-        url: 'URL : %{url}'
+        url: "URL : %{url}"
     entry_name:
       default:
         one: résultat
@@ -102,15 +102,15 @@ fr:
           count: Du + au - fréquent
           index: Tri de A à Z
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Filtre %{field_label}
+          placeholder: Filtre...
         title: Limiter votre recherche
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Supprimer la restriction %{label}: %{value}'
+          label_value: "Supprimer la restriction %{label}: %{value}"
           value: Supprimer la restriction %{value}
-        title: 'Vous avez demandé :'
+        title: "Vos sélections:"
       form:
         search:
           label: Rechercher
@@ -129,6 +129,7 @@ fr:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} sélectionné"
         title: "%{constraints} - %{application_name} Résultats de recherche"
+        joiner: " / "
       pagination:
         title: Navigation dans les résultats
       pagination_info:
@@ -145,7 +146,6 @@ fr:
         submit: mettre à jour
         title: Nombre de résultats à afficher par page
       rss_feed: RSS pour les résultats
-      search_constraints_header: Recherche
       search_results: Résultats de recherche
       show:
         label: "%{label}:"
@@ -157,7 +157,7 @@ fr:
       start_over: Accueil
       view:
         list: Liste
-      view_title: 'Affichage: '
+      view_title: "Affichage: "
       zero_results:
         modify_search: Essayez de modifier votre requête de recherche
         search_everything: essayez de rechercher tout
@@ -194,10 +194,10 @@ fr:
         carrier_prompt: Veuillez choisir votre opérateur
         submit: Envoyer
         title: Envoyer par SMS
-        to: 'Numéro de téléphone :'
+        to: "Numéro de téléphone :"
       success: SMS envoyé
       text:
-        url: 'Lien : %{url}'
+        url: "Lien : %{url}"
     tools:
       citation: Citer
       clear: Effacer

data/config/locales/blacklight.hu.yml

@@ -32,25 +32,25 @@ hu:
       apa: APA
       chicago: Chicago
       mla: MLA
-    did_you_mean: 'Arra gondolt, hogy: %{options}?'
+    did_you_mean: "Arra gondolt, hogy: %{options}?"
     email:
       errors:
         to:
           blank: Kérjük az üzenet elküldéséhez adja meg a címzettet
           invalid: Kérjük érvényes email címet adjon meg
       form:
-        message: 'Üzenet:'
+        message: "Üzenet:"
         submit: Küldés
         title: Email küldése
-        to: 'Email:'
+        to: "Email:"
       success: Email elküldve
       text:
         default_title: N/A
-        message: 'Üzenet: %{message}'
+        message: "Üzenet: %{message}"
         subject:
-          one: 'Adatrekord: %{title}'
+          one: "Adatrekord: %{title}"
           other: Adatrekordok
-        url: 'URL: %{url}'
+        url: "URL: %{url}"
     entry_name:
       default: bejegyzés
       grouped:
@@ -100,15 +100,15 @@ hu:
           count: Numerikus rendezés
           index: A-Z rendezés
         suggest:
-          label: Filter %{field_label}
-          placeholder: Filter...
+          label: Szűrő %{field_label}
+          placeholder: Szűrő...
         title: Szűrje tovább a keresését
       filters:
         label: "%{label}:"
         remove:
-          label_value: 'Feltétel eltávolítása %{label}: %{value}'
+          label_value: "Feltétel eltávolítása %{label}: %{value}"
           value: Feltételek eltávolítása %{value}
-        title: 'Ön ezt kereste:'
+        title: "Az Ön választása:"
       form:
         search:
           label: keresés
@@ -127,6 +127,7 @@ hu:
         constraint: "%{label}: %{value}"
         many_constraint_values: "%{values} kiválasztva"
         title: "%{constraints} - %{application_name} Keresés eredményei"
+        joiner: " / "
       pagination:
         title: Eredmény navigáció
       pagination_info:
@@ -143,7 +144,6 @@ hu:
         submit: Frissítés
         title: Az eredmények száma oldalanként
       rss_feed: Eredmények RSS-ként
-      search_constraints_header: Keresés feltételei
       search_results: Keresés eredményei
       show:
         label: "%{label}:"
@@ -155,11 +155,11 @@ hu:
       start_over: Újrakezdés
       view:
         list: Lista
-      view_title: 'Eredmények megtekintése mint: '
+      view_title: "Eredmények megtekintése mint: "
       zero_results:
         modify_search: Próbálja módosítani keresését
         search_everything: Próbálja meg a keresést az összes mezőben
-        search_fields: 'Ön a következő mező alapján keresett: %{search_fields}'
+        search_fields: "Ön a következő mező alapján keresett: %{search_fields}"
         title: Az Ön keresése nem hozott eredményt
         use_fewer_keywords: Kezdetben használjon kevesebb kulcsszavat, majd finomítsa keresését a bal oldali szűrőlinkekkel.
     search_history:
@@ -192,10 +192,10 @@ hu:
         carrier_prompt: Kérjük válassza ki a szolgáltatót
         submit: Küldés
         title: Küldés SMS-ben
-        to: 'Telefonszám:'
+        to: "Telefonszám:"
       success: SMS elküldve
       text:
-        url: 'Link: %{url}'
+        url: "Link: %{url}"
     tools:
       citation: Hivatkozás
       clear: Eltávolítás