spree_multi_slideshow 1.1.8 → 1.2.0

data/app/assets/stylesheets/admin/spree_multi_slideshow.css

@@ -0,0 +1,16 @@
+/*
+ *= require formtastic
+*/
+
+.formtastic input, .formtastic textarea, .formtastic select {
+	font-size: 100%;
+	padding: 5px;
+}
+
+.formtastic button {
+	margin: 0;
+	padding: 0 20px 0 0;
+}
+.formtastic button:hover {
+	text-shadow: #FFFFFF -1px -1px 0px;
+}

data/app/assets/stylesheets/store/carousel_slideshow.css.scss

@@ -0,0 +1,73 @@
+.left {
+  float: left !important;
+}
+.right {
+  float: right !important;
+}
+.gallery {
+  position: relative;
+  overflow: hidden;
+  z-index:0;
+  color:#fff;
+  margin:auto;
+}
+.gallery .gallery-inner {
+  position:relative;
+}
+.gallery .gallery-inner ul {
+  position:absolute;
+  margin:0;
+  padding:0;
+  list-style:none;
+}
+.gallery .gallery-inner li {
+  position:absolute;
+  top:0;
+  left:0;
+  background: transparent;
+}
+.gallery .gallery-inner li.active {z-index:2;}
+.gallery img {
+  display:block;
+}
+.gallery .text-holder {
+  position: absolute;
+  text-align:center;
+}
+.gallery-control {
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 27px;
+  color: white;
+  text-align: center;
+  width: 40px;
+  height: 40px;
+}
+a.gallery-control:hover {
+  text-decoration: none;
+  color: white;
+}
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: white;
+  text-align: center;
+  background: #222;
+  border: 3px solid white;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+.carousel-control.right {
+  left: auto;
+  right: 15px;
+}

data/app/assets/stylesheets/store/spree_multi_slideshow.css

@@ -1,47 +1,3 @@
-#slides {
-	margin-bottom: 25px;
-}
-.slides_container {
-	width: 720px;
-	height: 287px;
-}
-.slides_container .slide_list {
-	width: 720px;
-	height: 287px;
-	display: block;
-	position: relative;
-}
-.text-holder {
-	position: absolute;
-	right: 0px;
-	top: 0px;
-	height: 271px;
-	padding: 8px;
-	width: 200px;
-	background: #EFEFEF;
-}
-.pagination {
-	margin: 6px 0 0;
-	float: right;
-	list-style: none;
-}
-.pagination li {
-	float: left;
-	margin: 0 1px;
-}
-.pagination li a {
-	display: block;
-	width: 13px;
-	height: 0;
-	padding-top: 13px;
-	background-image: url(slides/pagination.png);
-	background-position: 0 0;
-	float: left;
-	overflow: hidden;
-}
-.pagination li a:hover {
-	background-position: 0 -26px;
-}
-.pagination li.current a, .pagination li.current a:hover {
-	background-position: 0 -13px;
-}
+/*
+ *= require store/carousel_slideshow
+*/

data/app/controllers/spree/admin/slides_controller.rb

@@ -1,14 +1,15 @@
 module Spree
   module Admin
     class SlidesController < ResourceController
-      before_filter :load_data, :except => [:destroy]
+      before_filter :load_data, :only => [:index, :new, :show, :edit]
       
       def update_positions
         params[:positions].each do |id, index|
-          Spree::Slide.where(:id => id).update_all(:position => index)
+          Spree::Slide.update_all(['position=?', index], ['id=?', id])
         end
 
         respond_to do |format|
+          format.html { redirect_to admin_slideshow_type_slides_url(@slideshow_type) }
           format.js  { render :text => 'Ok' }
         end
       end
@@ -19,8 +20,9 @@ module Spree
       end
       
       def load_data
-        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id])
+        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id].to_i)
       end
+
     end
   end
 end

data/app/controllers/spree/admin/slideshow_types_controller.rb

@@ -1,11 +1,7 @@
 module Spree
   module Admin
     class SlideshowTypesController < ResourceController
-      
-      def show
-        redirect_to(:action => :edit)
-      end
-      
+
       def location_after_save
         edit_admin_slideshow_type_url(@slideshow_type)
       end

data/app/controllers/spree/slides_controller.rb

@@ -0,0 +1,5 @@
+module Spree
+  class SlidesController < BaseController
+    
+  end
+end

data/app/controllers/spree/slideshow_types_controller.rb

@@ -0,0 +1,5 @@
+module Spree
+  class SlideshowTypesController < BaseController
+    
+  end
+end

data/app/helpers/spree/slides_helper.rb

@@ -0,0 +1,4 @@
+module Spree
+  module SlidesHelper
+  end
+end

data/app/helpers/spree/slideshow_types_helper.rb

@@ -1,56 +1,58 @@
 # encoding: UTF-8
