blacklight-spotlight 3.0.0.alpha.6 → 3.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8148cceceb619e368c4bffa31b5e42d16bf32e0949b617f0d7214a9deb4e7101
-  data.tar.gz: daa2ff322a5344f0cdd20a3dc2df65f8e0322d2c52dea293ea7182e082a46de5
+  metadata.gz: 8a3577af6f5ec30554f2e91955c7613e6501ef8e95f2822f6a92022626c03230
+  data.tar.gz: e45881b0867cba47bb74a93a7a008a843154383939c8db3abbb0c244e0a6ff57
 SHA512:
-  metadata.gz: 2f7c4277f47edbcfa9b4981e509ad96869c6b4724ed18ecf961c9ba4541b0abd6ecb341871db52cbd492bb12601360d89a7a1e067b589de25d510ccf946520f6
-  data.tar.gz: 8d707819d16753591acd7f43bd863876e2df5d95a6434a2ca9ec67fe09da58767cb74a137cdc183ff80f77d615e88afc688d711b7f1235f1a6ffa47e61f28e3b
+  metadata.gz: 7164e6ebcca3edd4db9d2b95ed7fafb2ec55188de3e16bdf92963b893e6b717dae262a7a2ab5f3fbfbe2e2f8de7a602083e2586b338fdbf5f1f2f96c4f5cb402
+  data.tar.gz: aaf1d73d51efd42699f32e1c9315ee43c4ab5e9bdb85e737eddbd94b4d9cf565e93deb58751074fecc5aaf8461cd82eb68db52fa5189db88df38035125e7ee60

data/README.md

@@ -9,7 +9,7 @@ Read more about what Spotlight is, our motivations for creating it, and how to i
 
 ## Requirements
 
