blacklight-spotlight 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b824d393d7e458b70cd977fb7bcf44ebb8a01a42149fafc864279494643da83
-  data.tar.gz: 252004c2bd545f5a02a2ef89e2fc413714a1aabcba17cf36326b7d28367d5f9a
+  metadata.gz: e81518a3e626b78dc9b2c1e12f76deffb597018f8346e646068ae5533a9088fd
+  data.tar.gz: 713b5118b8d18e0a611927af250597c855a18607224851b21fd69b4620d259dc
 SHA512:
-  metadata.gz: c8c4d7c05b5acb51e72e700ef80b18b176234a3f6a8e1f98ff298374da5776c3da8034fdfc4fb800bb3fae2a9657247abf874a8f6f342f539ad690e55d154fe1
-  data.tar.gz: 1ed0b3c2e3518b50aeedc6ab2cf3bf6d19257453722abadedb34565fbcbb8f982b30231042e78db462658f9065ffa33f6df4e53b6bc3698786a95940e47626bc
+  metadata.gz: c28398ba6f1b73939288ea0e3320259581ae0ff06903499d1120c9518c0506e2274f4d7c15d9c0e9d9ed0cf3c6fdd1f8ed31dd3cc93e2401324940215be3235b
+  data.tar.gz: 1017fd63630a575d362cd6b675df840477d5eb3fefc706372283b1499c77952632a48582379162dde287eb360aff5c84c4ffeaaf95ec7fd545b659dbfdfcf61a

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

@@ -48,12 +48,6 @@ $image-overlay-max-height: 300px;
 
 .browse-landing {
   text-align: center;
-  // Placeholder for vertically alignment - might already be available from use in another feature
-  %vertical-align {
-    position: relative;
-    top: 50%;
-    transform: translateY(-50%);
-  }
 
   .category {
     margin-bottom: $spacer;
@@ -77,18 +71,16 @@ $image-overlay-max-height: 300px;
     bottom: 0;
     left: 0;
     width: 100%;
-    height: 100%;
-    background: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, .2), rgba(0, 0, 0, .4));
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
     color: $white;
-    padding: 8%;
+    padding: 50px 20px 20px 20px;
     text-align: center;
