blacklight-spotlight 4.6.0 → 4.7.0

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

@@ -42,7 +42,7 @@ $image-overlay-max-height: 300px;
   margin-bottom: $spacer;
 
   .nav-link {
-    margin-bottom: $spacer * .75;
+    margin-bottom: $spacer * 0.75;
   }
 }
 
@@ -61,7 +61,7 @@ $image-overlay-max-height: 300px;
     overflow: hidden;
     position: relative;
 
-    img {
+    .img-responsive {
       width: 100%;
     }
   }
@@ -70,17 +70,22 @@ $image-overlay-max-height: 300px;
     position: absolute;
     bottom: 0;
     left: 0;
+    height: 100%;
     width: 100%;
-    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 45%, rgba(46, 45, 41, 0) 100%);
     color: $white;
-    padding: 50px 20px 20px 20px;
-    text-align: center;
+    padding: 5%;
+    display: flex;
+    flex-direction: column; 
+    justify-content: flex-end;
 
-    // prevents potential blur caused by the vertical-align technique
-    transform-style: preserve-3d;
+    &:hover {
+      background: linear-gradient(rgba(46, 45, 41, 0.7), 0%, rgba(46, 45, 41, 0.7) 100%); 
+    }
 
     .browse-category-title {
       font-size: $h3-font-size;
+      text-align: center;
 
       .category-subtitle {
         display: block;
@@ -93,10 +98,6 @@ $image-overlay-max-height: 300px;
         text-transform: uppercase;
       }
     }
-
-    &:hover {
-      background: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.7));
-    }
   }
 
   @media screen and (max-width: breakpoint-max("sm")) {
@@ -106,19 +107,29 @@ $image-overlay-max-height: 300px;
       max-height: $image-overlay-max-height;
       max-width: 350px;
     }
-    .text-overlay .browse-category-title {font-size: $h3-font-size;}
+    .text-overlay .browse-category-title {
+      font-size: $h3-font-size;
+    }
   }
   @media screen and (min-width: breakpoint-min("sm")) and (max-width: breakpoint-max("md")) {
     $image-overlay-max-height: 240px;
-    .image-overlay {max-height: $image-overlay-max-height;}
+    .image-overlay {
+      max-height: $image-overlay-max-height;
+    }
   }
   @media screen and (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
     $image-overlay-max-height: 250px;
-    .text-overlay .browse-category-title {font-size: $h4-font-size;}
-    .image-overlay {max-height: $image-overlay-max-height;}
+    .text-overlay .browse-category-title {
+      font-size: $h4-font-size;
+    }
+    .image-overlay {
+      max-height: $image-overlay-max-height;
+    }
   }
   @media screen and (min-width: breakpoint-min("lg")) {
-    .image-overlay {max-height: $image-overlay-max-height;}
+    .image-overlay {
+      max-height: $image-overlay-max-height;
+    }
   }
 }
 

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

@@ -65,15 +65,24 @@ $xl-sidebar-five-tile-width: ($container-xl-sidebar * 0.2) - $tile-margin;
     color: $featured-browse-category-caption-color;
     position: absolute;
     text-align: center;
+    height: 100%;
     width: 100%;
-    padding: 35px 15px 15px;
-    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 70%, rgba(46, 45, 41, 0) 100%);
+    padding: 5%;
+    background: linear-gradient(0deg, rgba(46, 45, 41, 0.7) 45%, rgba(46, 45, 41, 0) 100%);
     border-radius: $border-radius-lg;
+    display: flex;
+    flex-direction: column; 
+    justify-content: flex-end;
+  
+    &:hover {
+      background: linear-gradient(rgba(46, 45, 41, 0.7), 0%, rgba(46, 45, 41, 0.7) 100%); 
+    }
   }
 
   .category-title {
     font-size: $h4-font-size;
     line-height: 1.2;
+    text-align: center;
     margin: 0;
     padding: $spacer * 0.25;
 

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

@@ -18,7 +18,6 @@
   padding: 0;
   position: relative;
 
-
   .site-title {
     margin-bottom: 0;
   }
@@ -30,14 +29,6 @@
     white-space: nowrap;
   }
 
