blacklight-spotlight 4.4.0 → 4.6.0

data/app/views/spotlight/sir_trevor/blocks/_featured_pages_block.html.erb

@@ -3,7 +3,7 @@
     <% featured_pages_block.pages.each_with_index do |page, index| %>
       <div class="box category-<%= (index + 1) %>">
         <%= link_to [spotlight, current_exhibit, page] do %>
-          <div class="browse-category" style='background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.5)) <%= ", url(\"#{page.thumbnail_image_url}\")" if page.thumbnail_image_url %>'>
+          <div class="browse-category" style='background-image: <%= "url(\"#{page.thumbnail_image_url}\")" if page.thumbnail_image_url %>'>
             <div class="category-caption">
               <p class="category-title">
                 <%= page.title %>

data/app/views/spotlight/sir_trevor/blocks/_link_to_search_block.html.erb

@@ -5,7 +5,7 @@
     <% link_to_search_block.searches.each_with_index do |search, index| %>
       <div class="box category-<%= (index + 1) %>">
         <%= link_to spotlight.search_exhibit_catalog_path(search.exhibit, search.query_params || {}) do %>
-          <div class="browse-category" style='background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.5)), url("<%= search.thumbnail.iiif_url if search.thumbnail %>")'>
+          <div class="browse-category" style='background-image: url("<%= search.thumbnail.iiif_url if search.thumbnail %>")'>
             <div class="category-caption">
               <p class="category-title">
                 <%= search.title %>

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

@@ -4,9 +4,7 @@
     <%= hidden_field_tag :language, @language %>
 
     <div class='translation-basic-settings'>
-      <h2 class='translation-subheading'>
-        <%= t('.basic_settings.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'general.basic_settings.label') %>
 
       <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "#{current_exhibit.slug}.title", locale: @language) %>
       <%= f.fields_for :translations, translation do |translation_fields| %>
@@ -73,9 +71,7 @@
       <% end %>
     </div>
     <div class='translation-main-menu'>
-      <h2 class='translation-subheading'>
-        <%= t('.main_menu.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'general.main_menu.label') %>
 
       <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "spotlight.curation.nav.home", locale: @language) %>
       <%= f.fields_for :translations, translation do |translation_fields| %>

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

@@ -14,7 +14,7 @@
                 <%= 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' %>
+                  <%= f.submit t(:'.import_submit'), class: 'btn btn-primary rounded-0 rounded-end' %>
                 </div>
               </div>
             </div>

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

@@ -31,9 +31,7 @@
 
     <% if current_exhibit.custom_fields.any? %>
       <div class='translation-exhibit-specific-fields'>
-        <h2 class='translation-subheading'>
-          <%= t('.exhibit_specific_fields.label') %>
-        </h2>
+        <%= render Spotlight::Translations::SubheadingComponent.new(key: 'metadata.exhibit_specific_fields.label') %>
 
         <% current_exhibit.custom_fields.each do |custom_field| %>
           <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "blacklight.search.fields.#{custom_field.field}", locale: @language) %>

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

@@ -3,17 +3,14 @@
 
   <%= bootstrap_form_for @exhibit, url: polymorphic_path([:update_all, @exhibit, :pages]), layout: :horizontal, control_col: 'col-sm-10', html: {:'data-form-observer' => true} do |f| %>
     <div class="translation-home-page-settings">
-      <h2 class="translation-subheading">
-        <%= t('.home_page.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'pages.home_page.label') %>
+
       <%= render 'pages_table', pages: [current_exhibit.home_page], f: f %>
     </div>
 
     <% if current_exhibit.feature_pages.any? %>
       <div class="translation-feature-page-settings">
-        <h2 class="translation-subheading">
-          <%= t('.feature_pages.label') %>
-        </h2>
+        <%= render Spotlight::Translations::SubheadingComponent.new(key: 'pages.feature_pages.label') %>
 
         <%= render 'pages_table', pages: current_exhibit.feature_pages.for_default_locale, f: f %>
       </div>
@@ -21,9 +18,7 @@
 
     <% if current_exhibit.about_pages.any? %>
       <div class="translation-about-page-settings">
-        <h2 class="translation-subheading">
-          <%= t('.about_pages.label') %>
-        </h2>
+        <%= render Spotlight::Translations::SubheadingComponent.new(key: 'pages.about_pages.label') %>
 
         <%= render 'pages_table', pages: current_exhibit.about_pages.for_default_locale, f: f %>
       </div>

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

@@ -5,9 +5,7 @@
     <%= hidden_field_tag :tab, 'search_fields', id: nil %>
 
     <div class='translation-field-based-search-fields'>
-      <h2 class='translation-subheading'>
-        <%= t('.field_based_search_fields.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.field_based_search_fields.label') %>
 
       <% current_exhibit.blacklight_config.search_fields.select { |_, config| config.if }.each do |key, search_config| %>
         <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "blacklight.search.fields.search.#{key}", locale: @language) %>
@@ -35,9 +33,7 @@
     </div>
 
     <div class='translation-facet-fields'>
