blacklight-spotlight 3.6.0.beta9 → 4.0.0

data/app/views/spotlight/translations/_general.html.erb

@@ -12,13 +12,13 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-title'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-basic-settings-title'>
           <%= translation_fields.label :value, t('.basic_settings.title'), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= current_exhibit[:title] %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>
@@ -33,13 +33,13 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-subtitle'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-basic-settings-subtitle'>
           <%= translation_fields.label :value, t('.basic_settings.subtitle'), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= current_exhibit[:subtitle] %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>
@@ -54,13 +54,13 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='row form-group translation-form translation-basic-settings-description'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-basic-settings-description'>
           <%= translation_fields.label :value, t('.basic_settings.description'), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_area_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= current_exhibit.description %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>
@@ -81,13 +81,13 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-home'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-main-menu-home'>
           <%= translation_fields.label :value, t('.main_menu.home'), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= t(:'spotlight.curation.nav.home', locale: I18n.default_locale) %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>
@@ -104,13 +104,13 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-<%= navigation.nav_type %>'>
+          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-main-menu-<%= navigation.nav_type %>'>
             <%= translation_fields.label :value, t(".main_menu.#{navigation.nav_type}", default: navigation.default_label), class: 'col-form-label col-12 col-sm-2' %>
             <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <small class="form-text text-muted">
+              <div class="form-text text-muted mb-3">
                 <%= navigation[:label].presence || navigation.default_label %>
-              </small>
+              </div>
             </div>
             <div class='col-1'>
               <% if translation.value.present? %>
@@ -127,13 +127,13 @@
       <%= f.fields_for :translations, translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item='true' class='row form-group translation-form translation-main-menu-search-results'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form translation-main-menu-search-results'>
           <%= translation_fields.label :value, t('spotlight.catalog.breadcrumb.index'), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= t(:'spotlight.catalog.breadcrumb.index', locale: I18n.default_locale) %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>

data/app/views/spotlight/translations/_groups.html.erb

@@ -9,7 +9,7 @@
       <%= f.fields_for :translations, title_translation do |translation_fields| %>
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
-        <div data-translation-progress-item="true" class="row form-group browse-group-title">
+        <div data-translation-progress-item="true" class="row form-group mb-3 browse-group-title">
           <%= translation_fields.label :value, group[:title], class: 'col-form-label col-12 col-sm-2' %>
           <div class="col-11 col-sm-9">
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>

data/app/views/spotlight/translations/_import.html.erb

@@ -1,24 +1,37 @@
 <% if can? :import_translations, Spotlight::Exhibit %>
