spree_multi_slideshow 0.70.71 → 0.70.72

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

@@ -2,72 +2,206 @@
  *= require store/spree_core
 */
 
-.gallery{
-	width: 900px;
-	height:276px;
-	padding:15px 0 0;
-	overflow: hidden;
-	z-index:0;
-	color:#fff;
-	background:url(/assets/images/bg-gallery.png) no-repeat 20px 0;
-	margin-bottom:-2px;
-}
-.gallery .frame{
-	width:900px;
-	overflow:hidden;
-	position:relative;
-	height:251px;
-}
-.gallery .frame ul{
-	position:absolute;
-	overflow:hidden;
-	margin:0;
-	padding:0;
-	list-style:none;
-	width:900px;
-	height:251px;
-}
-.gallery .frame li{
-	width:900px;
-	height:251px;
-	position:absolute;
-	top:0;
-	left:0;
-	background:#f1f1f1;
-}
-.gallery .frame li.active{z-index:2;}
-.gallery img{
-	display:block;
-}
-.gallery .prev,
-.gallery .next{
-	position:absolute;
-	top:160px;
-	left:47px;
-	background:url(/assets/images/sprite01.png) no-repeat;
-	width:39px;
-	height:39px;
-	text-indent:-9999px;
-	overflow:hidden;
-	z-index:3;
-}
-.gallery .next{
-	right:56px;
-	left:auto;
-	background-position: 0 -43px;
-}
-.gallery .text-holder{
-	background:url(/assets/images/bg-text02.png) no-repeat;
-	width: 234px;
-	height:98px;
-	padding:45px 0 0 50px;
-	position:absolute;
-	right:1px;
-	bottom:1px;
-	font:bold 33px/40px 'Candrb', Arial, Helvetica, sans-serif;
-	text-align:center;
-}
-.gallery .text-holder strong span{
-	font-size:52px;
-	display:block;
+/**
+ * BxSlider v4.0 - Fully loaded, responsive content slider
+ * http://bxslider.com
+ *
+ * Written by: Steven Wanderski, 2012
+ * http://stevenwanderski.com
+ * (while drinking Belgian ales and listening to jazz)
+ *
+ * CEO and founder of bxCreative, LTD
+ * http://bxcreative.com
+ */
+
+
+/** RESET AND LAYOUT
+===================================*/
+
+.bx-wrapper {
+	position: relative;
+	margin: 0 0 60px;
+	padding: 0;
+	*zoom: 1;
+}
+
+.bx-wrapper img {
+	width: 100%;
+	display: block;
+}
+
+/** THEME
+===================================*/
+
+.slideshow {
+	width: 960px;
+	min-height: 50px;
+	margin: auto;
+}
+.bxslider {
+	margin: 0px;
+}
+
+.bx-wrapper .bx-viewport {
+	-moz-box-shadow: 0 0 5px #ccc;
+	-webkit-box-shadow: 0 0 5px #ccc;
+	box-shadow: 0 0 5px #ccc;
+}
+
+.bx-wrapper .bx-pager,
+.bx-wrapper .bx-controls-auto {
+	position: absolute;
+	bottom: -30px;
+	width: 100%;
+}
+
+/* LOADER */
+
+.bx-wrapper .bx-loading {
+	min-height: 50px;
+	background: url(bx_loader.gif) center center no-repeat #fff;
+	height: 100%;
+	width: 100%;
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 2000;
+}
+
+/* PAGER */
+
+.bx-wrapper .bx-pager {
+	text-align: center;
+	font-size: .85em;
+	font-family: Arial;
+	font-weight: bold;
+	color: #666;
+	padding-top: 20px;
+}
+
+.bx-wrapper .bx-pager .bx-pager-item,
+.bx-wrapper .bx-controls-auto .bx-controls-auto-item {
+	display: inline-block;
+	*zoom: 1;
+	*display: inline;
+}
+
+.bx-wrapper .bx-pager.bx-default-pager a {
+	background: #666;
+	text-indent: -9999px;
+	display: block;
+	width: 10px;
+	height: 10px;
+	margin: 0 5px;
+	outline: 0;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+}
+
+.bx-wrapper .bx-pager.bx-default-pager a:hover,
+.bx-wrapper .bx-pager.bx-default-pager a.active {
+	background: #000;
+}
+
+/* DIRECTION CONTROLS (NEXT / PREV) */
+
+.bx-wrapper .bx-prev {
+	left: 10px;
+	background: url(controls.png) no-repeat 0 -32px;
+}
+
+.bx-wrapper .bx-next {
+	right: 10px;
+	background: url(controls.png) no-repeat -43px -32px;
+}
+
+.bx-wrapper .bx-prev:hover {
+	background-position: 0 0;
+}
+
+.bx-wrapper .bx-next:hover {
+	background-position: -43px 0;
+}
+
+.bx-wrapper .bx-controls-direction a {
+	position: absolute;
+	top: 50%;
+	margin-top: -16px;
+	outline: 0;
+	width: 32px;
+	height: 32px;
+	text-indent: -9999px;
+	z-index: 9999;
+}
+
+.bx-wrapper .bx-controls-direction a.disabled {
+	display: none;
+}
+
+/* AUTO CONTROLS (START / STOP) */
+
+.bx-wrapper .bx-controls-auto {
+	text-align: center;
+}
+
+.bx-wrapper .bx-controls-auto .bx-start {
+	display: block;
+	text-indent: -9999px;
+	width: 10px;
+	height: 11px;
+	outline: 0;
+	background: url(controls.png) -86px -11px no-repeat;
+	margin: 0 3px;
+}
+
+.bx-wrapper .bx-controls-auto .bx-start:hover,
+.bx-wrapper .bx-controls-auto .bx-start.active {
+	background-position: -86px 0;
+}
+
+.bx-wrapper .bx-controls-auto .bx-stop {
+	display: block;
+	text-indent: -9999px;
+	width: 9px;
+	height: 11px;
+	outline: 0;
+	background: url(controls.png) -86px -44px no-repeat;
+	margin: 0 3px;
+}
+
+.bx-wrapper .bx-controls-auto .bx-stop:hover,
+.bx-wrapper .bx-controls-auto .bx-stop.active {
+	background-position: -86px -33px;
+}
+
+/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
+
+.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
+	text-align: left;
+	width: 80%;
+}
+
+.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
+	right: 0;
+	width: 35px;
+}
+
+/* IMAGE CAPTIONS */
+
+.bx-wrapper .bx-caption {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	background: #666\9;
+	background: rgba(80, 80, 80, 0.75);
+	width: 100%;
+}
+
+.bx-wrapper .bx-caption span {
+	color: #fff;
+	font-family: Arial;
+	display: block;
+	font-size: .85em;
+	padding: 10px;
 }