-    text-shadow: 0 1px 0 $black;
+
     // prevents potential blur caused by the vertical-align technique
     transform-style: preserve-3d;
 
     .browse-category-title {
       font-size: $h3-font-size;
-      @extend %vertical-align;
 
       .category-subtitle {
         display: block;

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

@@ -61,12 +61,14 @@ $xl-sidebar-five-tile-width: ($container-xl-sidebar * 0.2) - $tile-margin;
   position: relative;
 
   .category-caption {
-    bottom: 16px; // assumes default font-size of 16px, using browser default of 1 rem == 16px
+    bottom: 0px;
     color: $featured-browse-category-caption-color;
     position: absolute;
     text-align: center;
-    text-shadow: 0 1px 0 $black;
     width: 100%;
+    padding: 35px 15px 15px;
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
+    border-radius: $border-radius-lg;
   }
 
   .category-title {

data/app/controllers/spotlight/accessibility_controller.rb

@@ -7,12 +7,7 @@ module Spotlight
     before_action :authenticate_user!
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
-    include Spotlight::Base
-    include Spotlight::SearchHelper
-
     def alt_text
-      authorize! :curate, @exhibit
-
       @limit = 5
       # Sort by newest except for the homepage, which is always first
       pages_with_alt = @exhibit.pages.order(Arel.sql('id = 1 DESC, created_at DESC')).select { |elem| elem.content.any?(&:alt_text?) }
@@ -30,6 +25,8 @@ module Spotlight
       can_have_alt_text = 0
       has_alt_text = 0
       page.content.each do |content|
+        next unless content.alt_text?
+
         content.item&.each_value do |item|
           can_have_alt_text += 1
           has_alt_text += 1 if item['alt_text'].present? || item['decorative'].present?

data/app/models/spotlight/blacklight_configuration.rb

@@ -253,7 +253,7 @@ module Spotlight
         original_config = blacklight_config.index_fields[custom_field.field] || {}
         field = Blacklight::Configuration::IndexField.new original_config.merge(
           custom_field.configuration.merge(
-            key: custom_field.field, field: custom_field.solr_field, custom_field: true
+            key: custom_field.field, field: custom_field.solr_field, custom_field: true, type: 'custom-field'
           )
         )
         [custom_field.field, field]
@@ -358,6 +358,7 @@ module Spotlight
 
       options = f.blacklight_options || {}
       options[:label] = f.label if f.label
+      options[:type] = 'uploaded'
 
       config.add_index_field key, options
     end

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

@@ -36,7 +36,7 @@
     <%= render partial: 'shared/masthead' %>
     <%= content_for?(:header_content) ? yield(:header_content) : "" %>
 
-    <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
+    <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' %>

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

@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>" role="banner">
+<header class="masthead <%= 'image-masthead' if current_masthead %> <%= 'resource-masthead' if resource_masthead? %>">
   <% if current_masthead %>
     <span class='background-container' style="background-image: url('<%= current_masthead.iiif_url %>')"></span>
     <span class='background-container-gradient'></span>

data/app/views/spotlight/bulk_updates/_upload.html.erb

@@ -9,7 +9,7 @@
       <div class="input-group">
         <%= file_field_tag :file, class: 'form-control', accept: '.csv,text/csv', 'aria-described-by': 'bulk-update-form-help' %>
         <div class="input-group-append">
-          <%= f.submit t('.submit'), class: 'btn btn-primary' %>
+          <%= f.submit t('.submit'), class: 'btn btn-primary rounded-0 rounded-end' %>
         </div>
       </div>
     </div>

data/app/views/spotlight/custom_fields/form_group/_text.html.erb

@@ -18,6 +18,6 @@
         <%= f.text_area_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>
     <% end %>
-    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
+    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm col-auto h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
   <% end %>
 </div>

data/app/views/spotlight/custom_fields/form_group/_vocab.html.erb

@@ -18,6 +18,6 @@
         <%= f.text_field_without_bootstrap field.slug, multiple: field.is_multiple?, value: nil, class: "form-control field-#{field.slug}" %>
       </div>
     <% end %>
-    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
+    <%= content_tag :button, t('helpers.action.add_another'), class: 'btn btn-info btn-sm col-auto h-100', data: { action: 'add-another', template_id: "spotlight-field-template-#{field.slug}" } %>
   <% end %>
 </div>

data/app/views/spotlight/feature_pages/_header.html.erb

@@ -2,8 +2,8 @@
   <% page = p.object %>
   <div class="home_page">
     <h2><%= t('spotlight.pages.index.feature_pages.home_pages_header') %></h2>
-    <div class="card d-flex">
-      <div class="card-body d-flex bg-light page main">
+    <div class="card d-flex bg-light">
+      <div class="card-body d-flex page main">
         <div class="flex-grow-1 align-self-center">
           <%= p.hidden_field :id, value: page.id , class: 'form-control form-control-sm' %>
           <h3 class="h6 card-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">

data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb

@@ -27,5 +27,12 @@
         <%= field.check_box_without_bootstrap type, checked: config.send(type), disabled: !config.immutable.send(type).nil?, hide_label: true %>
       </td>
     <% end %>
+    <td class="text-center">
+      <% if config.type %>
+        <%= t(:".types.#{config.type}") %>
+      <% end %>
+    </td>
+
+
   <% end %>
 </tr>

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

@@ -26,6 +26,7 @@
               <%= select_deselect_button %>
             </th>
           <% end %>
+          <th class="text-center"><%= t :'.type_label' %></th>
         </tr>
       </thead>
       <tbody class="metadata_fields dd dd-list" data-behavior="nestable" data-max-depth="1" data-list-node-name="tbody" data-item-node-name="tr" data-expand-btn-HTML=" " data-collapse-btn-HTML=" ">

data/app/views/spotlight/shared/_honeypot_field.html.erb

@@ -1,4 +1,4 @@
-<span style="display:none;visibility:hidden;">
+<div style="display:none;visibility:hidden;">
   <% honeypot_field_name = Spotlight::Engine.config.spambot_honeypot_email_field %>
   <%= f.email_field honeypot_field_name, label: t(:'spotlight.shared.report_a_problem.honeypot_field_explanation') %>
-</span>
+</div>

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

@@ -5,7 +5,7 @@
     <% browse_block.searches.each_with_index do |search, index| %>
       <div class="box category-<%= (index + 1) %>">
         <%= link_to spotlight.exhibit_browse_path(search.exhibit, search) 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/sir_trevor/blocks/_browse_group_categories_block.html.erb

@@ -23,7 +23,7 @@
         <% group.searches.published.each_with_index do |search, index| %>
           <div class="box category-1 justify-content-center justify-content-md-space-around">
             <%= link_to spotlight.exhibit_browse_group_path(current_exhibit, group, search), class: 'justify-content-center' 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/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/_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/config/locales/spotlight.en.yml

@@ -721,10 +721,14 @@ en:
         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
+        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/spotlight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spotlight
-  VERSION = '4.4.0'
+  VERSION = '4.5.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.5.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-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status