c80_album_gallery 0.1.0.1 → 0.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dedff5028fd9d1e6e663291780606a1a6e4ce54d
-  data.tar.gz: 04bcbc89b76812fd538acbc278b90e161e3b0e42
+  metadata.gz: 533460b44411baf820bf5306a8a8993c9ada3b90
+  data.tar.gz: 7502687ae707545f9bf3a59f4c69ea33acc5a996
 SHA512:
-  metadata.gz: 6d5a9e4e7914c30265024bc56b47d9b18b46292a827ce3bb5009d438b9aa4831f5a30e82c5135b35271b5534bf5919c7feec692380d0a7daff033f912e3ee6fe
-  data.tar.gz: 0b3362e329bea664125f10c1462f666609341ea384826dbd872966f11c991789e499c4c1b6e4dd744a1c0f20e3d2d29a21d317a000140c00ae680c4efffd3945
+  metadata.gz: 303f78fe06d3b7182490519e41c93509b6ba45a063effd1c4c3a9a1c29157cbae1dbf2d431ed5d7ff2963a7b2b94a5084d3f1cd4150312844096f2484cf12555
+  data.tar.gz: 59a531060779543c18c112f66af1de9647eb694871980b3a074f0444641c5981892e7aef54f048808f4c6f011dc9eab5dabb069d6b918d747b2bc8a1e9dd2380

data/.gitignore

@@ -8,4 +8,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.bin
+*.gem
+*.bin

data/app/assets/javascripts/c80_album_gallery/gallery.js

@@ -1,6 +1,6 @@
 $(document).ready(function () {
 
-    var $butts = $("ul#gallery_list").find("a");
+    /*var $butts = $("ul#gallery_list").find("a");
 
     $butts.bind({
         mouseenter: function() {
@@ -9,5 +9,5 @@ $(document).ready(function () {
         mouseleave: function() {
             $(this).removeClass("plusOpacity");
         }
-    })
+    })*/
 });

data/app/assets/javascripts/c80_album_gallery/gallery_list_grayscaled.js

@@ -0,0 +1,16 @@
+$(document).ready(function () {
+
+    var $gallery_list_grayscaled = $('.gallery_list_grayscaled');
+    //console.log('<$gallery_list_grayscaled>');
+    //console.log($gallery_list_grayscaled);
+
+    if ($gallery_list_grayscaled.length) {
+        //console.log('<+>');
+
+        setTimeout(function () {
+            //console.log('<setTimeout>');
+            $gallery_list_grayscaled.find('a.gray').addClass('my_fade');
+        },1000);
+    }
+
+});

data/app/assets/stylesheets/c80_album_gallery/_mixins/slot_item_overlayed.scss

@@ -9,12 +9,12 @@
     > a {
 
       > img {
-        -webkit-transition: all 0.5s;
-        transition: all 0.5s;
+        /*-webkit-transition: all 0.5s;
+        transition: all 0.5s;*/
 
-        filter: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg"><filter id="filter"><feComponentTransfer color-interpolation-filters="sRGB"><feFuncR type="linear" slope="1.4" /><feFuncG type="linear" slope="1.4" /><feFuncB type="linear" slope="1.4" /></feComponentTransfer></filter></svg>#filter');
+        /*filter: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg"><filter id="filter"><feComponentTransfer color-interpolation-filters="sRGB"><feFuncR type="linear" slope="1.4" /><feFuncG type="linear" slope="1.4" /><feFuncB type="linear" slope="1.4" /></feComponentTransfer></filter></svg>#filter');
         filter: grayscale(1);
-        -webkit-filter: grayscale(1);
+        -webkit-filter: grayscale(1);*/
 
       }
       
@@ -51,9 +51,9 @@
     div.photo {
       > a {
         > img {
-          filter: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg"><filter id="filter"><feComponentTransfer color-interpolation-filters="sRGB"><feFuncR type="linear" slope="1.4" /><feFuncG type="linear" slope="1.4" /><feFuncB type="linear" slope="1.4" /></feComponentTransfer></filter></svg>#filter');
+          /*filter: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg"><filter id="filter"><feComponentTransfer color-interpolation-filters="sRGB"><feFuncR type="linear" slope="1.4" /><feFuncG type="linear" slope="1.4" /><feFuncB type="linear" slope="1.4" /></feComponentTransfer></filter></svg>#filter');
           filter: grayscale(0);
-          -webkit-filter: grayscale(0);
+          -webkit-filter: grayscale(0);*/
         }
       }
     }

data/app/assets/stylesheets/c80_album_gallery/gallery_list_grayscaled.scss

@@ -0,0 +1,50 @@
+div.gallery_list_grayscaled {
+
+  @extend %gallery_list_default;
+
+  &.style_photostudio {
+    @include style_photostudio;
+  }
+
+  &.style_photostudio_widget {
+    @include style_photostudio_widget;
+  }
+
+  .slot_item {
+
+    div.photo {
+
+      a {
+        position: absolute;
+
+        &.color {
+          z-index: 0;
+        }
+
+        &.gray {
+          z-index: 1;
+          background-image: none !important;
+
+          &:hover {
+            img {
+              opacity: 0;
+            }
+          }
+
+          &.my_fade {
+            img {
+              -webkit-transition: opacity 0.45s linear;
+              -o-transition: opacity 0.45s linear;
+              transition: opacity 0.45s linear;
+            }
+          }
+
+        }
+
+      }
+
+    }
+
+  }
+
+}

data/app/helpers/c80_album_gallery/c80_album_gallery_application_helper.rb

@@ -97,9 +97,16 @@ module C80AlbumGallery
     #   3. С помощью css_klass можно регулировать количество элементов в ряду.
     #   4. С помощью css_list_klass можно кастомизировать внеший вид списка.
     #   5. С помощью thumb_size можно регулировать размер картинки
+    #   6. С помощью is_grayscaled можно получить список из чб картинок.
     def render_gallery_list(      css_list_klass='style_1',
                                   css_item_klass='col-lg-4 col-md-4 col-sm-6 col-xs-6',
-                                  thumb_size='thumb_md')
+                                  thumb_size='thumb_md',
+                                  is_grayscaled=false)
+
+      partial_name = 'c80_album_gallery/gallery_list'
+      if is_grayscaled
+        partial_name = 'c80_album_gallery/gallery_list_grayscaled'
+      end
 
       galleries_list = Gallery.all.def_order
 
@@ -109,7 +116,7 @@ module C80AlbumGallery
       h_style = "height:#{h}px"
       # wh_style = "#{w_style};#{h_style}"
 
-      render :partial => 'c80_album_gallery/gallery_list',
+      render :partial => partial_name,
              :locals => {
                  list: galleries_list,
                  css_list_klass: css_list_klass,

data/app/uploaders/c80_album_gallery/gphoto_uploader.rb

@@ -1,7 +1,11 @@
+require 'carrierwave/processing/mini_magick'
+
 module C80AlbumGallery
 
   class GphotoUploader < BaseFileUploader
 
+    include CarrierWave::MiniMagick
+
     def store_dir
       "uploads/gallery/#{format("%03d",model.gallery_id)}"
     end
@@ -13,21 +17,37 @@ module C80AlbumGallery
       process :resize_to_lg
     end
 
+    version :thumb_lg_gray do
+      process :resize_to_lg => 'gray'
+    end
+
     version :thumb_md do
       process :resize_to_md
     end
 
+    version :thumb_md_gray do
+      process :resize_to_md => 'gray'
+    end
+
     version :thumb_sm do
       process :resize_to_sm
     end
+
+    version :thumb_sm_gray do
+      process :resize_to_sm => 'gray'
+    end
     
     version :thumb_preview do
       process :resize_to_preview
     end
 
+    version :thumb_preview_gray do
+      process :resize_to_preview => 'gray'
+    end
+
 # ------------------------------------------------------------------------------------------------------------------------
 
-    def resize_to_lg
+    def resize_to_lg(type='normal')
 
       manipulate! do |img|
 
@@ -37,6 +57,11 @@ module C80AlbumGallery
         img.resize "#{w}x#{h}^"
         img.gravity 'center'
         img.extent "#{w}x#{h}"
+
+        if type == 'gray'
+          img = img.colorspace 'Gray'
+        end
+
         img = yield(img) if block_given?
         img
 
@@ -44,7 +69,7 @@ module C80AlbumGallery
   
     end
 
-    def resize_to_md
+    def resize_to_md(type='normal')
 
       manipulate! do |img|
 
@@ -54,6 +79,11 @@ module C80AlbumGallery
         img.resize "#{w}x#{h}^"
         img.gravity 'center'
         img.extent "#{w}x#{h}"
+
+        if type == 'gray'
+          img = img.colorspace 'gray'
+        end
+
         img = yield(img) if block_given?
         img
 
@@ -61,7 +91,7 @@ module C80AlbumGallery
 
     end
 
-    def resize_to_sm
+    def resize_to_sm(type='normal')
 
       manipulate! do |img|
 
@@ -71,6 +101,11 @@ module C80AlbumGallery
         img.resize "#{w}x#{h}^"
         img.gravity 'center'
         img.extent "#{w}x#{h}"
+
+        if type == 'gray'
+          img = img.colorspace 'gray'
+        end
+
         img = yield(img) if block_given?
         img
 
@@ -78,7 +113,7 @@ module C80AlbumGallery
 
     end
 
-    def resize_to_preview
+    def resize_to_preview(type='normal')
 
       manipulate! do |img|
 
@@ -88,6 +123,11 @@ module C80AlbumGallery
         img.resize "#{w}x#{h}^"
         img.gravity 'center'
         img.extent "#{w}x#{h}"
+
+        if type == 'gray'
+          img = img.colorspace 'gray'
+        end
+
         img = yield(img) if block_given?
         img
 

data/app/views/c80_album_gallery/_gallery_list_grayscaled.html.erb

@@ -0,0 +1,38 @@
+<div class="gallery_list_grayscaled <%= css_list_klass %> clearfix">
+
+  <% list.each_with_index do |gallery,i| %>
+      <% title = gallery.title %>
+      <% image = nil %>
+      <% image_grayscale = nil %>
+      <% a_klass = 'nil_img' %>
+      <% image = gallery.gphotos.first.image.send(thumb_size) if gallery.gphotos.count > 0 %>
+      <% image_grayscale = gallery.gphotos.first.image.send("#{thumb_size}_gray") if gallery.gphotos.count > 0 %>
+      <% a_klass = '' if gallery.gphotos.count > 0 %>
+      <% url = my_url_for_gallery(gallery) %>
+
+      <div class="slot_item <%= css_item_klass %> n_<%= i %>">
+        <div class="photo" style="<%= "#{w_style};#{h_style}" %>">
+          <%= render_image_link_lazy({
+                                             :alt_image => title,
+                                             :image => image,
+                                             :a_href => url,
+                                             :a_class => "#{a_klass} color",
+                                             :a_css_style => "#{w_style};#{h_style}",
+                                             :a_rel => 'nofollow'
+                                     }) %>
+          <%= render_image_link_lazy({
+                                             :alt_image => title,
+                                             :image => image_grayscale,
+                                             :a_href => url,
+                                             :a_class => "#{a_klass} gray",
+                                             :a_css_style => "#{w_style};#{h_style}",
+                                             :a_rel => 'nofollow'
+                                     }) %>
+        </div>
+        <div class="title" style="<%= "#{w_style}" %>">
+          <%= link_to title, url, :title => title %>
+        </div>
+      </div>
+  <% end %>
+
+</div>

data/lib/c80_album_gallery/version.rb

@@ -1,3 +1,3 @@
 module C80AlbumGallery
-  VERSION = "0.1.0.1"
+  VERSION = "0.1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_album_gallery
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.1.0.2
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,12 +83,14 @@ files:
 - app/admin/c80_album_gallery/galleries.rb
 - app/assets/javascripts/c80_album_gallery.js.coffee
 - app/assets/javascripts/c80_album_gallery/gallery.js
+- app/assets/javascripts/c80_album_gallery/gallery_list_grayscaled.js
 - app/assets/stylesheets/c80_album_gallery.scss
 - app/assets/stylesheets/c80_album_gallery/_mixins/gallery_list_default.scss
 - app/assets/stylesheets/c80_album_gallery/_mixins/slot_item_overlayed.scss
 - app/assets/stylesheets/c80_album_gallery/_styles/style_photostudio.scss
 - app/assets/stylesheets/c80_album_gallery/_styles/style_photostudio_widget.scss
 - app/assets/stylesheets/c80_album_gallery/gallery_list.scss
+- app/assets/stylesheets/c80_album_gallery/gallery_list_grayscaled.scss
 - app/assets/stylesheets/c80_album_gallery/gallery_list_slots.scss
 - app/assets/stylesheets/c80_album_gallery/gallery_view.scss
 - app/helpers/c80_album_gallery/c80_album_gallery_application_helper.rb
@@ -98,6 +100,7 @@ files:
 - app/uploaders/c80_album_gallery/gphoto_uploader.rb
 - app/views/c80_album_gallery/_flow_galleries_slots.html.erb
 - app/views/c80_album_gallery/_gallery_list.html.erb
+- app/views/c80_album_gallery/_gallery_list_grayscaled.html.erb
 - app/views/c80_album_gallery/_gallery_view_page.html.erb
 - bin/console
 - bin/setup