blacklight-gallery 1.7.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f1e7482c4ccd593780df7fe914534583e803b8cb7586a98db381f425ca3326
-  data.tar.gz: f91d53c9e4d750ab085d7ba97c1a67f7d26e2dde31541b273e7195098453fedb
+  metadata.gz: fa60fe858f02cf0e8ad35e15410446d6cfdf10d27a2ce2a1fc4f7e76da748b18
+  data.tar.gz: ab1a86345f1f78c5b24ac90b5ad9d8d5f3d63b69f0366daa1a59ab68ed5d3768
 SHA512:
-  metadata.gz: 5ed81094a38b233941ad06c6b62e5555a407809151d87b902c9d5422fbe3953f9a58691510253c407f3f7e756b9d703ab4da4515558ecb9caf3cdbe6fdd986ce
-  data.tar.gz: 05cca47ed3750c5c3b8663b910a106d1d1b2437d36e46972c7a52a215659966c0b1798f16dabb35601674f9234b3cb87777afafd426e71566a03ade868d485dd
+  metadata.gz: c28c9ab1878442fdfce7988a43cb17e4f5890bcb015d7f3e46e7d2a542432d715de5f29eb885ec2d94aa04aee7fc6d290165db08ed28438ae511fb54edd4e576
+  data.tar.gz: a0f0f5a415e6e7c44fa71d48cc24922548c65bc7de08be422924ff7aba431cb3e315d7ee9774aeecaec0c761596ca73266a7b625be0fd206418f3308a735e2c0

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 14H9V8h2v8zm4 0h-2V8h2v8z"></path></svg

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 14.5v-9l6 4.5-6 4.5z"></path></svg>

data/app/assets/javascripts/blacklight_gallery/slideshow.js

@@ -72,12 +72,16 @@
       var $img = this.$element.find('.frame img'),
           _this = this;
 
