blacklight-spotlight 3.0.0.alpha.3 → 3.0.0.alpha.8

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

@@ -70,11 +70,11 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $no-sidebar-tablet-large-image-width;
         height: $no-sidebar-tablet-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
+      @media (min-width: breakpoint-min("md")) and (min-width: breakpoint-min("lg")) {
         width: $no-sidebar-desktop-large-image-width;
         height: $no-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("lg")) {
+      @media (min-width: breakpoint-min("xl")) {
         width: $no-sidebar-large-desktop-large-image-width;
         height: $no-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -108,11 +108,11 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $with-sidebar-tablet-large-image-width;
         height: $with-sidebar-tablet-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
+      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("xl")) {
         width: $with-sidebar-desktop-large-image-width;
         height: $with-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("lg")) {
+      @media (min-width: breakpoint-min("xl")) {
         width: $with-sidebar-large-desktop-large-image-width;
         height: $with-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -126,7 +126,7 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $with-sidebar-xs-image-width;
         height: $with-sidebar-xs-image-width * $aspect-ratio-factor-medium-image;
       }
-      @media (min-width: breakpoint-min("lg")) {
+      @media (min-width: breakpoint-min("xl")) {
         width: $with-sidebar-large-desktop-medium-image-width;
         height: $with-sidebar-large-desktop-medium-image-width * $aspect-ratio-factor-medium-image;
       }

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

@@ -14,14 +14,18 @@
 .masthead {
   background-color: $masthead-bg;
   border-bottom: 1px solid $border-color;
-  margin-bottom: $padding-large-vertical * 1.5;
+  margin-bottom: $spacer * 1.5;
   padding: 0;
   position: relative;
 
 
   .site-title {
-    margin-top: $padding-large-vertical;
-    padding-bottom: $padding-base-vertical / 2;
+    margin-bottom: 0;
+  }
+
+  .site-title-wrapper {
+    margin-top: $spacer * 1.25;
+    padding-bottom: $spacer * 0.75;
     position: relative;
     white-space: nowrap;
   }
@@ -78,9 +82,13 @@
   .navbar {
     @extend .navbar-dark;
     background-color: $navbar-transparent-page-bg;
-    text-transform: uppercase;
-    .dropdown-menu {
-      text-transform: none;
+
+    .navbar-nav {
+      text-transform: uppercase;
+
+      .dropdown-menu {
+        text-transform: none;
+      }
     }
   }
 

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

@@ -13,7 +13,7 @@
     li {
       flex: 0 0 auto;
       min-width: 60px;
-      padding: $padding-base-vertical $padding-base-horizontal;
+      padding: $spacer $spacer;
       &.active {
         background-color: #999999;
       }

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

@@ -5,18 +5,18 @@
     }
 
     .twitter-typeahead {  
-      margin-bottom: 2*$padding-base-vertical;
+      margin-bottom: 2*$spacer;
     }
   }
   .field-select {
-    margin-top: 2*$padding-base-vertical;
+    margin-top: 2*$spacer;
     select {
       display: inline;
       width: auto;
     }
   }
   .dd3-item {
-    margin-bottom: 2*$padding-base-vertical;
+    margin-bottom: 2*$spacer;
   }
 }
 // Hide the secondary caption field

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

@@ -85,6 +85,10 @@ tr.dd-item {
   &.card, .card {
     padding: 0 0 0 30px;
   }
+
+  .card-header[data-behavior="restore-default"] {
+    min-height: 3rem;
+  }
 }
 .dd3-content.page-admin {
   position: relative;

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

@@ -31,16 +31,16 @@
 
 .st-block__inner {
   div.field + div.field {
-    margin-top: 2 * $padding-large-vertical;
+    margin-top: 2 * $spacer;
   }
 
   .field-select {
-    margin-bottom: $padding-large-vertical;
+    margin-bottom: $spacer;
     @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
-      margin-bottom: 2 * $padding-large-vertical;
+      margin-bottom: 2 * $spacer;
 
       > select {
-        margin-left: 2 * $padding-small-horizontal;
+        margin-left: 2 * $spacer * 0.25;
       }
     }
   }
@@ -48,18 +48,25 @@
 
 #sidebar {
   li {
-    margin-top: $padding-small-vertical;
+    margin-top: $spacer * 0.5;
   }
   h4 {
     line-height: $line-height-lg;
   }
   .contacts-header {
-    margin-top: 4 * $padding-large-vertical;
+    margin-top: 4 * $spacer;
   }
+
+  .contact-properties {
+    padding-left: 1rem;
+    text-indent: -1rem;
+  }
+
   ol.contacts {
     li {
-      margin-bottom: 2 * $padding-large-vertical;
-      margin-top: $padding-small-vertical;
+      margin-bottom: $spacer * .5;
+      margin-top: $spacer * .5;
+      word-break: break-word;
       .name {
         font-weight: bold;
       }
@@ -69,15 +76,16 @@
   ol.sidenav {
     li {
       color: $gray-900;
-      margin-top: $padding-large-vertical;
+      margin-top: $spacer * .25;
     }
 
     ol.subsection {
+      margin-bottom: $spacer;
       padding-left: 0;
       li {
         list-style: square;
         margin-left: 18px;
-        margin-top: $padding-small-vertical;
+        margin-top: $spacer * 0.5;
       }
     }
   }
@@ -91,9 +99,10 @@
 .contact-photo {
   border: 1px solid #ccc;
   border-radius: $border-radius;
+  height: 70px;
   margin-right: 15px;
   margin-top: 3px;
-  max-height: 70px;
+  width: 70px;
 }
 
 // Indent contact fields so they align evenly, only when there is a contact photo
@@ -181,12 +190,12 @@
 .empty-page-block {
   @extend .alert;
   @extend .alert-info;
-  margin-top: $padding-large-vertical;
+  margin-top: $spacer;
   h2 {
     margin-top: 0;
   }
   p, ol > li {
-    padding: $padding-small-vertical;
+    padding: $spacer * 0.5;
   }
   ol > li:last-child {
     padding-bottom: 0;
@@ -195,7 +204,7 @@
 
 .oembed-block {
   @media (max-width: breakpoint-max("md")) {
-    margin-bottom: $padding-base-horizontal;
+    margin-bottom: $spacer;
   }
 
   iframe {
@@ -253,13 +262,13 @@
 .item-features .carousel-indicators {
   @media (max-width: breakpoint-max("sm")) {
     width: 100%;
-    margin-top: 2 * $padding-large-vertical;
+    margin-top: 2 * $spacer;
   }
 }
 
 .carousel-block .carousel-caption h3 {
-  padding-left: 2 * $padding-large-horizontal;
-  padding-right: 2 * $padding-large-horizontal;
+  padding-left: 2 * $spacer;
+  padding-right: 2 * $spacer;
 }
 
 .zpr-link {

data/app/assets/stylesheets/spotlight/_sir-trevor_overrides.scss

@@ -13,8 +13,8 @@
 }
 
 .content-block {
-  margin-top: 3*$padding-large-vertical;
-  margin-bottom: 3*$padding-large-vertical;
+  margin-top: 3*$spacer;
+  margin-bottom: 3*$spacer;
 }
 
 // Sir-trevor sets the overflow to hidden which
@@ -76,10 +76,9 @@
 .st-block-controls__button {
   @extend .btn;
   @extend .btn-secondary;
+  @extend .btn-outline-secondary;
 
-  background-color: theme-colors("secondary");
   border: 1px solid $gray-700;
-  color: theme-colors("light");
 
   .st-icon {
     margin-left: auto;

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

@@ -70,6 +70,7 @@
       margin: 0;
       border: none;
       border-radius: 0;
+      opacity: 1;
 
       @extend .list-group-item;
     }

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

@@ -5,7 +5,6 @@
 @import "spotlight/sir-trevor_overrides";
 @import "spotlight/attachments";
 @import "spotlight/pages";
-@import 'blacklight_gallery/default';
 @import "spotlight/browse";
 @import "spotlight/header";
 @import "spotlight/footer";
@@ -32,6 +31,7 @@
 @import "spotlight/collapse_toggle";
 @import "spotlight/translations";
 @import "spotlight/utilities";
+@import "spotlight/accessibility";
 
 
 

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

@@ -4,7 +4,7 @@
   }
 
   .browse-category-title {
-    margin-bottom: $padding-base-vertical;
+    margin-bottom: $spacer;
 
     label {
       font-weight: normal;
@@ -12,7 +12,7 @@
   }
 
   .browse-category-description {
-    margin-bottom: $padding-large-vertical * 2;
+    margin-bottom: $spacer * 2;
   }
 
   .table.table-striped th {
@@ -28,11 +28,11 @@
 
 .form-group.translation-form {
   .col-form-label {
-    padding-top: $card-spacer-y + $padding-base-vertical;
+    padding-top: $card-spacer-y + $spacer;
   }
 
   .translation-complete {
-    padding-top: $card-spacer-y + $padding-base-vertical;
+    padding-top: $card-spacer-y + $spacer;
   }
 }
 
@@ -73,7 +73,7 @@
   display: block;
   font-size: $h4-font-size;
   font-weight: bold;
-  margin-bottom: $padding-large-vertical * 2;
-  margin-top: $padding-large-vertical;
+  margin-bottom: $spacer * 2;
+  margin-top: $spacer;
   padding-bottom: 3px;
 }

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

@@ -1,3 +1,7 @@
 .inline-block {
   display: inline-block;
 }
+
+.btn-sizing {
+  @include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
+}

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

@@ -9,6 +9,14 @@ module Spotlight
     include Blacklight::Base
     include Spotlight::Config
 
+    included do
+      helper_method :controller_tracking_method
+    end
+
+    def controller_tracking_method
+      Spotlight::Engine.config.controller_tracking_method
+    end
+
     # This overwrites Blacklight::Configurable#blacklight_config
     def blacklight_config
       exhibit_specific_blacklight_config

data/app/controllers/spotlight/admin_users_controller.rb

@@ -10,7 +10,10 @@ module Spotlight
 
     load_and_authorize_resource :site, class: 'Spotlight::Site'
 
-    def index; end
+    def index
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.admin_users.index.page_title')
+    end
 
     def create
       if update_roles

data/app/controllers/spotlight/catalog_controller.rb

@@ -209,9 +209,9 @@ module Spotlight
       if current_browse_category
         add_breadcrumb current_browse_category.exhibit.main_navigations.browse.label_or_default, exhibit_browse_index_path(current_browse_category.exhibit)
         add_breadcrumb current_browse_category.title, exhibit_browse_path(current_browse_category.exhibit, current_browse_category)
-      elsif current_page_context && current_page_context.title.present? && !current_page_context.is_a?(Spotlight::HomePage)
+      elsif current_page_context&.title&.present? && !current_page_context.is_a?(Spotlight::HomePage)
         add_breadcrumb current_page_context.title, [current_page_context.exhibit, current_page_context]
-      elsif current_search_session
+      elsif current_search_session && !current_page_context&.is_a?(Spotlight::HomePage)
         add_breadcrumb t(:'spotlight.catalog.breadcrumb.index'), search_action_url(current_search_session.query_params)
       end
 

data/app/controllers/spotlight/exhibits_controller.rb

@@ -22,6 +22,8 @@ module Spotlight
 
     def new
       build_initial_exhibit_contact_emails
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.exhibits.new.page_title')
     end
 
     def process_import

data/app/controllers/spotlight/pages_controller.rb

@@ -19,10 +19,6 @@ module Spotlight
 
     helper_method :get_search_results, :search_results, :fetch, :page_collection_name, :presenter
 
-    before_action do
-      blacklight_config.track_search_session = false
-    end
-
     # GET /exhibits/1/pages
     def index
       # set up a model the inline "add a new page" form

data/app/controllers/spotlight/sites_controller.rb

@@ -8,9 +8,15 @@ module Spotlight
     before_action :load_site
     load_and_authorize_resource
 
-    def edit; end
+    def edit
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.sites.edit.page_title')
+    end
 
-    def edit_exhibits; end
+    def edit_exhibits
+      add_breadcrumb t(:'spotlight.sites.home'), root_url
+      add_breadcrumb t(:'spotlight.sites.edit_exhibits.page_title')
+    end
 
     def update
       if @site.update(site_params)

data/app/controllers/spotlight/translations_controller.rb

@@ -7,7 +7,9 @@ module Spotlight
     before_action :authenticate_user!, :set_language, :set_tab
     load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
 
-    def edit; end
+    def edit
+      attach_breadcrumbs
+    end
 
     def update
       if current_exhibit.update(exhibit_params)
@@ -21,6 +23,12 @@ module Spotlight
 
     private
 
+    def attach_breadcrumbs
+      add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
+      add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
+      add_breadcrumb t(:'spotlight.curation.sidebar.translations')
+    end
+
     def exhibit_params
       params.require(:exhibit).permit(translations_attributes: %i[id locale key value])
     end

data/app/helpers/spotlight/pages_helper.rb

@@ -67,8 +67,9 @@ module Spotlight
       end
     end
 
+    # Insert soft breaks into email addresses so they wrap nicely
     def render_contact_email_address(address)
-      mail_to address, address
+      mail_to address, sanitize(address).gsub(/([@\.])/, '\1<wbr />').html_safe
     end
 
     def configurations_for_current_page