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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2faee384954ac8cb3de9ce3fedee4c5b9dcb8d7d8f28161a41182bbbd3cb06f1
-  data.tar.gz: bb80b682dab6d85a1195eb09259371032f120b55053c1f1d4d138b77eeb238f8
+  metadata.gz: 3fa9f3a7e1e9c57300b2fe7d8e6bd5b9a71060f67023d4af18d98e71a4ab403f
+  data.tar.gz: 56ee1b33497e018c21b2715cb70ffe046cbb20c9b94d29bd8c190a0e6bf98861
 SHA512:
-  metadata.gz: 9008ca36a6e8ca50111935a5b69eb7b74c6f3b5114a594d8e31981bfbf525cf634bded7ee98accdce79cf4862433b8091ceba0f5e17f3464dd24f7b0b6d2f79d
-  data.tar.gz: 1be3d1bf193d008f940de66eba4838b479bd61cbb5b18840dc9de11965b706330991bb96241b01a82b1d3cbd2add7b4b811a530b8a67e9f6159f32dcf899ed41
+  metadata.gz: d983db3c039418272a76203ae52763887394bc6f04100b0d5722142ce122e87a59c7e28eb1c7616a6cbb078c28d5df4f04d1b0a63e1e0b9780058e6b8c9b2ce0
+  data.tar.gz: 1445e0928407f8e5510c0b86b7e2fbfb1ea62d7124ea131ae78fcafb0c183ec6dfab34434c41128d6031ef93a3b16c0d12ff3c371e56d8c7da0d0b15fdb8fefc

data/Rakefile

@@ -34,7 +34,7 @@ task ci: ['engine_cart:generate'] do
   ENV['environment'] = 'test'
 
   SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), 'solr_conf', 'conf')) do
+    solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
       within_test_app do
         system 'bundle install'
         system 'bundle exec rake db:migrate'
@@ -62,7 +62,7 @@ namespace :spotlight do
     Rake::Task['engine_cart:generate'].invoke
 
     SolrWrapper.wrap(port: '8983') do |solr|
-      solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), 'solr_conf', 'conf')) do
+      solr.with_collection(name: 'blacklight-core', dir: File.join(__dir__, 'solr_conf', 'conf')) do
         within_test_app do
           unless File.exist? '.initialized'
             system 'bundle exec rake spotlight:initialize'
@@ -90,7 +90,7 @@ namespace :spotlight do
             Bundler.with_clean_env do
               IO.popen({ 'SPOTLIGHT_GEM' => File.dirname(__FILE__) },
                        ['rails', version, 'new', 'internal', '--skip-spring', '-m', template_path] +
-                          [err: [:child, :out]]) do |io|
+                          [err: %i[child out]]) do |io|
                 IO.copy_stream(io, $stderr)
 
                 _, exit_status = Process.wait2(io.pid)
@@ -116,4 +116,4 @@ namespace :spotlight do
   end
 end
 
-task default: [:rubocop, :ci]
+task default: %i[rubocop ci]

data/app/assets/javascripts/spotlight/admin/appearance.js

@@ -9,9 +9,9 @@ function addRestoreDefaultBehavior(){
     var button = $("[data-restore-default]", $(this));
     hidden.on('blur', function(){
       if( $(this).val() == $(this).data('default-value') ) {
-        button.addClass('hidden');
+        button.addClass('d-none');
       } else {
-        button.removeClass('hidden');
+        button.removeClass('d-none');
       }
     });
     button.on('click', function(e){
@@ -21,4 +21,4 @@ function addRestoreDefaultBehavior(){
       button.hide();
     });
   });
-}
+}

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

