blacklight-spotlight 3.0.0.rc4 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55231336b3b4a0eae1abdd68bbeb8ede968d5ffbe4359f29f83a3a27124a4b05
-  data.tar.gz: b2f2bfc6230b5081493484393a26670961486217b64b7a96b9659979eab64381
+  metadata.gz: 2ef4a4bcb8283379d4091d374feb6d19075868ab8511a6f0727cefea71dda5ab
+  data.tar.gz: cb49bd3be13930c34cbab5320070659a0301f53936b6e0eaf68b0691d0f74387
 SHA512:
-  metadata.gz: c3d2a9d1203e0950c79844e4fad0b2083e3cc8d1b63a357ce47a2760ac48b13ec9c2f4e2f0890add8a533d71f61bf7a96a684b74710c564b3e17d919635b592a
-  data.tar.gz: 842054ed3d1c5d46c5c6f9bb3180efdf83feee8f1bf44ae607865d6bea2f9d4589e1b19990cbb53a65ba4249fd5794dca213830be71b055a28b69e188b29dde7
+  metadata.gz: 0252bbc23f096a58da23ecd47d8b17e1bbfa96dd2ab78e3e677f81d97af948e8ca9665ecd8344ecc18170e13dbd496d2da4d11e928a6f40f6e91e723d711e504
+  data.tar.gz: 793bbd141a4fe2fb01151b8a3eb0366cf8d32f55bf2dacb8dc011e0a743e0fba7cbc3e63ac9268106ed06b41ba059a25536de62d655c3af6f29c8e87a3655c87

data/app/assets/images/blacklight/close.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z"/></svg>

data/app/assets/images/blacklight/zoom_in.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14zm.5-7H9v2H7v1h2v2h1v-2h2V9h-2z"/></svg>

data/app/assets/images/blacklight/zoom_out.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14zM7 9h5v1H7V9z"/></svg>

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

@@ -130,9 +130,16 @@ SirTrevor.Blocks.UploadedItems = (function(){
             '</div>',
             '<input type="file" id="uploaded_item_url" name="file[file_0][file_data]" />',
           '</div>',
+          '<div class="col-md-4">',
+            '<input name="<%= zpr_key %>" type="hidden" value="false" />',
+            '<input name="<%= zpr_key %>" id="<%= formId(zpr_key) %>" data-key="<%= zpr_key %>" type="checkbox" value="true" />',
+            '<label for="<%= formId(zpr_key) %>"><%= i18n.t("blocks:solr_documents:zpr:title") %></label>',
+          '</div>',
         '</div>',
         '<%= text_area() %>',
       '</div>'
-    ].join("\n")
+    ].join("\n"),
+
+    zpr_key: 'zpr_link'
   });
 })();

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

@@ -1,50 +1,16 @@
 Spotlight.onLoad(function() {
-  if($('#solr_document_exhibit_tag_list').length > 0) {
-    // By default tags input binds on page ready to [data-role=tagsinput],
-    // however, that doesn't work with Turbolinks. So we init manually:
-    $('#solr_document_exhibit_tag_list').tagsinput();
-
-    var tags = new Bloodhound({
-      datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.name); },
-      queryTokenizer: Bloodhound.tokenizers.whitespace,
-      limit: 100,
-      prefetch: {
-        url: $('#solr_document_exhibit_tag_list').data('autocomplete_url'),
-        ttl: 1,
-        filter: function(list) {
-          return $.map(list, function(tag) { return { name: tag }; });
-        }
+  $(".visiblity_toggle").blCheckboxSubmit({
+    //css_class is added to elements added, plus used for id base
+    cssClass: "toggle_visibility",
+    //success is called at the end of the ajax success callback
+    success: function (isPublic){
+      // We store the selector of the label to toggle in a data attribute in the form
+      var docTarget = $($(this).data("label-toggle-target"));
+      if ( isPublic ) {
+        docTarget.removeClass("blacklight-private");
+      } else {
+        docTarget.addClass("blacklight-private");
       }
-    });
-
-    tags.initialize();
-
-    $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead({highlight: true, hint: false}, {
-      name: 'tags',
-      displayKey: 'name',
-      source: tags.ttAdapter()
-    }).bind('typeahead:selected', $.proxy(function (obj, datum) {
-      $('#solr_document_exhibit_tag_list').tagsinput('add', datum.name);
-      $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val', '');
-    })).bind('blur', function() {
-      $('#solr_document_exhibit_tag_list').tagsinput('add', $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val'));
-      $('#solr_document_exhibit_tag_list').tagsinput('input').typeahead('val', '');
-    });
-  }
-
-      $(".visiblity_toggle").blCheckboxSubmit({
-          //css_class is added to elements added, plus used for id base
-          cssClass: "toggle_visibility",
-          //success is called at the end of the ajax success callback
-          success: function (isPublic){
-            // We store the selector of the label to toggle in a data attribute in the form
-            var docTarget = $($(this).data("label-toggle-target"));
-            if ( isPublic ) {
-              docTarget.removeClass("blacklight-private");
-            } else {
-              docTarget.addClass("blacklight-private");
-            }
-          }
-      });
-
+    }
+  });
 });

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