-  <div class="row col-md-12 mb-5">
-    <h2><%= t(:'.header') %></h2>
-    <p class="instructions"><%= t(:'.description') %></p>
-
-    <%= bootstrap_form_for current_exhibit, url: spotlight.import_exhibit_translations_path(current_exhibit), html: { class: 'row col-md-12 align-items-center clearfix mb-3', multipart: true } do |f| %>
-      <%= f.label :value, t(".import_label"), class: 'col-form-label col-12 col-sm-3 pl-0 translation-import-export-label' %>
-
-      <div class="input-group col px-0">
-        <%= file_field_tag :file, class: 'form-control' %>
-        <%= hidden_field_tag :tab, 'import', id: nil %>
-        <div class="input-group-append">
-          <%= f.submit t(:'.import_submit'), class: 'btn btn-primary' %>
+  <div class="row">
+    <div class="col-md-12 mb-5">
+      <h2><%= t(:'.header') %></h2>
+      <p class="instructions"><%= t(:'.description') %></p>
+      <%= bootstrap_form_for current_exhibit, url: spotlight.import_exhibit_translations_path(current_exhibit), html: { class: 'mb-3', multipart: true } do |f| %>
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-12 col-md-3 text-md-right text-md-end">
+              <%= f.label :value, t(".import_label"), class: 'col-form-label' %>
+            </div>
+            <div class="col-12 col-md-9">
+              <div class="input-group">
+                <%= file_field_tag :file, class: 'form-control' %>
+                <%= hidden_field_tag :tab, 'import', id: nil %>
+                <div class="input-group-append">
+                  <%= f.submit t(:'.import_submit'), class: 'btn btn-primary' %>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      <% end %>
+      <div class="container-fluid">
+        <div class="row">
+          <div class="col-form-label col-12 col-md-3 text-md-right text-md-end">
+            <%= content_tag :span, t(".export_label") %>
+          </div>
+          <div class="col-12 col-md-9">
+            <%= link_to t(:'.export_current_locale', language: t(:"locales.#{@language}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: @language), class: 'btn btn-primary mr-3 me-3' %>
+            <%= link_to t(:'.export_default_locale', language: t(:"locales.#{I18n.default_locale}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: I18n.default_locale), class: 'btn btn-primary' %>
+          </div>
         </div>
       </div>
-    <% end %>
-    <div class="row col-md-12 align-items-center">
-      <%= content_tag :span, t(".export_label"), class: 'col-form-label col-12 col-sm-3 pl-0 translation-import-export-label' %>
-
-      <%= link_to t(:'.export_current_locale', language: t(:"locales.#{@language}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: @language), class: 'btn btn-primary mr-3' %>
-      <%= link_to t(:'.export_default_locale', language: t(:"locales.#{I18n.default_locale}")), spotlight.exhibit_translations_path(current_exhibit, format: "yaml", locale: I18n.default_locale), class: 'btn btn-primary' %>
     </div>
   </div>
 <% end %>

data/app/views/spotlight/translations/_metadata.html.erb

@@ -10,13 +10,13 @@
         <%= translation_fields.hidden_field :key %>
         <%= translation_fields.hidden_field :locale %>
 
-        <div data-translation-progress-item='true' class='row form-group translation-form'>
+        <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
           <%= translation_fields.label :value, t("spotlight.search.fields.#{key}", default: field_config.label, locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
           <div class='col-11 col-sm-9 card card-body panel-translation'>
             <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-            <small class="form-text text-muted">
+            <div class="form-text text-muted mb-3">
               <%= field_config.label %>
-            </small>
+            </div>
           </div>
           <div class='col-1'>
             <% if translation.value.present? %>
@@ -41,13 +41,13 @@
             <%= translation_fields.hidden_field :key %>
             <%= translation_fields.hidden_field :locale %>
 
-            <div data-translation-progress-item='true' class='row form-group translation-form'>
+            <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
               <%= translation_fields.label :value, t("spotlight.search.fields.#{custom_field.field}", default: custom_field.configuration['label'], locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
               <div class='col-11 col-sm-9 card card-body panel-translation'>
                 <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-                <small class="form-text text-muted">
+                <div class="form-text text-muted mb-3">
                   <%= custom_field.configuration['label'] %>
-                </small>
+                </div>
               </div>
               <div class='col-1'>
                 <% if translation.value.present? %>

data/app/views/spotlight/translations/_page.html.erb

@@ -30,7 +30,7 @@
   <td class="text-center">
     <%= f.fields_for :pages, translated_page do |p| %>
       <%= p.hidden_field :id %>
-      <%= p.label :published, class: 'sr-only' %>
+      <%= p.label :published, class: 'sr-only visually-hidden' %>
       <%= p.check_box_without_bootstrap :published, disabled: p.object.home_page? %>
     <% end if translated_page %>
   </td>

data/app/views/spotlight/translations/_search_fields.html.erb

@@ -14,13 +14,13 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group translation-form'>
+          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
             <%= translation_fields.label :value, t("spotlight.search.fields.search.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
             <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <small class="form-text text-muted">
+              <div class="form-text text-muted mb-3">
                 <%= search_config.label %>
-              </small>
+              </div>
             </div>
             <div class='col-1'>
               <% if translation.value.present? %>
@@ -44,13 +44,13 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group translation-form'>
+          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
             <%= translation_fields.label :value, t("spotlight.search.fields.facet.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
             <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <small class="form-text text-muted">
+              <div class="form-text text-muted mb-3">
                 <%= facet_config.label %>
-              </small>
+              </div>
             </div>
             <div class='col-1'>
               <% if translation.value.present? %>
@@ -74,13 +74,13 @@
         <%= f.fields_for :translations, translation do |translation_fields| %>
           <%= translation_fields.hidden_field :key %>
           <%= translation_fields.hidden_field :locale %>
-          <div data-translation-progress-item='true' class='row form-group translation-form'>
+          <div data-translation-progress-item='true' class='row form-group mb-3 translation-form'>
             <%= translation_fields.label :value, t("spotlight.search.fields.sort.#{key}", locale: I18n.default_locale), class: 'col-form-label col-12 col-sm-2' %>
             <div class='col-11 col-sm-9 card card-body panel-translation'>
               <%= translation_fields.text_field_without_bootstrap :value, class: 'form-control' %>
-              <small class="form-text text-muted">
+              <div class="form-text text-muted mb-3">
                 <%= sort_config.label %>
-              </small>
+              </div>
             </div>
             <div class='col-1'>
               <% if translation.value.present? %>

data/app/views/spotlight/translations/edit.html.erb

@@ -22,32 +22,32 @@
   <div role="tabpanel">
     <ul class='nav nav-tabs' role="tablist">
       <li role="presentation" class="nav-item">
-        <a href='#general' class="nav-link <%= 'active' if @tab.blank? %>" aria-controls="general" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href='#general' class="nav-link <%= 'active' if @tab.blank? %>" aria-controls="general" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.general.label') %> <span class="badge"></span>
         </a>
       </li>
       <li class="nav-item">
-        <a href="#metadata" class="nav-link <%= 'active' if @tab == 'metadata' %>" aria-controls="metadata" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href="#metadata" class="nav-link <%= 'active' if @tab == 'metadata' %>" aria-controls="metadata" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.metadata.label') %> <span class="badge"></span>
         </a>
       </li>
       <li class="nav-item" >
-        <a href="#search_fields" class="nav-link <%= 'active' if @tab == 'search_fields' %>" aria-controls="search_fields" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href="#search_fields" class="nav-link <%= 'active' if @tab == 'search_fields' %>" aria-controls="search_fields" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.search_fields.label') %> <span class="badge"></span>
         </a>
       </li>
       <li class="nav-item">
-        <a href="#browse" class="nav-link <%= 'active' if @tab == 'browse' %>" aria-controls="browse" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href="#browse" class="nav-link <%= 'active' if @tab == 'browse' %>" aria-controls="browse" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.browse_categories.label') %> <span class="badge"></span>
         </a>
       </li>
       <li class="nav-item">
-        <a href="#groups" class="nav-link <%= 'active' if @tab == 'groups' %>" aria-controls="groups" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href="#groups" class="nav-link <%= 'active' if @tab == 'groups' %>" aria-controls="groups" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.groups.label') %> <span class="badge"></span>
         </a>
       </li>
       <li class="nav-item">
-        <a href="#pages" class="nav-link <%= 'active' if @tab == 'pages' %>" aria-controls="pages" role="tab" data-toggle="tab" data-behavior="translation-progress">
+        <a href="#pages" class="nav-link <%= 'active' if @tab == 'pages' %>" aria-controls="pages" role="tab" data-toggle="tab" data-bs-toggle="tab" data-behavior="translation-progress">
           <%= t('spotlight.translations.pages.label') %> <span class="badge"></span>
         </a>
       </li>

data/config/locales/spotlight.en.yml

@@ -1,5 +1,10 @@
 ---
 en:
+  activemodel:
+    attributes:
+      spotlight/contact_form:
+        email: Your email
+        name: Your name
   activerecord:
     attributes:
       spotlight/contact:
@@ -932,9 +937,9 @@ en:
             one: "%{count} item"
             other: "%{count} items"
         solr_documents_block:
-          zpr_link_html: View <span class="sr-only">%{title}</span> larger
+          zpr_link_html: View <span class="sr-only visually-hidden">%{title}</span> larger
         uploaded_items_block:
-          zpr_link_html: View <span class="sr-only">%{title}</span> larger
+          zpr_link_html: View <span class="sr-only visually-hidden">%{title}</span> larger
     sites:
       edit:
         basic_settings:

data/lib/generators/spotlight/templates/catalog_controller.rb

@@ -19,6 +19,10 @@ class CatalogController < ApplicationController
     # solr field configuration for search results/index views
     config.index.title_field = 'full_title_tesim'
 
+    config.add_results_collection_tool(:sort_widget)
+    config.add_results_collection_tool(:per_page_widget)
+    config.add_results_collection_tool(:view_type_group)
+
     config.add_search_field 'all_fields', label: I18n.t('spotlight.search.fields.search.all_fields')
 
     config.add_sort_field 'relevance', sort: 'score desc', label: I18n.t('spotlight.search.fields.sort.relevance')

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '3.6.0.beta9'
+  VERSION = '4.0.0'
 end

data/vendor/assets/javascripts/bootstrap-tagsinput.js

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   var defaultOptions = {
     tagClass: function(item) {
-      return 'badge badge-info';
+      return 'badge badge-info bg-info';
     },
     itemValue: function(item) {
       return item ? item.toString() : item;

data/vendor/assets/javascripts/sir-trevor.js

@@ -5647,7 +5647,7 @@ Object.assign(Block.prototype, SimpleBlock.fn, __webpack_require__(84), {
           } else if (input.getAttribute('type') === 'checkbox') {
             var value = "";
 
-            if (input.getAttribute('data-toggle')) {
+            if (input.getAttribute('data-toggle') || input.getAttribute('data-bs-toggle')) {
               value = "off";
 
               if (input.checked === true) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta9
+  version: 4.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-25 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -105,16 +105,22 @@ dependencies:
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -1562,9 +1568,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.19
 signing_key: