blacklight-gallery 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913cb13022a835407afc868fd4ddd875f40034ec639a26ea9e9fba94f89c1bfd
-  data.tar.gz: 4507042c61c539708cc64104c5ec65e650b6dd2e3ccbbe406ea88c17539c5eb8
+  metadata.gz: 4927245e76448f9fc8b4f8ca2a14afe04c1c5c5c794a84826d0da6b618ab18e4
+  data.tar.gz: 0eb3ee4d9293f8575e8d134e770480a7fb7b400378cb83d80d4aaeec9cf8fe58
 SHA512:
-  metadata.gz: d24fd936206d879b1aa8df6e30b6dbb9e9801ac3a994638c93c1a294d55e9f2d359032fbe7cb60744df7749993d37271be30f631105e093f8e75ed06a0908443
-  data.tar.gz: 1a58a476b12d45acd79752564bcb7474161884e7d0bf30dc9278fa61dbc6e90c010f826ca807f2e51722fb3eb9c3951baa97830f182b78f4d6898e7cd3ad6299
+  metadata.gz: 599c4e4e4def663a47eed40f9c830afd39b289b2815e313f688052cfa622c7c6610a951df96fe8b0750102e091efbb0a4644c1a70fd9b7d9276069d81a55a72a
+  data.tar.gz: b8c730e6e13a9e9b1617d1f440d04a9e953d136f507bbf0cb2048952e7f2ce1ccc3f9a9cedf0655da8e072a29fda5998c45d953f8325cedbe2ba238149747899

data/.solr_wrapper.yml

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr/conf/
+  name: blacklight-core

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"/></svg>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12l4.58-4.59z"/></svg>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6-6-6z"/></svg>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M7,14H5v5h5V17H7Zm7-9V7h3v3h2V5Z" /><path d="M22.517,1.524H1.736V22.37H22.517Zm-2,18.845H3.736V3.524H20.517Z" /></svg>

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

@@ -1,20 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
-    <title>Gallery</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square">
-        <g id="Gallery" stroke="#000000" stroke-width="3">
-            <path d="M2,2 L2,3" id="Line"></path>
-            <path d="M2,7.5 L2,8.5" id="Line"></path>
-            <path d="M8,7.5 L8,8.5" id="Line"></path>
-            <path d="M14,7.5 L14,8.5" id="Line"></path>
-            <path d="M2,13 L2,14" id="Line"></path>
-            <path d="M8,13 L8,14" id="Line"></path>
-            <path d="M14,13 L14,14" id="Line"></path>
-            <path d="M8,2 L8,3" id="Line"></path>
-            <path d="M14,2 L14,3" id="Line"></path>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M4 11h5V5H4v6zm0 7h5v-6H4v6zm6 0h5v-6h-5v6zm6 0h5v-6h-5v6zm-6-7h5V5h-5v6zm6-6v6h5V5h-5z"/></svg>

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

@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
-    <title>Masonry</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square">
-        <g id="Masonry" stroke="#000000" stroke-width="3">
-            <path d="M8,0 L8,6.5" id="Line"></path>
-            <path d="M14.5,8.5 L14.5,15" id="Line"></path>
-            <path d="M1.5,8.5 L1.5,15" id="Line"></path>
-            <path d="M8,12 L8,14.5" id="Line"></path>
-            <path d="M14.5,1 L14.5,2.5" id="Line"></path>
-            <path d="M1.5,1 L1.5,2.5" id="Line"></path>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M10 18h5v-6h-5v6zm-6 0h5V5H4v13zm12 0h5v-6h-5v6zM10 5v6h11V5H10z"/></svg>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11H7v-2h10v2z"/></svg>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5,16H8v3h2V14H5ZM16,8V5H14v5h5V8Z"/><path d="M22.517,1.524H1.736V22.37H22.517Zm-2,18.845H3.736V3.524H20.517Z"/></svg>

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

@@ -1,13 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
-    <title>Slideshow</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Slideshow" stroke="#000000">
-            <rect id="Rectangle" stroke-width="2" transform="translate(8.000000, 8.000000) rotate(1.000000) translate(-8.000000, -8.000000) " x="1" y="2" width="14" height="12" rx="6"></rect>
-            <polygon id="Triangle" fill="#000000" transform="translate(9.000000, 8.000000) rotate(90.000000) translate(-9.000000, -8.000000) " points="9 5 12 11 6 11"></polygon>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M10 16.5l6-4.5-6-4.5v9zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg>

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