-
 module Spree
   module SlideshowTypesHelper
-    
+
     def insert_slideshow(params={})
-      params[:id] ||= "slides"
-      params[:class] ||= "my_slide"
-      params[:category] ||= "home"
-      logger.info("#{params[:category]}")
-      @@slideshow = Spree::SlideshowType.enable(params[:category]).try(:first)
-      if @@slideshow.blank? || (!@@slideshow.blank? && @@slideshow.slides.empty?)
-        return ''
+      @content_for_head_added ||= false
+      if not @content_for_head_added
+        content_for(:head) { stylesheet_link_tag 'store/spree_multi_slideshow.css' }
+        content_for(:head) { javascript_include_tag 'store/spree_multi_slideshow.js' }
+        @content_for_head_added = true
+      end
+      if slide_images(params)
+        navigation = enable_navigation(params)
+        content_tag(:div, navigation[:prev] + content_tag(:div, content_tag(:ul, raw(slide_images(params))), :class => "gallery-inner clearfix") + navigation[:succ], :class => "gallery #{params[:class]}", :style => "width: #{Spree::SlideshowType.enable(params[:category] || "home").first.slide_width}px; height: #{Spree::SlideshowType.enable(params[:category] || "home").first.slide_height}px;")
       end
-      params[:pagination_class] ||= "pagination"
-      params[:slide_speed] ||= 350
-      res = []
-      
-      res << content_tag(:div, content_tag(:div, slide_images(params, @@slideshow), :class => "slides_container"), :id => params[:id], :class => params[:class])
-      res << "<script type='text/javascript'>
-        $(function() {
-          $('##{params[:id]}').slides({
-            play: 100000,
-            preload: true,
-            generateNextPrev: #{@@slideshow.enable_navigation},
-            generatePagination: #{@@slideshow.enable_pagination},
-            paginationClass: '#{params[:pagination_class]}',
-            slideSpeed: #{params[:slide_speed]}
-          });
-        });
-        </script>"
-      
-      res.join.html_safe
     end
 
-    def slide_images(params, slideshow)
-      params[:style] ||= "medium"
-      params[:show_content] ||= false
-      max = slideshow.slides.enable.count
-      slides = slideshow.slides.enable.limit(max).sort_by { |slide| slide.position }
-      
-      slides.map do |slide|
-        content_tag(:div, :class => "slide_list") do
-          divs = []
-          
-          divs << link_to(image_tag(slide.attachment.url(params[:style].to_sym)), (slide.url.blank? ? "javascript: void(0)" : slide.url), { :title => slide.title })
-          if params[:show_content]
-            divs << content_tag(:div, content_tag(:strong, raw(slide.title)) + content_tag(:p, raw(slide.content)), :class => "text-holder")
+    def slide_images(params)
+      category = params[:category] || "home"
+      style = params[:style] || "custom"
+      slideshow = Spree::SlideshowType.enable(category)
+      if !slideshow.blank?
+        max = slideshow.first.slide_number || 4
+        slides = Spree::Slide.where("slideshow_type_id = ?", slideshow.first.id).limit(max).sort_by { |slide| slide.position }
+
+        slides.map do |slide|
+          if params[:enable_content]
+            link_content = content_tag(:div, content_tag(:strong, raw(slide.title)) + content_tag(:p, raw(slide.content)), :class => "text-holder")
+          else
+            link_content = ""
           end