-      // pause slideshow on image mouseenter event
-      $img.on('mouseenter', function() {  _this.pause(); });
+      $(document).on('click', '[data-behavior="pause-slideshow"]', function(e) {
+        e.preventDefault();
+
+        _this.pause();
+      });
+
+      $(document).on('click', '[data-behavior="start-slideshow"]', function(e) {
+        e.preventDefault();
 
-      // play slideshow on image mouseleave event
-      $img.on('mouseleave', function() {
-        if (_this.options.autoPlay) _this.play();
+        _this.play();
       });
 
       $(document).on('click', '[data-slide], [data-slide-to]', function(e) {
@@ -99,7 +103,7 @@
 
 
   Slideshow.DEFAULTS = {
-    autoPlay: true,
+    autoPlay: false,
     interval: 5000 // in milliseconds
   }
 

data/app/assets/stylesheets/blacklight_gallery/_osd_viewer.scss

@@ -1,4 +1,4 @@
-#document {
+.openseadragon-container {
 
   .osd-toolbar {
     padding: 5px 0;
@@ -26,4 +26,4 @@
     height: 400px;
 
   }
-}
+}

data/app/assets/stylesheets/blacklight_gallery/_slideshow.scss

@@ -93,6 +93,12 @@ $gray-dark: #343a40 !default;
     padding: 4px 10px;
     text-align: center;
   }
+
+  .controls {
+    svg {
+      fill: $gray-light;
+    }
+  }
 }
 
 .slideshow-documents {

data/app/views/catalog/_document_slideshow.html.erb

@@ -1,9 +1,5 @@
 <% # container for all documents in slideshow view -%>
 <div id="documents" class="row slideshow-documents">
-  <div class="info w-100">
-    <h3><%= t(:'blacklight_gallery.catalog.document_slideshow.header') %></h3>
-  </div>
-
   <div class="grid">
     <%= render collection: documents, as: :document, partial: 'grid_slideshow' %>
   </div>

data/app/views/catalog/_grid_slideshow.html.erb

@@ -2,7 +2,7 @@
   <div class="thumbnail">
     <%= link_to '#', data: { :'slide-to' => document_counter, toggle: "modal", target: "#slideshow-modal" } do %>
       <% if thumbnail_url(document) %>
-          <%= image_tag thumbnail_url(document), class: 'img-thumbnail' %>
+          <%= image_tag thumbnail_url(document), class: 'img-thumbnail', alt: index_presenter(document).heading %>
         <% else %>
           <%= t('.missing_image', scope: [:blacklight_gallery]) %>
         <% end %>

data/app/views/catalog/_index_slideshow.html.erb

@@ -1,6 +1,6 @@
 <div class="item<%= ' active' if document_counter == 0 %>">
   <div class="frame">
-      <%= render_slideshow_tag(document) %>
+      <%= render_slideshow_tag(document, { alt: '' }) %>
       <div class="caption">
         <%= index_presenter(document).label(document_show_link_field(document)) %>
       </div>

data/app/views/catalog/_openseadragon_default.html.erb

@@ -23,21 +23,20 @@
   <% count = Array(image).length %>
   <div class="openseadragon-container <%= osd_container_class %>">
     <div class="osd-toolbar row">
-      <% if count > 1 %>
-        <% osd_config = osd_config_referencestrip.merge(osd_config) %>
-
-        <div class="col-md-6 pagination">
-          <a id="osd-previous"><%= blacklight_icon('chevron_left') %></a>
-          <span id="osd-page">1</span>  of <%= count %>
-          <a id="osd-next"><%= blacklight_icon('chevron_right') %></a>
-        </div>
-      <% end %>
-        <div class="col-md-6 controls">
-          <a id="osd-zoom-in"><%= blacklight_icon('add_circle') %></a>
-          <a id="osd-zoom-out"><%= blacklight_icon('remove_circle') %></a>
-          <a id="osd-home"><%= blacklight_icon('resize_small') %></a>
-          <a id="osd-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
-        </div>
+      <div class="col-md-6 pagination">
+        <% if count > 1 %>
+          <% osd_config = osd_config_referencestrip.merge(osd_config) %>
+            <a id="osd-previous"><%= blacklight_icon('chevron_left') %></a>
+            <span id="osd-page">1</span>  of <%= count %>
+            <a id="osd-next"><%= blacklight_icon('chevron_right') %></a>
+        <% end %>
+      </div>
+      <div class="col-md-6 controls">
+        <a id="osd-zoom-in"><%= blacklight_icon('add_circle') %></a>
+        <a id="osd-zoom-out"><%= blacklight_icon('remove_circle') %></a>
+        <a id="osd-home"><%= blacklight_icon('resize_small') %></a>
+        <a id="osd-full-page"><%= blacklight_icon('custom_fullscreen') %></a>
+      </div>
     </div>
     <%= openseadragon_picture_tag image, class: 'osd-image row', data: { openseadragon: osd_config } %>
   </div>

data/app/views/catalog/_slideshow.html.erb

@@ -6,10 +6,18 @@
 
     <!-- Controls -->
     <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
-      <%= blacklight_icon 'chevron_left' %>
+      <%= blacklight_icon 'chevron_left', { additional_options: { label_context: 'previous_image' }} %>
     </a>
     <a class="right carousel-control next" href="#slideshow" data-slide="next">
-      <%= blacklight_icon 'chevron_right' %>
+      <%= blacklight_icon 'chevron_right', { additional_options: { label_context: 'next_image' }} %>
     </a>
 
+    <div class="controls text-center">
+      <button class="btn btn-sm btn-link" data-behavior="pause-slideshow" aria-label="<%= t('blacklight_gallery.catalog.slideshow.pause') %>">
+        <%= blacklight_icon 'pause_slideshow' %>
+      </button>
+      <button class="btn btn-sm btn-link" data-behavior="start-slideshow" aria-label="<%= t('blacklight_gallery.catalog.slideshow.start') %>">
+        <%= blacklight_icon 'start_slideshow' %>
+      </button>
+    </div>
   </div>

data/app/views/catalog/_slideshow_modal.html.erb

@@ -4,7 +4,8 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-            ×
+            <span class="sr-only">close</span>
+            <span aria-hidden="true">×</span>
           </button>
         </div>
         <div class="modal-body">

data/blacklight-gallery.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", '~> 5.1'
-  spec.add_dependency 'blacklight', '~> 7.0'
+  spec.add_dependency 'blacklight', '~> 7.7'
   spec.add_dependency "bootstrap", "~> 4.0"
   spec.add_dependency "openseadragon", ">= 0.2.0"
 

data/config/locales/blacklight-gallery.ar.yml

@@ -9,7 +9,8 @@ ar:
     catalog:
       grid_slideshow:
         missing_image: "صورة غير موجودة"
-      document_slideshow:
-        header: "حدد صورة لبدء العرض المتتابع"
       modal_slideshow:
         counter: "%{counter} من %{count}"
+      slideshow:
+        pause: "وقفة عرض الشرائح"
+        start: "بدء عرض الشرائح"

data/config/locales/blacklight-gallery.en.yml

@@ -1,5 +1,8 @@
 en:
   blacklight:
+    icon:
+      chevron_left_previous_image: 'previous image' 
+      chevron_right_next_image: 'next image' 
     search:
       view:
         gallery: "Gallery"
@@ -9,7 +12,8 @@ en:
     catalog:
       grid_slideshow:
         missing_image: 'Missing'
-      document_slideshow:
-        header: "Select an image to start the slideshow"
       modal_slideshow:
         counter: "%{counter} of %{count}"
+      slideshow:
+        pause: Pause slideshow
+        start: Start slideshow

data/config/locales/blacklight-gallery.es.yml

@@ -9,7 +9,8 @@ es:
     catalog:
       grid_slideshow:
         missing_image: No hay nada
-      document_slideshow:
-        header: Selecione una imagen para empezar
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Pausa la Diapositivas
+        start: Empezar la Diapositivas

data/config/locales/blacklight-gallery.fr.yml

@@ -9,7 +9,8 @@ fr:
     catalog:
       grid_slideshow:
         missing_image: 'Image manquante'
-      document_slideshow:
-        header: "Sélectionnez une image pour lancer le diaporama"
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Suspendre le diaporama
+        start: Lancer le diaporama

data/config/locales/blacklight-gallery.it.yml

@@ -9,7 +9,8 @@ it:
     catalog:
       grid_slideshow:
         missing_image: 'Mancante'
-      document_slideshow:
-        header: "Seleziona un immagine per l'avvio del slideshow"
       modal_slideshow:
         counter: "%{counter} di %{count}"
+      slideshow:
+        pause: Pausa del slideshow
+        start: Avvia del slideshow

data/config/locales/blacklight-gallery.pt-BR.yml

@@ -13,3 +13,6 @@ pt-BR:
         header: "Selecione uma imagem para iniciar a apresentação de slides"
       modal_slideshow:
         counter: "%{counter} de %{count}"
+      slideshow:
+        pause: Pausar a apresentação de slides
+        start: Iniciar a apresentação de slides

data/config/locales/blacklight-gallery.zh.yml

@@ -9,7 +9,8 @@ zh:
     catalog:
       grid_slideshow:
         missing_image: '图片缺失'
-      document_slideshow:
-        header: '选择图片启动幻灯展示'
       modal_slideshow:
         counter: "%{counter} of %{count}"
+      slideshow:
+        pause: 暂停幻灯片展示
+        start: 启动幻灯片展示

data/lib/blacklight/gallery/engine.rb

@@ -4,7 +4,6 @@ module Blacklight
   module Gallery
     class Engine < Rails::Engine
       require 'openseadragon'
-    
     end
   end
 end

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "1.7.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.7'
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -240,9 +240,11 @@ files:
 - app/assets/images/blacklight/custom_fullscreen.svg
 - app/assets/images/blacklight/gallery.svg
 - app/assets/images/blacklight/masonry.svg
+- app/assets/images/blacklight/pause_slideshow.svg
 - app/assets/images/blacklight/remove_circle.svg
 - app/assets/images/blacklight/resize_small.svg
 - app/assets/images/blacklight/slideshow.svg
+- app/assets/images/blacklight/start_slideshow.svg
 - app/assets/javascripts/blacklight_gallery/default.js
 - app/assets/javascripts/blacklight_gallery/masonry.js
 - app/assets/javascripts/blacklight_gallery/osd_viewer.js
@@ -330,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gallery display for Blacklight