@@ -1,7 +1,3 @@
-.view-icon-gallery {
-  &:before { content: "\e011"; }
-}
-
 .gallery {
 
   display: -webkit-box;

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

@@ -1,10 +1,3 @@
-
-.view-icon-masonry {
-  &:before { content: "\e010"; visibility: hidden; } // get the glyphicon sizing
-
-  @include img-retina("blacklight/gallery/view-icon-masonry.png","blacklight/gallery/view-icon-masonry@2x.png", 13px, 13px);
-}
-
 .masonry {
   &.document {
     padding: 0;

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

@@ -1,9 +1,5 @@
-.view-icon-slideshow {
-  &:before { content: "\e158"; }
-}
-
 $gray-light: lightgray !default;
-$gray-dark: darkgray !default;
+$gray-dark: #343a40 !default;
 
 .slideshow-modal {
   .modal-dialog {
@@ -35,6 +31,7 @@ $gray-dark: darkgray !default;
   .slideshow-inner {
     height: 100%;
     overflow: hidden;
+    padding-bottom: 20px;
 
     .item {
       width: 100%;
@@ -59,19 +56,24 @@ $gray-dark: darkgray !default;
   }
 
   .carousel-control {
-    background-image: none;
+    position: absolute;
+    top: 0;
     height: 100%;
     width: 50px;
-
-    .glyphicon {
-      color: $gray-light;
+    .blacklight-icons {
+      width: 3rem;
+      svg {
+        height: 3rem;
+        width: 3rem;
+        fill: $gray-light;
+      }
     }
   }
-  .carousel-control.left .glyphicon  {
-    padding-right: 3px;
+  .carousel-control.left  {
+    left: 0px;
   }
-  .carousel-control.right .glyphicon  {
-    padding-left: 2px;
+  .carousel-control.right  {
+    right: 0px;
   }
 
   .caption {
@@ -83,7 +85,6 @@ $gray-dark: darkgray !default;
   }
 
   .counter {
-    // background-color: $gray-light;
     border-radius: 12px;
     border: 1px solid $gray-light;
     color: $gray-light;

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

@@ -27,20 +27,19 @@
         <% osd_config = osd_config_referencestrip.merge(osd_config) %>
 
         <div class="col-md-6 pagination">
-          <a id="osd-previous"><span class="glyphicon glyphicon-chevron-left"></span></a>
+          <a id="osd-previous"><%= Blacklight::Icon.new('chevron_left').file_source %></a>'
           <span id="osd-page">1</span>  of <%= count %>
-          <a id="osd-next"><span class="glyphicon glyphicon-chevron-right"></span></a>
+          <a id="osd-next"><%= Blacklight::Icon.new('chevron_right').file_source %></a>'
         </div>
       <% end %>
         <div class="col-md-6 controls">
-          <a id="osd-zoom-in"><span class="glyphicon glyphicon-plus-sign"></span></a>
-          <a id="osd-zoom-out"><span class="glyphicon glyphicon-minus-sign"></span></a>
-          <a id="osd-home"><span class="glyphicon glyphicon-resize-small"></span></a>
-          <a id="osd-full-page"><span class="glyphicon glyphicon-fullscreen"></span></a>
+          <a id="osd-zoom-in"><%= Blacklight::Icon.new('add_circle').file_source %></a>'
+          <a id="osd-zoom-out"><%= Blacklight::Icon.new('remove_circle').file_source %></a>'
+          <a id="osd-home"><%= Blacklight::Icon.new('resize_small').file_source %></a>'
+          <a id="osd-full-page"><%= Blacklight::Icon.new('custom_fullscreen').file_source %></a>'
         </div>
     </div>
     <%= openseadragon_picture_tag image, class: 'osd-image row', data: { openseadragon: osd_config } %>
   </div>
 
 <% end %>
-

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

@@ -6,11 +6,10 @@
 
     <!-- Controls -->
     <a class="left carousel-control prev" href="#slideshow" data-slide="prev">
-      <span class="glyphicon glyphicon-chevron-left"></span>
+      <%= blacklight_icon 'chevron_left' %>
     </a>
     <a class="right carousel-control next" href="#slideshow" data-slide="next">
-      <span class="glyphicon glyphicon-chevron-right"></span>
+      <%= blacklight_icon 'chevron_right' %>
     </a>
 
   </div>
-

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

@@ -3,7 +3,9 @@
     <div class="modal-dialog col-md-10">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><span class="glyphicon glyphicon-remove"></span></button>
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+            ×
+          </button>
         </div>
         <div class="modal-body">
           <%= yield %>
@@ -11,4 +13,3 @@
       </div>
     </div>
   </div>
-

data/blacklight-gallery.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails"
+  spec.add_dependency "rails", '~> 5.1'
   spec.add_dependency 'blacklight', '~> 7.0'
   spec.add_dependency "bootstrap", "~> 4.0"
   spec.add_dependency "openseadragon", ">= 0.2.0"

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'sprockets', '< 4'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-gallery
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -228,15 +228,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/assets/images/blacklight/add_circle.svg
+- app/assets/images/blacklight/chevron_left.svg
+- app/assets/images/blacklight/chevron_right.svg
+- app/assets/images/blacklight/custom_fullscreen.svg
 - app/assets/images/blacklight/gallery.svg
-- app/assets/images/blacklight/gallery/view-icon-masonry.png
-- app/assets/images/blacklight/gallery/view-icon-masonry@2x.png
 - app/assets/images/blacklight/masonry.svg
+- app/assets/images/blacklight/remove_circle.svg
+- app/assets/images/blacklight/resize_small.svg
 - app/assets/images/blacklight/slideshow.svg
 - app/assets/javascripts/blacklight_gallery/default.js
 - app/assets/javascripts/blacklight_gallery/masonry.js