-  small {
-    @extend .d-none;
-    @extend .d-md-block;
-    @extend .py-2;
-
-    font-size: $h4-font-size;
-  }
-
   .navbar {
     &:last-child {
       margin-bottom: 0;
@@ -128,12 +119,11 @@
   // especially on light background images.
   .background-container-gradient {
     @include masthead-background-containers();
-    background:
-     linear-gradient(
-       rgba(0, 0, 0, 0.0),
-       rgba(0, 0, 0, 0.4),
-       rgba(0, 0, 0, 0.5)
-     );
+    background: linear-gradient(
+      rgba(0, 0, 0, 0),
+      rgba(0, 0, 0, 0.4),
+      rgba(0, 0, 0, 0.5)
+    );
 
     height: 100%;
   }
@@ -153,12 +143,3 @@
     width: 1px;
   }
 }
-
-#skip-link {
-  margin-left: 1rem;
-  padding-top: 0.5rem;
-  position: absolute;
-  top: 0;
-  z-index: 1000;
-  width: auto;
-}

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

@@ -8,18 +8,6 @@
     .category-caption {
       z-index: 100;
     }
-
-    .hover-overlay {
-      height: 100%;
-      position: absolute;
-      width: 100%;
-    }
-
-    &:hover {
-      .hover-overlay {
-        background: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.7));
-      }
-    }
   }
   
   .spotlight-flexbox.browse-categories .box {

data/app/javascript/spotlight/admin/pages.js

@@ -5,7 +5,7 @@ import Core from 'spotlight/core'
 export default class {
   connect(){
     SirTrevor.setDefaults({
-      iconUrl: Spotlight.sirTrevorIcon,
+      iconUrl: Spotlight.sirTrevorIcon || window.sirTrevorIcon,
       uploadUrl: $('[data-attachment-endpoint]').data('attachment-endpoint'),
       ajaxOptions: {
         headers: {

data/app/jobs/concerns/spotlight/job_tracking.rb

@@ -44,7 +44,7 @@ module Spotlight
     end
 
     def finalize_job_tracker!
-      return unless job_tracker.status == 'in_progress' || job_tracker.status == 'enqueued'
+      return unless %w[in_progress enqueued].include?(job_tracker.status)
 
       job_tracker.update(
         status: @failed ? 'failed' : 'completed',

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

@@ -33,7 +33,7 @@
           <%= masthead_heading_content %>
         </h1>
         <% if masthead_subheading_content %>
-          <small><%= masthead_subheading_content %></small>
+          <small class="d-none d-md-block py-2 fs-4"><%= masthead_subheading_content %></small>
         <% end %>
       <% end %>
     </div>

data/lib/generators/spotlight/install_generator.rb

@@ -122,6 +122,25 @@ module Spotlight
       generate 'blacklight_gallery:install'
     end
 
+    def configure_osd_for_sprockets
+      return unless defined?(Sprockets)
+
+      append_to_file 'app/assets/javascripts/application.js', "\n//= require openseadragon\n//= require openseadragon-rails/openseadragon-rails\n"
+
+      append_to_file 'config/initializers/assets.rb' do
+        <<~CONTENT
+          Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon/images')
+          Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon')
+        CONTENT
+      end
+
+      append_to_file 'app/assets/config/manifest.js', "//= link_tree ../../../node_modules/openseadragon/build/openseadragon/images\n"
+
+      inject_into_file 'app/controllers/application_controller.rb', after: 'class ApplicationController < ActionController::Base' do
+        "\n  helper Openseadragon::OpenseadragonHelper\n"
+      end
+    end
+
     def add_oembed
       unless Bundler.locked_gems.dependencies.key? 'blacklight-oembed'
         gem 'blacklight-oembed', '~> 1.0'
@@ -129,6 +148,12 @@ module Spotlight
       end
       generate 'blacklight_oembed:install'
       copy_file 'config/initializers/oembed.rb'
+
+      return unless defined?(Sprockets)
+
+      # Use the rolled up assets from blacklight-oembed for sprockets
+      gsub_file 'app/assets/javascripts/blacklight_oembed.js', "import oembed from 'blacklight_oembed/oembed'",
+                '//= require blacklight_oembed/oembed'
     end
 
     def add_mailer_defaults

data/lib/generators/spotlight/templates/solr/conf/solrconfig.xml

@@ -16,7 +16,7 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs -->
+  <!-- solr lib dirs: needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
   <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />

data/lib/spotlight/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-spotlight
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2025-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob-status
@@ -1597,7 +1597,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Enable librarians, curators, and others who are responsible for digital collections