-          
-          divs.join.html_safe
+          content_tag(:li, raw(link_to(image_tag(slide.attachment.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(link_content))
+        end.join
+      else
+        false
+      end
+    end
+
+    def enable_navigation(params)
+      category = params[:category] || "home"
+      slideshow = Spree::SlideshowType.enable(category)
+      if !slideshow.blank?
+        if slideshow.first.enable_navigation
+          prev = link_to("‹", "#", :class => "gallery-control left")
+          succ = link_to("›", "#", :class => "gallery-control right")
+        else
+          prev = ""
+          succ = ""
         end
-      end.join.html_safe
+        
+        res = Hash.new()
+        res[:prev] = content_tag(:div, prev, :class => "carousel-control left")
+        res[:succ] = content_tag(:div, succ, :class => "carousel-control right")
+        return res
+      end
     end
     
   end

data/app/models/spree/slide.rb

@@ -1,73 +1,61 @@
 module Spree
   class Slide < ActiveRecord::Base
     belongs_to :slideshow_type
+    
     validate :no_attachment_errors
+    validates_presence_of :slideshow_type_id
+    validates_attachment_presence :attachment
+    validates_attachment_content_type :attachment, :content_type => ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/x-png', 'image/pjpeg'], :message => "deve essere JPG, JPEG, PNG o GIF"
     
     attr_accessor :attachment_width, :attachment_height
-    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment, :enable
+    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment
     
     has_attached_file :attachment,
             :url  => "/spree/slides/:id/:style_:basename.:extension",
             :path => ":rails_root/public/spree/slides/:id/:style_:basename.:extension",
             :styles => lambda {|a|
               {
-                  :mini => "100x33#",
+                  :thumbnail => "100x33#",
                   :small =>  "300x100#",
                   :medium => "600x200#",
-                  :large =>  "900x300#",
+                  :slide =>  "900x300#",
                   :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
               }
             },
             :convert_options => {
-                  :mini => "-gravity center",
+                  :thumbnail => "-gravity center",
                   :small => "-gravity center",
                   :medium => "-gravity center",
-                  :large => "-gravity center",
+                  :slide => "-gravity center",
                   :custom => "-gravity center"
-            } 
-    
-    validates_presence_of :slideshow_type_id
-    validates_attachment_presence :attachment
-    validates_attachment_content_type :attachment, :content_type => ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/x-png', 'image/pjpeg'], :message => "deve essere JPG, JPEG, PNG o GIF"
-    
-    default_scope order("position ASC")
-    scope :enable, {:conditions => {:enable => true}}
-    after_post_process :find_dimensions
+            }
     
-    # Load user defined paperclip settings
-    if Spree::Config[:use_s3]
-      s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
-      Spree::Slide.attachment_definitions[:attachment][:storage] = :s3
-      Spree::Slide.attachment_definitions[:attachment][:s3_credentials] = s3_creds
-      Spree::Slide.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-      Spree::Slide.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
-      Spree::Slide.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
-      Spree::Slide.attachment_definitions[:attachment][:s3_host_alias] = Spree::Config[:s3_host_alias] unless Spree::Config[:s3_host_alias].blank?
-    end
+    #after_post_process :find_dimensions
+
+    include Spree::Core::S3Support
+    supports_s3 :attachment
 
-    Spree::Slide.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:slide_styles])
-    Spree::Slide.attachment_definitions[:attachment][:path] = Spree::Config[:slide_path]
-    Spree::Slide.attachment_definitions[:attachment][:url] = Spree::Config[:slide_url]
-    Spree::Slide.attachment_definitions[:attachment][:default_url] = Spree::Config[:slide_default_url]
-    Spree::Slide.attachment_definitions[:attachment][:default_style] = Spree::Config[:slide_default_style]
+    Spree::Slide.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+    Spree::Slide.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+    Spree::Slide.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
+    Spree::Slide.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
+    Spree::Slide.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
     
     def initialize(*args)
       super(*args)
-      last_slide = Spree::Slide.last
+      last_slide = Slide.last
       self.position = last_slide ? last_slide.position + 1 : 0
     end
     
     def find_dimensions
-      if self.attachment_width.blank? && self.attachment_height.blank?
-        temporary = attachment.queued_for_write[:original]
-        filename = temporary.path unless temporary.nil?
-        filename = attachment.path if filename.blank?
-        geometry = Paperclip::Geometry.from_file(filename)
-        self.attachment_width  = geometry.width
-        self.attachment_height = geometry.height
-      end
+      temporary = attachment.queued_for_write[:original]
+      filename = temporary.path unless temporary.nil?
+      filename = attachment.path if filename.blank?
+      geometry = Paperclip::Geometry.from_file(filename)
+      self.attachment_width  = geometry.width
+      self.attachment_height = geometry.height
     end
-    
+
     # if there are errors from the plugin, then add a more meaningful message
     def no_attachment_errors
       unless attachment.errors.empty?

data/app/models/spree/slideshow_type.rb

@@ -1,12 +1,18 @@
 module Spree
   class SlideshowType < ActiveRecord::Base
-    has_many :slides, :dependent => :destroy
+    has_many :slides
     
-    attr_accessible :category, :enable_navigation, :enabled, :enable_pagination
+    attr_accessible :category, :slide_width, :slide_height, :slide_number, :enable_navigation, :enabled
     
-    validates :category, :presence => true
+    validates :slide_number, :slide_width, :slide_height, :presence => true
     validates_uniqueness_of :category
-    
+    validates_numericality_of :slide_number, :only_integer => true
+
     scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
+
+    def initialize(*args)
+      super(*args)
+    end
+
   end
 end

data/app/overrides/slideshow_type_admin_tab.rb

@@ -1,9 +1,4 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                       :name => "slideshow_type_admin_tab",
                       :insert_bottom => "[data-hook='admin_tabs']",
-                      :text => "<%= tab(:slideshow_types) %>")
-
-Deface::Override.new(:virtual_path => "spree/admin/configurations/index",
-                     :name => "add_slide_setting_to_configuration_menu",
-                     :insert_bottom => "[data-hook='admin_configurations_menu']",
-                     :partial => "spree/admin/shared/slide_setting_configurations_menu")
+                      :text => "<%= tab(:slideshow_types) %>")