@@ -0,0 +1,37 @@
+Spotlight.onLoad(function() {
+  $('[data-autocomplete-tag="true"]').each(function(_i, el) {
+    var $el = $(el);
+    // By default tags input binds on page ready to [data-role=tagsinput],
+    // however, that doesn't work with Turbolinks. So we init manually:
+    $el.tagsinput();
+
+    var tags = new Bloodhound({
+      datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.name); },
+      queryTokenizer: Bloodhound.tokenizers.whitespace,
+      limit: 100,
+      prefetch: {
+        url: $el.data('autocomplete-url'),
+        ttl: 1,
+        filter: function(list) {
+          // Let the dom know that the response has been returned
+          $el.attr('data-autocomplete-fetched', true);
+          return $.map(list, function(tag) { return { name: tag }; });
+        }
+      }
+    });
+
+    tags.initialize();
+
+    $el.tagsinput('input').typeahead({highlight: true, hint: false}, {
+      name: 'tags',
+      displayKey: 'name',
+      source: tags.ttAdapter()
+    }).bind('typeahead:selected', $.proxy(function (obj, datum) {
+      $el.tagsinput('add', datum.name);
+      $el.tagsinput('input').typeahead('val', '');
+    })).bind('blur', function() {
+      $el.tagsinput('add', $el.tagsinput('input').typeahead('val'));
+      $el.tagsinput('input').typeahead('val', '');
+    });
+  });
+});

data/app/assets/javascripts/spotlight/admin/{reindex_monitor.js → progress_monitor.js}