-      <h2 class='translation-subheading'>
-        <%= t('.facet_fields.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.facet_fields.label') %>
 
       <% current_exhibit.blacklight_config.facet_fields.each do |key, facet_config| %>
         <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "blacklight.search.fields.facet.#{key}", locale: @language) %>
@@ -65,9 +61,7 @@
     </div>
 
     <div class='translation-sort-fields'>
-      <h2 class='translation-subheading'>
-        <%= t('.sort_fields.label') %>
-      </h2>
+      <%= render Spotlight::Translations::SubheadingComponent.new(key: 'search_fields.sort_fields.label') %>
 
       <% current_exhibit.blacklight_config.sort_fields.each do |key, sort_config| %>
         <% translation = Translation.find_or_initialize_by(exhibit: current_exhibit, key: "blacklight.search.fields.sort.#{key}", locale: @language) %>

data/config/locales/spotlight.en.yml

@@ -720,11 +720,15 @@ en:
         header: Metadata
         instructions: Select metadata fields to display on each type of page. Select a field name to edit its display label. Drag and drop fields to specify the order in which they are displayed.
         order_header: Display and order metadata fields
-        select_all: Select all
+        select_all: All
+        type_label: Type
         view:
           show: Item details
       metadata_field:
         restore_default: Restore default
+        types:
+          custom-field: Exhibit-specific
+          uploaded: Upload
     pages:
       edit:
         header: Edit page

data/lib/generators/spotlight/templates/spotlight.scss

@@ -1,5 +1,4 @@
 @import 'bootstrap-tagsinput';
-@import 'spotlight/variables_bootstrap';
 @import 'bootstrap';
 @import 'sir-trevor/main';
 @import 'leaflet';

data/lib/spotlight/engine.rb

@@ -188,6 +188,13 @@ module Spotlight
       end
     end
 
+    initializer 'components.initialize' do
+      ActiveSupport::Reloader.to_prepare do
+        Spotlight::Engine.config.spotlight = OpenStruct.new
+        Spotlight::Engine.config.spotlight.header_navigation_link_component = Spotlight::HeaderNavigationLinkComponent
+      end
+    end
+
     # After creating a property for your site on Google Analytics, you need to:
     # a) Enable Google Analytics API in https://console.cloud.google.com/
     # b) generate and download the JSON key and make it accessible to your application

data/lib/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.4.0'
+  VERSION = '4.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-26 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -897,7 +897,6 @@ files:
 - app/assets/stylesheets/spotlight/_uploaded_items_block.scss
 - app/assets/stylesheets/spotlight/_utilities.scss
 - app/assets/stylesheets/spotlight/_variables.scss
-- app/assets/stylesheets/spotlight/_variables_bootstrap.scss
 - app/assets/stylesheets/spotlight/_view_larger.scss
 - app/assets/stylesheets/spotlight/browse_group_categories_block.scss
 - app/assets/stylesheets/spotlight/typeahead.scss
@@ -922,6 +921,8 @@ files:
 - app/components/spotlight/analytics/dashboard_component.rb
 - app/components/spotlight/breadcrumbs_component.html.erb
 - app/components/spotlight/breadcrumbs_component.rb
+- app/components/spotlight/bulk_action_component.html.erb
+- app/components/spotlight/bulk_action_component.rb
 - app/components/spotlight/document_admin_table_component.html.erb
 - app/components/spotlight/document_admin_table_component.rb
 - app/components/spotlight/document_component.rb
@@ -931,11 +932,17 @@ files:
 - app/components/spotlight/exhibit_navbar_component.rb
 - app/components/spotlight/header_component.html.erb
 - app/components/spotlight/header_component.rb
+- app/components/spotlight/header_navigation_link_component.html.erb
+- app/components/spotlight/header_navigation_link_component.rb
 - app/components/spotlight/icon_component.rb
+- app/components/spotlight/save_search_component.html.erb
+- app/components/spotlight/save_search_component.rb
 - app/components/spotlight/solr_document_legacy_embed_component.html.erb
 - app/components/spotlight/solr_document_legacy_embed_component.rb
 - app/components/spotlight/tag_list_form_component.html.erb
 - app/components/spotlight/tag_list_form_component.rb
+- app/components/spotlight/translations/subheading_component.html.erb
+- app/components/spotlight/translations/subheading_component.rb
 - app/controllers/concerns/spotlight/base.rb
 - app/controllers/concerns/spotlight/catalog.rb
 - app/controllers/concerns/spotlight/config.rb

data/app/assets/stylesheets/spotlight/_variables_bootstrap.scss

@@ -1,7 +0,0 @@
-// $font-size-base: 14px;
-// $h1-font-size:            floor(($font-size-base * 2.15)) !default; // ~30px
-// $h2-font-size:            floor(($font-size-base * 1.7)) !default; // ~24px
-// $h3-font-size:            ceil(($font-size-base * 1.53)) !default; // ~201px
-// $h4-font-size:            ceil(($font-size-base * 1.21)) !default; // ~17px
-// $h5-font-size:            $font-size-base !default;
-// $h6-font-size:            ceil(($font-size-base * 0.85)) !default; // ~12px