blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

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

@@ -22,7 +22,7 @@
 }
 
 .item-text {
-  .item-col  {
+  .items-col {
     z-index: 1;
   }
 }

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

@@ -0,0 +1,3 @@
+.modal-body .form-check-label {
+  margin-bottom: 0.5rem;
+}

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

@@ -114,3 +114,11 @@ tr.dd-item {
 .dd3-content .card-header {
   padding: .5rem 1rem
 }
+
+.dd3-content.tag {
+  .dd3-handle {
+    display: none;
+  }
+
+  padding-left: 0;
+}

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

@@ -58,13 +58,18 @@
   }
 
   .contact-properties {
-    padding-left: 1rem;
-    text-indent: -1rem;
+    padding-left: 0.125rem;
+
+    > div {
+      padding-bottom: 5px;
+    }
   }
 
   ol.contacts {
+    line-height: 1.33;
+
     li {
-      margin-bottom: $spacer * .5;
+      margin-bottom: 1rem;
       margin-top: $spacer * .5;
       word-break: break-word;
       .name {
@@ -76,7 +81,7 @@
   ol.sidenav {
     li {
       color: $gray-900;
-      margin-top: $spacer * .25;
+      margin-top: $spacer * .5;
     }
 
     ol.subsection {

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

@@ -5,7 +5,9 @@
 @import "spotlight/sir-trevor_overrides";
 @import "spotlight/attachments";
 @import "spotlight/pages";
+@import "spotlight/breadcrumbs";
 @import "spotlight/browse";
+@import "spotlight/browse_group_categories_block";
 @import "spotlight/header";
 @import "spotlight/footer";
 @import "spotlight/catalog";
@@ -17,6 +19,7 @@
 @import "spotlight/featured_browse_categories_block";
 @import "spotlight/item_text_block";
 @import "spotlight/uploaded_items_block";
+@import "spotlight/modals";
 @import "spotlight/multi_image_selector";
 @import "spotlight/multi_up_item_grid";
 @import "spotlight/slideshow_block";
@@ -31,6 +34,7 @@
 @import "spotlight/collapse_toggle";
 @import "spotlight/translations";
 @import "spotlight/utilities";
+@import "spotlight/view_larger";
 @import "spotlight/accessibility";
 
 

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

@@ -78,3 +78,9 @@
   margin-top: $spacer;
   padding-bottom: 3px;
 }
+
+.translation-import-export-label {
+  @media (min-width: 576px) {
+    text-align: right;
+  }
+}

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

@@ -0,0 +1,22 @@
+#osd-modal-container {
+  .controls {
+    .custom-close-controls {
+      position: absolute;
+      right: 0;
+      top: 0;
+    }
+
+    .zoom-controls {
+      bottom: 0;
+      position: absolute;
+      z-index: 999;
+    }
+    svg {
+      fill: $white;
+    }
+  }
+  #osd-div {
+    background: $gray-700;
+    height: calc(100vh - 80px);
+  }
+}

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

@@ -0,0 +1,92 @@
+@import "tiny-slider";
+
+.browse-group-categories-block {
+  padding-bottom: $spacer * .75;
+  padding-top: $spacer * .75;
+  
+  .browse-categories .browse-category {
+    .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 {
+    display: flex;
+  }
+
+  .browse-group-categories-controls {
+    list-style: none;
+    li {
+      display: inline-block;
+      cursor: pointer;
+    }
+
+    .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+      display: inline-block;
+      fill: $gray-600;
+      height: 44px;
+      width: 44px;
+      
+      &:hover,&:focus {
+        fill: $gray-700;
+      }
+    }
+
+    li[aria-disabled="true"] {
+      cursor: auto;
+    }
+
+    [aria-disabled="true"] {
+      .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+        fill: $gray-400;
+
+        &:hover,&:focus {
+          fill: $gray-400;
+        }
+      }
+    }
+  }
+
+  // Coming from tiny-slider, make sure these disappear when navigating via turbolinks
+  .tns-controls {
+    display: none;
+  }
+
+  @media screen and (min-width: breakpoint-min("md")) {
+    .browse-group-categories-controls {
+      .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right {
+        height: 32px;
+        width: 32px;
+      }
+    }
+
+    &[data-browse-group-categories-count="2"],&[data-browse-group-categories-count="3"] {
+      .browse-group-categories-controls {
+        display: none !important;
+      }
+    }
+  }
+}
+
+[dir="rtl"] {
+  .browse-group-categories-block .blacklight-icon-arrow-alt-circle-left, .blacklight-icon-arrow-alt-circle-right{
+    transform: rotate(180deg);
+  }
+  // Hack to override overflow issue not fixed in RTL upstream in tiny-slider
+  .tns-visually-hidden {
+    left: 0;
+    right: -10000em;
+  }
+}

data/app/assets/stylesheets/spotlight/typeahead.css

@@ -41,37 +41,37 @@
   .tt-suggestion {
     font-size: 18px;
     line-height: 24px;
-    padding: 3px 20px 3px 100px;
+    padding: 3px 1rem 3px 1rem;
     margin-bottom: 1em;
 
     &.tt-cursor {
       color: #fff;
       background-color: #0097cf;
     }
-    p {
-      margin: 0;
-    }
-    .document-thumbnail {
-      float: left;
-      width: 60px;
-      padding: 0;
-      margin: 0;
-      margin-left: -80px;
-      position: relative;
+  }
+}
+
+.tt-dataset-tags {
+  p {
+    white-space: nowrap !important;
+  }
+}
 
-      img {
-        max-width: 60px;
-        max-height: 60px;
-      }
+.autocomplete-item {
+  display: flex;
+
+  p {
+    margin: 0;
+  }
+  .document-thumbnail {
+    margin-right: 1rem;
+    min-width: 60px;
+    padding: 0;
+    width: 60px;
 
-      img:hover {
-        position: absolute;
-        right: -3px;
-        top: -3px;
-        max-width: 160px;
-        max-height: 100px;
-        border: 3px solid theme-colors("info");
-      }
+    img {
+      max-width: 60px;
+      max-height: 60px;
     }
   }
 }

data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb

@@ -21,18 +21,19 @@ module Spotlight
     end
 
     def render_element(element)
-      html_class = 'active' if @context.current_page?(compute_path(element))
+      current = @context.current_page?(compute_path(element)) || element.options&.dig(:current)
+
+      html_class = 'active' if current
 
       @context.content_tag(:li, class: "breadcrumb-item #{html_class}") do
-        @context.link_to_unless_current(element_label(element), compute_path(element), element.options)
+        @context.link_to_unless(current, element_label(element), compute_path(element), element.options&.except(:current))
       end
     end
 
     private
 
     def element_label(element)
-      label = compute_name(element)
-      @context.truncate(label, escape: !label.html_safe?, length: 30, separator: ' ')
+      @context.content_tag(:span, class: 'truncated-value') { compute_name(element) }
     end
   end
 end

data/app/controllers/concerns/spotlight/base.rb

@@ -32,7 +32,7 @@ module Spotlight
     def autocomplete_json_response_for_document(doc)
       {
         id: doc.id,
-        title: CGI.unescapeHTML(view_context.presenter(doc).heading.to_str),
+        title: CGI.unescapeHTML(view_context.document_presenter(doc).heading.to_str),
         thumbnail: doc.first(blacklight_config.index.thumbnail_field),
         full_image_url: doc.first(Spotlight::Engine.config.full_image_field),
         description: doc.id,

data/app/controllers/concerns/spotlight/catalog.rb

@@ -14,20 +14,26 @@ module Spotlight
 
     # Adds a facet to display document visibility for the current exhibit
     # if the user is a curator
+    # rubocop:disable Metrics/MethodLength
     def add_facet_visibility_field
       return unless current_exhibit && can?(:curate, current_exhibit)
 
       blacklight_config.add_facet_field 'exhibit_visibility',
                                         label: I18n.t(:'spotlight.catalog.facets.exhibit_visibility.label'),
                                         query: {
+                                          public: {
+                                            label: I18n.t(:'spotlight.catalog.facets.exhibit_visibility.public'),
+                                            fq: "-#{blacklight_config.document_model.visibility_field(current_exhibit)}:false"
+                                          },
                                           private: {
                                             label: I18n.t(:'spotlight.catalog.facets.exhibit_visibility.private'),
                                             fq: "#{blacklight_config.document_model.visibility_field(current_exhibit)}:false"
                                           }
                                         }
     end
+    # rubocop:enable Metrics/MethodLength
 
-    def render_save_this_search?
+    def render_curator_actions?
       (current_exhibit && can?(:curate, current_exhibit)) &&
         !(params[:controller] == 'spotlight/catalog' && params[:action] == 'admin')
     end

data/app/controllers/concerns/spotlight/search_helper.rb

@@ -4,15 +4,9 @@ module Spotlight
   # ...
   module SearchHelper
     def search_service(user_params = respond_to?(:search_state, true) ? search_state.to_h : {})
-      search_service_class.new(config: blacklight_config, user_params: user_params, **search_service_context)
-    end
+      klass = respond_to?(:search_service_class) ? search_service_class : Blacklight::SearchService
 
-    def search_service_class
-      if defined?(super)
-        super
-      else
-        Blacklight::SearchService
-      end
+      klass.new(config: blacklight_config, user_params: user_params, **search_service_context)
     end
 
     # @return [Hash] a hash of context information to pass through to the search service

data/app/controllers/spotlight/appearances_controller.rb

@@ -30,18 +30,5 @@ module Spotlight
                                       masthead_attributes: featured_image_params,
                                       thumbnail_attributes: featured_image_params)
     end
-
-    def featured_image_params
-      %i[
-        iiif_region iiif_tilesource
-        iiif_manifest_url iiif_canvas_id
-        iiif_image_id
-        display
-        source
-        image
-        document_global_id
-        upload_id
-      ]
-    end
   end
 end

data/app/controllers/spotlight/browse_controller.rb

@@ -9,34 +9,35 @@ module Spotlight
     include Spotlight::Catalog
     include Blacklight::Facet
 
-    load_and_authorize_resource :search, except: :index, through: :exhibit, parent: false
+    load_and_authorize_resource :group, through: :exhibit
+    load_and_authorize_resource :search, through: %i[group exhibit], parent: false
     before_action :attach_breadcrumbs
     before_action :attach_search_breadcrumb, only: :show
     record_search_parameters only: :show
 
-    helper_method :should_render_spotlight_search_bar?, :presenter
+    helper_method :should_render_spotlight_search_bar?
 
     before_action :swap_actions_configuration, only: :show
 
     before_action do
       blacklight_config.track_search_session = false
+      blacklight_config.view.gallery.classes = 'row-cols-2 row-cols-md-4' if blacklight_config.view.key? :gallery
+      blacklight_config.action_mapping.default = blacklight_config.index
+      blacklight_config.action_mapping.show = blacklight_config.index
     end
 
     def index
-      @searches = @exhibit.searches.published
+      @groups = @exhibit.groups.published
+      @searches = @searches.published
     end
 
     def show
       @response, @document_list = search_service.search_results do |builder|
-        builder.with(search_query)
+        builder.with(params.merge(browse_category_id: @search.id))
       end
 
       respond_to do |format|
         format.html
-        format.json do
-          @presenter = Blacklight::JsonPresenter.new(@response, blacklight_config)
-          render template: 'catalog/index'
-        end
       end
     end
 
@@ -44,11 +45,7 @@ module Spotlight
 
     def swap_actions_configuration
       blacklight_config.index.document_actions = blacklight_config.browse.document_actions
-    end
-
-    def search_query
-      @search.query_params['q'] = [@search.query_params['q'], params[:browse_q]].join(' ')
-      @search.merge_params_for_search(params, blacklight_config)
+      blacklight_config.action_mapping.show.top_level_config = :index if blacklight_config.key?(:action_mapping)
     end
 
     ##
@@ -66,10 +63,11 @@ module Spotlight
     def attach_breadcrumbs
       add_breadcrumb t(:'spotlight.curation.nav.home', title: @exhibit.title), @exhibit
       add_breadcrumb(@exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(@exhibit))
+      add_breadcrumb(@group.title, exhibit_browse_groups_path(@exhibit, @group)) if @group.present?
     end
 
     def attach_search_breadcrumb
-      add_breadcrumb @search.full_title, exhibit_browse_path(@exhibit, @search)
+      add_breadcrumb @search.full_title, (@group.present? ? exhibit_browse_group_path(@exhibit, @group, @search) : exhibit_browse_path(@exhibit, @search))
     end
 
     def _prefixes
@@ -123,11 +121,11 @@ module Spotlight
       Spotlight::Engine.config.default_browse_index_view_type
     end
 
-    def presenter(document)
-      view_context.index_presenter(document)
+    def render_save_this_search?
+      false
     end
 
-    def render_save_this_search?
+    def render_curator_actions?
       false
     end
   end