@@ -40,25 +40,27 @@ Spotlight.Block.Resources = (function(){
             '<input type="hidden" name="item[' + index + '][title]" value="' + data.title + '" />',
             this._itemPanelIiifFields(index, data),
             '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
-              '<div class="dd3-content card">',
+              '<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="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 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.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 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.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 class="h5" data-panel-image-pagination="true"></div>',
+                  '<div data-panel-image-pagination="true"></div>',
                 '</div>',
               '</div>',
             '</li>'

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

@@ -72,28 +72,27 @@ SirTrevor.Blocks.UploadedItems = (function(){
             '<input type="hidden" name="item[' + index + '][title]" value="' + dataTitle + '" />',
             '<input type="hidden" name="item[' + index + '][url]" data-item-grid-thumbnail="true"  value="' + dataUrl + '"/>',
             '<input data-property="weight" type="hidden" name="item[' + index + '][weight]" value="' + data.weight + '" />',
-            '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
-              '<div class="dd3-content panel">',
-                '<div class="card-header item-grid">',
-                  '<div class="checkbox">',
-                    '<input name="item[' + index + '][display]" type="hidden" value="false" />',
-                    '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + dataId) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
-                    '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + dataId) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
-                  '</div>',
-                  '<div class="pic">',
-                    '<img class="img-thumbnail" src="' + dataUrl + '" />',
-                  '</div>',
-                  '<div class="main form-horizontal">',
-                    '<div class="title card-title">' + dataTitle + '</div>',
-                    '<div class="field">',
-                      '<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"/>',
-                    '</div>',
-                  '</div>',
-                  '<div class="remove float-right">',
-                    '<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
+            '<div class="card d-flex dd3-content">',
+              '<div class="dd-handle dd3-handle"><%= i18n.t("blocks:resources:panel:drag") %></div>',
+              '<div class="card-header d-flex item-grid">',
+                '<div class="checkbox">',
+                  '<input name="item[' + index + '][display]" type="hidden" value="false" />',
+                  '<input name="item[' + index + '][display]" id="'+ this.formId(this.display_checkbox + '_' + dataId) + '" type="checkbox" ' + checked + ' class="item-grid-checkbox" value="true"  />',
+                  '<label class="sr-only" for="'+ this.formId(this.display_checkbox + '_' + dataId) +'"><%= i18n.t("blocks:resources:panel:display") %></label>',
+                '</div>',
+                '<div class="pic">',
+                  '<img class="img-thumbnail" src="' + dataUrl + '" />',
+                '</div>',
+                '<div class="main form-horizontal">',
+                  '<div class="title card-title">' + dataTitle + '</div>',
+                  '<div class="field">',
+                    '<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"/>',
                   '</div>',
                 '</div>',
+                '<div class="remove float-right">',
+                  '<a data-item-grid-panel-remove="true" href="#"><%= i18n.t("blocks:resources:panel:remove") %></a>',
+                '</div>',
               '</div>',
             '</li>'
       ].join("\n");

data/app/assets/javascripts/spotlight/admin/exhibits.js

@@ -13,7 +13,9 @@ Spotlight.onLoad(function() {
     });
   });
 
-  $("#another-email").on("click", function() {
+  $("#another-email").on("click", function(e) {
+    e.preventDefault();
+
     var container = $(this).closest('.form-group');
     var contacts = container.find('.contact');
     var inputContainer = contacts.first().clone();
@@ -23,6 +25,9 @@ Spotlight.onLoad(function() {
       $(this).val('');
       $(this).attr('id', $(this).attr('id').replace('0', contacts.length));
       $(this).attr('name', $(this).attr('name').replace('0', contacts.length));
+      if ($(this).attr('aria-label')) {
+        $(this).attr('aria-label', $(this).attr('aria-label').replace('1', contacts.length + 1));
+      }
     });
 
     inputContainer.find('.contact-email-delete-wrapper').remove();

data/app/assets/javascripts/spotlight/admin/multi_image_selector.js

@@ -4,7 +4,7 @@
   $.fn.multiImageSelector = function(image_versions, clickCallback, activeImageId) {
     var changeLink          = $("<a href='javascript:;'>Change</a>"),
         thumbsListContainer = $("<div class='thumbs-list' style='display:none'></div>"),
-        thumbList           = $("<ul class='pagination'></ul>"),
+        thumbList           = $("<ul></ul>"),
         panel;
 
     var imageIds = $.map(image_versions, function(e) { return e['imageId']; });

data/app/assets/javascripts/spotlight/admin/search_typeahead.js

@@ -49,7 +49,7 @@ function itemsBloodhound() {
 };
 
 function itemsTemplate() {
-  return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>';
+  return '<div class="autocomplete-item{{#if private}} blacklight-private{{/if}}">{{#if thumbnail}}<div class="document-thumbnail"><img class="img-thumbnail" src="{{thumbnail}}" /></div>{{/if}}<span class="autocomplete-title">{{title}}</span><br/><small>&nbsp;&nbsp;{{description}}</small></div>';
 }
 
 function addAutocompletetoFeaturedImage(){

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

@@ -82,7 +82,7 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
 
   solr_documents_embed: {
     title: "Item Embed",
-    description: "This widget embeds exhibit items on a page. Optionally, you can add a heading and/or text to be displayed adjacent to the items.",
+    description: "This widget embeds an exhibit item in a viewer on a page. Optionally, you can add a heading to be displayed above the viewer and/or text to be displayed adjacent to the viewer.",
   },
 
   solr_documents_features: {

data/app/assets/javascripts/spotlight/admin/spotlight_nestable.js

@@ -6,7 +6,12 @@
       init: function(selector){
 
         $(selector || nestableSelector).each(function(){
-          $(this).nestable($(this).data());
+          // Because the Rails helper will not maintain the case that Nestable
+          // expects, we just need to do this manual conversion. :(
+          var data = $(this).data();
+          data.expandBtnHTML = data.expandBtnHtml;
+          data.collapseBtnHTML = data.collapseBtnHtml;
+          $(this).nestable(data);
           updateWeightsAndRelationships($(this));
         });
       }

data/app/assets/javascripts/spotlight/admin/tabs.js

@@ -1,6 +1,6 @@
 Spotlight.onLoad(function(){
   if ($('[role=tabpanel]').length > 0 && window.location.hash) {
     var tabpanel = $(window.location.hash).closest('[role=tabpanel]');
-    $('a[role=tab][href=#'+tabpanel.attr('id')+']').tab('show');  
+    $('a[role=tab][href="#'+tabpanel.attr('id')+'"]').tab('show');
   }
-});
+});

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

@@ -15,7 +15,7 @@
     // this fix is for Firefox
     .handle-wrap {
       position: relative;
-      padding: 8px 8px 8px 40px;
+      padding: 0.75rem 0.75rem 0.75rem 40px;
       margin: 0;
       margin-top: -1px;
 
@@ -80,37 +80,3 @@
     display: inline;
   }
 }
-
-.facet_fields {
-
-  .dd3-content {
-    border: 1px solid $card-border-color;
-    border-radius: .25rem;
-  }
-
-  .options {
-    padding-left: $table-cell-padding;
-
-    .col-form-label {
-      font-weight: 700;
-    }
-
-    .form-group {
-      align-items: center;
-    }
-  }
-
-  .page {
-    padding: $table-cell-padding 0 $table-cell-padding $table-cell-padding;
-
-    .main {
-      align-items: center;
-      margin-left: 0;
-      margin-right: 0;
-    }
-
-    .form-check {
-      float: left;
-    }
-  }
-}

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

@@ -71,26 +71,29 @@ h1,h2,h3,h4,h5,h6 {
   margin-top: 0;
 }
 
-label.radio {
-  font-weight: normal;
-}
-
 #main-container .nav {
   margin-bottom: $line-height-lg * 1rem;
 }
 
-.tab-pane {
-  > p.instructions:first-child, > fieldset:first-child {
-    margin-top: -$padding-base-vertical;
+.nav-tabs {
+  .nav-link.active {
+    font-weight: 600;
   }
+}
+
+.tab-pane {
   fieldset {
-    margin-bottom: $padding-large-vertical * 3;
-    margin-top: $padding-large-vertical * 2;
+    margin-bottom: $padding-large-vertical * 2;
+    margin-top: $padding-large-vertical * 1;
   }
   legend {
     margin-bottom: $padding-large-vertical;
   }
-  div.radio + input[type="file"] {
+  small.form-text {
+    margin-bottom: $spacer;
+    margin-top: $spacer * 0.3125;
+  }
+  div.form-check + input[type="file"] {
     margin-top: $padding-large-vertical;
   }
 }
@@ -100,3 +103,7 @@ label.radio {
     padding-left: 0;
   }
 }
+
+.carousel-block .carousel-indicators li {
+  opacity: 1;
+}

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

@@ -1,9 +1,4 @@
 $image-overlay-max-height: 300px;
-$image-overlay-bottom-margin: 36px;
-
-@function category-min-height($overlay-max-height) {
-  @return $overlay-max-height + $image-overlay-bottom-margin;
-}
 
 .long-description-text {
   margin: ($padding-base-vertical * 2) 0;
@@ -29,13 +24,12 @@ $image-overlay-bottom-margin: 36px;
   }
 
   .category {
-    min-height: category-min-height($image-overlay-max-height);
+    margin-bottom: $spacer * 2;
   }
 
   .image-overlay {
     border: 2px solid $gray-600;
     border-radius: $border-radius-lg;
-    margin-bottom: $image-overlay-bottom-margin;
     max-height: 240px;
     min-height: 140px;
     overflow: hidden;
@@ -78,28 +72,27 @@ $image-overlay-bottom-margin: 36px;
   }
 
   @media screen and (max-width: breakpoint-max("sm")) {
-    .image-overlay {
+    $image-overlay-max-height: 180px;
+    .category {
       margin: 10px auto;
+    }
+
+    .image-overlay {
+      max-height: $image-overlay-max-height;
       max-width: 350px;
     }
     .text-overlay .browse-category-title {font-size: $h3-font-size;}
   }
-  @media screen and (min-width: breakpoint-min("sm")) and (max-width: breakpoint-max("lg")) {
-    $image-overlay-max-height: 250px;
-    .category {min-height: category-min-height($image-overlay-max-height);}
-    .text-overlay .browse-category-title {font-size: $h4-font-size;}
-  }
   @media screen and (min-width: breakpoint-min("sm")) and (max-width: breakpoint-max("md")) {
     $image-overlay-max-height: 180px;
-    .category {min-height: category-min-height($image-overlay-max-height);}
     .image-overlay {max-height: $image-overlay-max-height;}
   }
-  @media screen and (max-width: breakpoint-max("sm")) {
-    $image-overlay-max-height: 180px;
-    .category {min-height: category-min-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;}
   }
   @media screen and (min-width: breakpoint-min("lg")) {
-    .category {min-height: category-min-height($image-overlay-max-height);}
     .image-overlay {max-height: $image-overlay-max-height;}
   }
 }

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

@@ -1,13 +1,19 @@
 #documents.table {
   font-size: $font-size-base;
 
+  .thumbnail-column {
+    box-sizing: content-box;
+    min-width: 60px;
+
+  }
+
   .document-thumbnail {
     border: none;
     margin-bottom: 0;
     padding: 0;
   }
 
-  .document-thumbnail a > img {
+  .document-thumbnail img {
     border: 1px solid $gray-600;
     width: 60px;
     height: 60px;
@@ -27,7 +33,7 @@
 }
 
 #documents.documents-list {
-  .document-thumbnail a > img {
+  .document-thumbnail img {
     max-width: 100px;
   }
 }
@@ -57,6 +63,10 @@
   .add-items-nav {
     margin-bottom: $padding-large-vertical;
   }
+
+  .sort-pagination {
+    border-bottom: 0;
+  }
 }
 
 form.edit_solr_document {
@@ -82,7 +92,7 @@ form.edit_solr_document {
 }
 
 .blacklight-catalog-edit, .blacklight-catalog-show {
-  .thumbnail {
+  .img-thumbnail {
     @extend .col-md-6;
   }
 
@@ -100,7 +110,6 @@ form.edit_solr_document {
 
   #document {
     @extend .clearfix;
-    @extend .row;
   }
 }
 

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

@@ -79,6 +79,19 @@
   display: none;
 }
 
+.home_page .card {
+  .card-body {
+    @extend .py-2;
+    @extend .px-3;
+  }
+
+  .card-title {
+    @extend .mb-0;
+    @extend .py-2;
+  }
+}
+
+
 .card.page-admin {
   &:hover {
     @include panel-hover-highlighting;
@@ -122,24 +135,17 @@
   }
 }
 
-.card-header.search {
-  &:hover {
-    @include panel-hover-highlighting;
+.search_admin {
+  .pic {
+    flex-basis: 70px;
   }
-  /* widths don't add up to 100% because of padding of the container. */
+
   .main {
-    width: 40%;
-    vertical-align: top;
-    display: inline-block;
-    margin-left: $padding-base-horizontal;
+    flex-basis: 40%;
   }
+
   .description {
-    width: 30%;
-    vertical-align: top;
-    display: inline-block;
-  }
-  .card-title {
-    font-size: 15px;
+    flex-basis: 30%;
   }
 }
 
@@ -171,6 +177,7 @@ h1,h2,h3,h4,h5,h6 {
   height: auto;
   min-height: 0;
 }
+
 .spotlight-admin-thumbnail {
   position: relative;
   .badge {