data/app/controllers/admin/slides_controller.rb

@@ -7,17 +7,16 @@ class Admin::SlidesController < Admin::ResourceController
     end
 
     respond_to do |format|
-      format.html { redirect_to admin_slideshow_type_slides_url(@slideshow_type) }
       format.js  { render :text => 'Ok' }
     end
   end
 
   private
-  def load_data
-    @slideshow_type = SlideshowType.find(params[:slideshow_type_id])
-  end
-
   def location_after_save
     admin_slideshow_type_slides_url(@slideshow_type)
   end
+  
+  def load_data
+    @slideshow_type = SlideshowType.find(params[:slideshow_type_id])
+  end
 end

data/app/helpers/slideshow_types_helper.rb

@@ -1,44 +1,45 @@
 module SlideshowTypesHelper
 
   def insert_slideshow(params={})
-    if slide_images(params)
-      navigation = enable_navigation(params)
-      content_tag(:div, navigation[:prev] + content_tag(:div, content_tag(:ul, raw(slide_images(params))), :class => "frame") + navigation[:succ], :class => "gallery playing")
+    @@slideshow = Spree::SlideshowType.enable.find_by_category(params[:category])
+    if @@slideshow.blank? || (!@@slideshow.blank? && @@slideshow.slides.empty?)
+      return ''
     end
+    res = []
+    
+    res << content_tag(:div, content_tag(:ul, slide_images(params, @@slideshow), :class => "bxslider"), :class => "slideshow")
+    res << "<script type='text/javascript'>
+    $(function() {
+      $('.bxslider').bxSlider({
+          adaptiveHeight: true,
+          controls: #{@@slideshow.enable_navigation},
+          autoStart: false,
+          infiniteLoop: false,
+          hideControlOnEnd: true
+        });
+      });
+    </script>"
+    
+    res.join.html_safe
   end