@@ -1,9 +1,9 @@
 Spotlight.onLoad(function() {
-  $('[data-behavior="reindex-monitor"]').reindexMonitor();
+  $('[data-behavior="progress-panel"]').progressMonitor();
 });
 
 (function($) {
-  $.fn.reindexMonitor = function() {
+  $.fn.progressMonitor = function() {
     var monitorElements = this;
     var defaultRefreshRate = 3000;
     var panelContainer;
@@ -11,6 +11,7 @@ Spotlight.onLoad(function() {
 
     $(monitorElements).each(function() {
       panelContainer = $(this);
+      panelContainer.hide();
       var monitorUrl = panelContainer.data('monitorUrl');
       var refreshRate = panelContainer.data('refreshRate') || defaultRefreshRate;
       pollers.push(
@@ -48,10 +49,14 @@ Spotlight.onLoad(function() {
     function updateMonitorPanel(data) {
       panelStartDate().text(data.started_at);
       panelCurrentDate().text(data.updated_at);
-      panelCompleted().text(data.completed);
+      panelCompletedDate().text(data.updated_at);
+      panelCurrent().text(data.completed);
+      setPanelCompleted(data.finished);
       updatePanelTotals(data);
       updatePanelErrorMessage(data);
       updateProgressBar(data);
+
+      panelContainer.show();
     }
 
     function updateProgressBar(data) {
@@ -104,11 +109,17 @@ Spotlight.onLoad(function() {
                .find('[data-behavior="date"]');
     }
 
+    function panelCompletedDate() {
+      return monitorPanel()
+               .find('[data-behavior="monitor-completed"]')
+               .find('[data-behavior="date"]');
+    }
+
     function panelTotals() {
       return monitorPanel().find('[data-behavior="total"]');
     }
 
-    function panelCompleted() {
+    function panelCurrent() {
       return monitorPanel()
                .find('[data-behavior="monitor-current"]')
                .find('[data-behavior="completed"]');
@@ -122,6 +133,16 @@ Spotlight.onLoad(function() {
       return monitorPanel().find('[data-behavior="monitor-error"]');
     }
 
+    function setPanelCompleted(finished) {
+      var panel = monitorPanel().find('[data-behavior="monitor-completed"]');
+
+      if (finished) {
+        panel.show();
+      } else {
+        panel.hide();
+      }
+    }
+
     return this;
   };
 })(jQuery);

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

@@ -72,7 +72,7 @@ SirTrevor.Locales.en.blocks = $.extend(SirTrevor.Locales.en.blocks, {
       secondary: "Secondary caption"
     },
     zpr: {
-      title: 'Display ZPR link'
+      title: 'Offer "View larger" option'
     }
   },
 

data/app/assets/javascripts/spotlight/user/zpr_links.js.erb

@@ -1,29 +1,44 @@
 Spotlight.onLoad(function(){
   $('.zpr-link').on('click', function() {
-    $('#blacklight-modal .modal-content').html('<div id="osd-modal-container"></div>');
+    var modalDialog = $('#blacklight-modal .modal-dialog');
+    var modalContent = modalDialog.find('.modal-content')
+    modalDialog.removeClass('modal-lg')
+    modalDialog.addClass('modal-xl')
+    modalContent.html('<div id="osd-modal-container"></div>');
     var controls = [
-      '<div class="controls">',
-      '  <a id="osd-zoom-in"><%= Blacklight::Icon.new('add_circle').file_source.strip %></a>',
-      '  <a id="osd-zoom-out"><%= Blacklight::Icon.new('remove_circle').file_source.strip %></a>',
-      '  <a id="osd-home"><%= Blacklight::Icon.new('resize_small').file_source.strip %></a>',
-      '  <a id="osd-full-page"><%= Blacklight::Icon.new('custom_fullscreen').file_source.strip %></a>',
+      '<div class="controls d-flex justify-content-center justify-content-md-end">',
+      '  <div class="custom-close-controls pr-3 pt-3">',
+      '    <button type="button" class="btn btn-dark" data-dismiss="modal" aria-hidden="true"><%= Blacklight::Icon.new('close').file_source.strip %></button>',
+      '  </div>',
+      '  <div class="zoom-controls mb-3 mr-md-3">',
+      '    <button id="osd-zoom-in" type="button" class="btn btn-dark"><%= Blacklight::Icon.new('zoom_in').file_source.strip %></button>',
+      '    <button id="osd-zoom-out" type="button" class="btn btn-dark"><%= Blacklight::Icon.new('zoom_out').file_source.strip %></button>',
+      '  </div>',
+      '  <div id="empty-div-required-by-osd"></div>',
       '</div>'
     ].join("\n");
 
-    $('#osd-modal-container').append(controls);
+
     $('#osd-modal-container').append('<div id="osd-div"></div>');
-    $('#osd-div').css('height', '400px');
+    $('#osd-modal-container').append(controls);
 
     $('#blacklight-modal').modal('show');
+    
+    $('#blacklight-modal').one('hidden.bs.modal', function (event) {
+      modalDialog.removeClass('modal-xl')
+      modalDialog.addClass('modal-lg')
+    });
 
     OpenSeadragon({
       id: 'osd-div',
-      zoomInButton:     "osd-zoom-in",
-      zoomOutButton:    "osd-zoom-out",
-      homeButton:       "osd-home",
-      fullPageButton:   "osd-full-page",
-      nextButton:       "osd-next",
-      previousButton:   "osd-previous",
+      zoomInButton: "osd-zoom-in",
+      zoomOutButton: "osd-zoom-out",
+      // This is a hack where OpenSeadragon (if using mapped buttons) requires you
+      // to map all of the buttons.
+      homeButton: "empty-div-required-by-osd",
+      fullPageButton: "empty-div-required-by-osd",
+      nextButton: "empty-div-required-by-osd",
+      previousButton: "empty-div-required-by-osd",
       tileSources: [$(this).data('iiif-tilesource')]
     })
   });

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

@@ -38,6 +38,14 @@ $image-overlay-max-height: 300px;
   }
 }
 
+#main-container .browse-group-navigation.nav {
+  margin-bottom: $spacer;
+
+  .nav-link {
+    margin-bottom: $spacer * .75;
+  }
+}
+
 .browse-landing {
   text-align: center;
   // Placeholder for vertically alignment - might already be available from use in another feature

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

@@ -73,7 +73,6 @@ form.edit_solr_document {
   .bootstrap-tagsinput {
     @extend .clearfix;
     cursor: text;
-    display: block;
   }
   .bg-warning.form-text {
     font-size: 0.9em;
@@ -82,6 +81,7 @@ form.edit_solr_document {
 }
 
 .bootstrap-tagsinput {
+  display: block;
   .twitter-typeahead {
     width: auto;
   }
@@ -117,9 +117,35 @@ form.edit_solr_document {
   @extend .clearfix;
 }
 
-#save-this-search {
-  float:left;
-  margin-right: $spacer * 0.1;
+#sortAndPerPage {
+  align-items: flex-end;
+}
+
+.search-widgets {
+  align-items: flex-start;
+  display: flex;
+  @media (min-width: breakpoint-min("md")) {
+    justify-content: flex-end;
+  }
+  flex-wrap: wrap;
+  width: 60%;
+  margin-left: -1 * $spacer * 0.1;
+
+  .btn, .btn-group {
+    margin-left: $spacer * 0.1;
+    margin-top: $spacer * 0.25;
+  }
+}
+
+.curator-actions {
+  align-items: flex-start;
+  display: flex;
+  @media (min-width: breakpoint-min("md")) {
+    justify-content: flex-end;
+  }
+  order: -1;
+  width: 100%;
+  margin-left: -1 * $spacer * 0.1;
 }
 
 #document,

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

@@ -70,3 +70,12 @@
     display: inline;
   }
 }
+
+.download-csv {
+  align-items: flex-end;
+  display: flex;
+
+  .btn-primary {
+    margin-bottom: $spacer;
+  }
+}

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/_spotlight.scss

@@ -19,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";
@@ -33,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/_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/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;
     }
   }
 }