-1. Ruby (2.3.0 or greater)
+1. Ruby (2.5.0 or greater)
 2. Rails (5.1 or greater)
 3. Java (7 or greater) *for Solr*
 4. ImageMagick (http://www.imagemagick.org/script/index.php) due to [carrierwave](https://github.com/carrierwaveuploader/carrierwave#adding-versions)
@@ -93,7 +93,7 @@ Spotlight ships with [`i18n-tasks`](https://github.com/glebm/i18n-tasks) to help
 $ bundle exec i18n-tasks health
 ```
 
-See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki. 
+See [developer-facing instructions for enabling translation](https://github.com/projectblacklight/spotlight/wiki/Translations) on the wiki.
 
 ## Community
 

data/app/assets/javascripts/spotlight/admin/blocks/browse_block.js

@@ -10,7 +10,7 @@ SirTrevor.Blocks.Browse = (function(){
     autocomplete_url: function() {
       return $(this.inner).closest('form[data-autocomplete-exhibit-searches-path]').data('autocomplete-exhibit-searches-path').replace("%25QUERY", "%QUERY");
     },
-    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
+    autocomplete_template: function() { return '<div class="autocomplete-item{{#unless published}} blacklight-private{{/unless}}">{{#if thumbnail_image_url}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail_image_url}}" /></div>{{/if}}<span class="autocomplete-title">{{full_title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>' },
 
     bloodhoundOptions: function() {
       return {
@@ -21,6 +21,60 @@ SirTrevor.Blocks.Browse = (function(){
       };
     },
 
+    _itemPanel: function(data) {
+      var index = "item_" + this.globalIndex++;
+      var checked;
+      if (data.display == "true") {
+        checked = "checked='checked'"
+      } else {
+        checked = "";
+      }
+      var resource_id = data.slug || data.id;
+      var markup = [
+          '<li class="field form-inline dd-item dd3-item" data-resource-id="' + resource_id + '" data-id="' + index + '" id="' + this.formId("item_" + data.id) + '">',
+            '<input type="hidden" name="item[' + index + '][id]" value="' + resource_id + '" />',
+            '<input type="hidden" name="item[' + index + '][full_title]" value="' + (data.full_title || data.title) + '" />',
+            '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
+              '<div class="card d-flex dd3-content">',
+                '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
+                '<div class="card-header item-grid">',
+                  '<div class="d-flex">',
+                    '<div class="checkbox">',
+                      '<input name="item[' + index + '][display]" type="hidden" value="false" />',
+                      '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + data.id) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
+                      '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + data.id) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
+                    '</div>',
+                    '<div class="pic">',
+                      '<img class="img-thumbnail" src="' + (data.thumbnail_image_url || ((data.iiif_tilesource || "").replace("/info.json", "/full/!100,100/0/default.jpg"))) + '" />',
+                    '</div>',
+                    '<div class="main">',
+                      '<div class="title card-title">' + (data.full_title || data.title) + '</div>',
+                      '<div>' + (data.slug || data.id) + '</div>',
+                    '</div>',
+                    '<div class="remove float-right">',
+                      '<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
+                    '</div>',
+                  '</div>',
+                '</div>',
+              '</div>',
+            '</li>'
+      ].join("\n");
+
+      var panel = $(_.template(markup)(this));
+      var context = this;
+
+      $('.remove a', panel).on('click', function(e) {
+        e.preventDefault();
+        $(this).closest('.field').remove();
+        context.afterPanelDelete();
+
+      });
+
+      this.afterPanelRender(data, panel);
+
+      return panel;
+    },
+
     item_options: function() { return [
       '<label>',
         '<input type="hidden" name="display-item-counts" value="false" />',

data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js

@@ -85,9 +85,13 @@ SirTrevor.Blocks.UploadedItems = (function(){
                 '</div>',
                 '<div class="main form-horizontal">',
                   '<div class="title card-title">' + dataTitle + '</div>',
-                  '<div class="field">',
+                  '<div class="field row mr-3">',
                     '<label for="' + this.formId('caption_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:caption") %></label>',
-                    '<input type="text" class="form-control" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
+                    '<input type="text" class="form-control col" id="' + this.formId('caption_' + dataId) + '" name="item[' + index + '][caption]" data-field="caption"/>',
+                  '</div>',
+                  '<div class="field row mr-3">',
+                    '<label for="' + this.formId('link_' + dataId) + '" class="col-form-label col-md-3"><%= i18n.t("blocks:uploaded_items:link") %></label>',
+                    '<input type="text" class="form-control col" id="' + this.formId('link_' + dataId) + '" name="item[' + index + '][link]" data-field="link"/>',
                   '</div>',
                 '</div>',
                 '<div class="remove float-right">',
@@ -99,6 +103,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
 
       var panel = $(_.template(markup)(this));
       panel.find('[data-field="caption"]').val(data.caption);
+      panel.find('[data-field="link"]').val(data.link);
       var context = this;
 
       $('.remove a', panel).on('click', function(e) {

data/app/assets/javascripts/spotlight/admin/crop.es6

@@ -40,6 +40,12 @@ export default class Crop {
     this.renderCropperMap();
 
     if (this.imageLayer) {
+      // Force a broken layer's container to be an element before removing.
+      // Code in leaflet-iiif land calls delete on the image layer's container when removing,
+      // which errors if there is an issue fetching the info.json and stops further necessary steps to execute.
+      if(!this.imageLayer._container) {
+        this.imageLayer._container = $('<div></div>');
+      }
       this.cropperMap.removeLayer(this.imageLayer);
     }
 
@@ -269,6 +275,11 @@ export default class Crop {
 
   successHandler(data, stat, xhr) {
     this.setIiifFields({ tilesource: data.tilesource });
+    this.setUploadId(data.id);
+  }
+
+  setUploadId(id) {
+    $('#' + this.formPrefix + "_upload_id").val(id);
   }
 
   aspectRatioPreservingRectangleEditor(aspect) {

data/app/assets/javascripts/spotlight/admin/sir-trevor/block_controls.js

@@ -40,19 +40,28 @@
       }
     }
 
-    return Object.keys(groups).reduce(function(memo, groupKey) {
-      var group   = groups[groupKey];
-      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + groupKey + "</div></div>");
+    function generateBlock(groups, key) {
+      var group   = groups[key];
+      var groupEl = $("<div class='st-controls-group'><div class='st-group-col-form-label'>" + key + "</div></div>");
       var buttons = group.reduce(function(memo, btn) {
         return memo += btn;
       }, "");
       groupEl.append(buttons);
-      if (memo.length === 0) {
-        return memo += groupEl[0].outerHTML;
-      } else {
-        return memo += "<hr />" + groupEl[0].outerHTML;
+      return groupEl[0].outerHTML;
+    }
+
+    var standardWidgets = generateBlock(groups, i18n.t("blocks:group:undefined"));
+
+    var exhibitWidgets = Object.keys(groups).map(function(key) {
+      if (key !== i18n.t("blocks:group:undefined")) {
+        return generateBlock(groups, key);
       }
-    }, "");
+    }).filter(function (element) {
+      return element != null;
+    });
+
+    var blocks = [standardWidgets].concat(exhibitWidgets).join("<hr />");
+    return blocks;
   }
 
   function render(Blocks, availableTypes) {
@@ -65,7 +74,7 @@
     elButtons.appendChild(el);
     return elButtons;
   }
-  
+
   global.Spotlight.BlockControls = function() { };
   global.Spotlight.BlockControls.create = function(editor) {
     // REFACTOR - should probably not know about blockManager
@@ -83,10 +92,10 @@
       SirTrevor = null;
       el = null;
     }
-    
+
     function insert(e) {
       e.stopPropagation();
-      
+
       var parent = this.parentNode;
       if (!parent || hide() === parent) { return; }
       $('.st-block__inner', parent).after(el);
@@ -101,7 +110,7 @@
 
     $(editor.wrapper).delegate(".st-block-replacer", "click", insert);
     $(editor.wrapper).delegate(".st-block-controls__button", "click", insert);
-    
+
     return {
       el: el,
       hide: hide,

data/app/assets/javascripts/spotlight/admin/sir-trevor/locales.js

@@ -29,8 +29,9 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
 
   uploaded_items: {
     title: "Uploaded Item Row",
-    description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items.",
-    caption: 'Caption'
+    description: "This widget displays uploaded items in a horizontal row. Optionally, you can add a heading and/or text to be displayed adjacent to the items. The item caption and link URL fields are also optional.",
+    caption: 'Caption',
+    link: 'Link URL'
   },
 
   featured_pages: {

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

@@ -0,0 +1,8 @@
+// Global accessibility overrides
+
+// Increase visibility of Firefox focus indicator
+@-moz-document url-prefix() {
+  :focus {
+    outline: $input-focus-border-color auto 5px;
+  }
+}

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

@@ -26,6 +26,18 @@ $image-overlay-max-height: 300px;
   }
 }
 
+.blacklight-browse-show {
+  .subtitle {
+    padding-right: $spacer;
+
+    &::before {
+      content: " \000B7 ";
+      color: $text-muted;
+      padding-right: $spacer / 2;
+    }
+  }
+}
+
 .browse-landing {
   text-align: center;
   // Placeholder for vertically alignment - might already be available from use in another feature
@@ -70,6 +82,10 @@ $image-overlay-max-height: 300px;
       font-size: $h3-font-size;
       @extend %vertical-align;
 
+      .category-subtitle {
+        display: block;
+      }
+
       small {
         display: block;
         color: $white;

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

@@ -38,23 +38,10 @@
     display: inline-block;
     margin-bottom: 0;
   }
-  .checkbox {
-    width: 3%;
-    vertical-align: top;
-    display: inline-block;
-    padding-top: 0;
-  }
-
-  .publish-control {
-    display: inline;
-
-    .checkbox {
-      padding-top: 0;
-    }
 
-    .form-check-inline {
-      vertical-align: middle;
-    }
+  .form-check-inline {
+    margin-top: -3px;
+    vertical-align: middle;
   }
 
   .main {
@@ -229,3 +216,9 @@ table.tags {
     text-align: center;
   }
 }
+
+.card-title .subtitle::before {
+  content: " \000B7 ";
+  color: $text-muted;
+  padding-right: 3px;
+}

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

@@ -55,6 +55,9 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
     margin: 0;
     padding: $spacer / 4;
   }
+  .category-subtitle {
+    display: block;
+  }
   .item-count {
     font-size: $font-size-base;
     text-transform: uppercase;
@@ -74,7 +77,7 @@ $aspect-ratio-factor-medium-image: 1; // 1:1 width: height
         width: $no-sidebar-desktop-large-image-width;
         height: $no-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         width: $no-sidebar-large-desktop-large-image-width;
         height: $no-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -108,11 +111,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("xl")) {
+      @media (min-width: breakpoint-min("md")) and (max-width: breakpoint-max("lg")) {
         width: $with-sidebar-desktop-large-image-width;
         height: $with-sidebar-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
-      @media (min-width: breakpoint-min("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         width: $with-sidebar-large-desktop-large-image-width;
         height: $with-sidebar-large-desktop-large-image-width * $aspect-ratio-factor-large-image;
       }
@@ -126,7 +129,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("xl")) {
+      @media (min-width: breakpoint-min("lg")) {
         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

@@ -79,7 +79,7 @@
 .image-masthead {
   background-color: $black;
 
-  .navbar {
+  .exhibit-navbar {
     @extend .navbar-dark;
     background-color: $navbar-transparent-page-bg;
 

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

@@ -21,6 +21,12 @@
   }
 }
 
+.item-text {
+  .item-col  {
+    z-index: 1;
+  }
+}
+
 .item-text-admin {
   .text-align {
     margin-top: 15px;

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

@@ -80,6 +80,7 @@
     }
 
     ol.subsection {
+      margin-bottom: $spacer;
       padding-left: 0;
       li {
         list-style: square;
@@ -98,9 +99,10 @@
 .contact-photo {
   border: 1px solid #ccc;
   border-radius: $border-radius;
+  height: 70px;
   margin-right: 15px;
   margin-top: 3px;
-  max-height: 70px;
+  min-width: 70px;
 }
 
 // Indent contact fields so they align evenly, only when there is a contact photo

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

@@ -1,7 +1,10 @@
 #report-problem-form {
   display: none;
-  background-color: #e7e7e7;
-  border-bottom: 1px dotted $gray-600;
+  border-bottom: 1px solid $gray-600;
+
+  h2 {
+    @extend .sr-only;
+  }
 }
 
 @include media-breakpoint-up(sm) {

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

@@ -31,6 +31,7 @@
 @import "spotlight/collapse_toggle";
 @import "spotlight/translations";
 @import "spotlight/utilities";
+@import "spotlight/accessibility";
 
 
 

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

@@ -36,6 +36,7 @@
   }
 }
 
+.translation-subtitle-toggle,
 .translation-description-toggle {
   margin: 0;
   padding: 0;

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