+  
+  def slide_images(params, slideshow)
+    params[:style] ||= "custom"
+    params[:show_content] ||= false
+    max = slideshow.slide_number || slideshow.slides.count
+    slides = slideshow.slides.limit(max).sort_by { |slide| slide.position }
 
-  def slide_images(params)
-    category = params[:category] || "home"
-    style = params[:style] || "custom"
-    slideshow = SlideshowType.enable(category)
-    if !slideshow.blank?
-      max = slideshow.first.slide_number || 4
-      slides = Slide.where("slideshow_type_id = ?", slideshow.first.id).limit(max).sort_by { |slide| slide.position }
+    slides.map do |slide|
+      content_tag(:li, :class => "slide") do
+        divs = []
 
-      slides.map do |slide|
-        content_tag(:li, raw(link_to(image_tag(slide.attachment.url(style.to_sym)), slide.url, { :title => slide.title })) + raw(content_tag(:div, content_tag(:strong, raw(slide.title)), :class => "text-holder")))
-      end.join
-    else
-      false
-    end
-  end
-  
-  def enable_navigation(params)
-    category = params[:category] || "home"
-    slideshow = SlideshowType.enable(category)
-    if !slideshow.blank?
-      if slideshow.first.enable_navigation
-        prev = link_to("prev", "#", :class => "prev")
-        succ = link_to("next", "#", :class => "next")
-      else
-        prev = ""
-        succ = ""
+        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")
+        end
+
+        divs.join.html_safe
       end
-      res = Hash.new()
-      res[:prev] = prev
-      res[:succ] = succ
-      return res
-    end
+    end.join.html_safe
   end
-
 end

data/app/models/slide.rb

@@ -27,24 +27,11 @@ class Slide < ActiveRecord::Base
   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"
   
-  # save the w,h of the original image (from which others can be calculated)
-  # we need to look at the write-queue for images which have not been saved yet
-  after_post_process :find_dimensions
-  
   def initialize(*args)
     super(*args)
     last_slide = Slide.last
     self.position = last_slide ? last_slide.position + 1 : 0
   end
-  
-  def find_dimensions
-    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_attachement_errors

data/app/models/slideshow_type.rb

@@ -1,11 +1,21 @@
 class SlideshowType < ActiveRecord::Base
   has_many :slides
+  after_update :reprocess_slides
   
-  attr_accessible :category, :slide_width, :slide_height, :slide_number, :enable_navigation, :enabled
+  attr_accessible :category, :slide_width, :slide_height, :slide_number, :enable_navigation, :enabled, :enable_pagination
   
   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}} }
+  scope :enable, where("enabled IS NOT NULL AND enabled = 1")
+  
+  def reprocess_slides
+    self.slides.each do |slide|
+      slide.attachment_width = self.slide_width
+      slide.attachment_height = self.slide_height
+      slide.save!
+      slide.attachment.reprocess!(:custom)
+    end
+  end
 end

data/app/views/admin/slides/_form.html.erb

@@ -1,3 +1,4 @@
+<%= f.hidden_field(:slideshow_type_id, :value => @slideshow_type.id) %>
 <%= f.hidden_field(:attachment_width, :value => @slideshow_type.slide_width) %>
 <%= f.hidden_field(:attachment_height, :value => @slideshow_type.slide_height) %>
 <tr data-hook="file">

data/app/views/admin/slides/index.html.erb

@@ -19,7 +19,7 @@
       <td class="actions">
         <%= link_to_with_icon 'edit', t(:edit), edit_admin_slideshow_type_slide_url(@slideshow_type, slide), :class => 'edit' %>
         &nbsp;
-        <%= link_to_delete image, {:url => admin_slideshow_type_slide_url(@slideshow_type, slide) }%>
+        <%= link_to_delete slide, {:url => admin_slideshow_type_slide_url(@slideshow_type, slide) }%>
       </td>
     </tr>
   <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 0.70.71
+  version: 0.70.72
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -70,6 +70,8 @@ files:
 - lib/generators/spree_multi_slideshow/install/install_generator.rb
 - lib/spree_multi_slideshow/engine.rb
 - lib/spree_multi_slideshow.rb
+- app/assets/images/store/bx_loader.gif
+- app/assets/images/store/controls.png
 - app/assets/images/store/slides/bg-gallery.png
 - app/assets/images/store/slides/bg-text02.png
 - app/assets/images/store/slides/sprite01.png