spree_multi_slideshow 1.1.1 → 1.1.2

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

@@ -2,60 +2,50 @@
  *= require store/spree_core
 */
 
-.gallery {
+#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;
-	z-index:0;
-	color:#fff;
-	background:url(/assets/images/bg-gallery.png) no-repeat 20px 0;
-}
-.gallery .frame {
-	position:relative;
-}
-.gallery .frame ul {
-	position:absolute;
-	margin:0;
-	padding:0;
-	list-style:none;
-}
-.gallery .frame li {
-	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;
+}
+.pagination li a:hover {
+	background-position: 0 -26px;
+}
+.pagination li.current a, .pagination li.current a:hover {
+	background-position: 0 -13px;
 }

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class SlidesController < ResourceController
-      before_filter :load_data, :only => [:index, :new, :show, :edit]
+      before_filter :load_data, :except => [:destroy]
       
       def update_positions
         params[:positions].each do |id, index|
@@ -16,11 +16,11 @@ module Spree
 
       protected
       def location_after_save
-        admin_slideshow_type_slides_url(@slideshow_type)
+        edit_admin_slideshow_type_url(@slideshow_type)
       end
       
       def load_data
-        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id].to_i)
+        @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id])
       end
 
     end

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

@@ -1,7 +1,11 @@
 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/helpers/spree/slideshow_types_helper.rb

@@ -1,60 +1,55 @@
+# encoding: UTF-8
+
 module Spree
   module SlideshowTypesHelper
-
+    
     def insert_slideshow(params={})
-      @content_for_head_added ||= false
-      if not @content_for_head_added
-        content_for(:head) { stylesheet_link_tag 'spree_multi_slideshow.css' }
-        content_for(:head) { javascript_include_tag '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 => "frame") + 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
-    end
-
-    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|
-          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)) + content_tag(:p, raw(slide.content)), :class => "text-holder")))
-        end.join
-      else
-        false
+      params[:id] ||= "slides"
+      params[:class] ||= "my_slide"
+      params[:category] ||= "home"
+      @@slideshow = Spree::SlideshowType.enable.find_by_category(params[:category])
+      if @@slideshow.blank? || (!@@slideshow.blank? && @@slideshow.slides.empty?)
+        return ''
       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 enable_navigation(params)
-      container_nav = params[:container_navigation] || nil
-      cl_nav_container = params[:class_navigation_container].split(",") || nil
-      cl_nav_link = params[:class_navigation_link].split(",") || nil
-      category = params[:category] || "home"
-      slideshow = Spree::SlideshowType.enable(category)
-      if !slideshow.blank?
-        if slideshow.first.enable_navigation
-          prev = link_to("prev", "#", :class => "prev #{cl_nav_link[0]}")
-          succ = link_to("next", "#", :class => "next #{cl_nav_link[1]}")
-        else
-          prev = ""
-          succ = ""
+    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 }
+      
+      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")
+          end
+          
+          divs.join.html_safe
         end
-        
-        unless container_nav.blank?
-          prev = content_tag(container_nav.to_sym, prev, :class => cl_nav_container[0])
-          succ = content_tag(container_nav.to_sym, succ, :class => cl_nav_container[1])
-        end
-        
-        res = Hash.new()
-        res[:prev] = prev
-        res[:succ] = succ
-        return res
-      end
+      end.join.html_safe
     end
     
   end

data/app/models/spree/slide.rb

@@ -29,6 +29,8 @@ module Spree
     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")
+    
     # Load S3 settings
     if ( FileTest.exist?(Rails.root.join('config', 's3.yml')) && !YAML.load_file(Rails.root.join('config', 's3.yml'))[Rails.env].blank?)
       S3_OPTIONS = {

data/app/models/spree/slideshow_type.rb

@@ -2,17 +2,12 @@ module Spree
   class SlideshowType < ActiveRecord::Base
     has_many :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}} }
-
-    def initialize(*args)
-      super(*args)
-    end
-
+    scope :enable, where("enabled IS NOT NULL AND enabled = 1")
   end
 end

data/app/views/spree/admin/shared/_slideshow_type_tabs.html.erb

@@ -1,14 +1,16 @@
+<h1><%= t(:editing_slideshow_type) %> &ldquo;<%= @slideshow_type.category %>&rdquo;</h1>
+
 <% content_for :sidebar do %>
 
-  <h3><%= t("slideshow_type.sidebar") %></h3>
+  <h3><%= @slideshow_type.category %></h3>
   <br class="clear" />
 
   <ul class="sidebar slide-menu" data-hook="admin_slide_tabs">
-	<li<%== ' class="active"' if current == 'Slideshow_type Details' %>>
-	  <%= link_to t("slideshow_type.detail"), edit_admin_slideshow_type_url(@slideshow_type) %>
-	</li>
-    <li<%== ' class="active"' if current == 'Slide Image' %>>
-      <%= link_to t("slideshow_type.slide.many"), admin_slideshow_type_slides_path(@slideshow_type) %>
+    <li<%== ' class="active"' if current == 'Slideshow_type Details' %>>
+      <%= link_to t(:slideshow_type_details), edit_admin_slideshow_type_url(@slideshow_type) %>
+    </li>
+    <li<%== ' class="active"' if current == 'Slide Images' %>>
+      <%= link_to t(:slides), admin_slideshow_type_slides_path(@slideshow_type) %>
     </li>
   </ul>
   <br class="clear" />

data/app/views/spree/admin/slides/edit.html.erb

@@ -2,7 +2,7 @@
 <h1><%= t("slideshow_type.slide.editing_page") %></h1>
 <%= render 'spree/shared/error_messages', :target => @slide %>
 
-<%= semantic_form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
   <table class="basic-table" data-hook="edit_image">
     <tr data-hook="thumbnail">
       <td><%= t(:thumbnail) %>:</td>

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

@@ -1,35 +1,34 @@
-<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Image'} %>
+<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Images'} %>
 
-<%= javascript_include_tag 'admin/slides/index.js' %>
-<div id="slides" data-hook></div>
-<p data-hook="links">
-	<%= link_to icon('add') + ' ' + t("slideshow_type.slide.new_page"), new_admin_slideshow_type_slide_url(@slideshow_type), :id => 'new_slide_link' %>
-</p>
-
-<table class="index sortable" data-hook="slide_table" data-hook data-sortable-link="<%= update_positions_admin_slideshow_type_slides_url %>">
-	<tr data-hook="images_header">
-		<th><%= t("slideshow_type.slide.thumbnail") %></th>
-		<th><%= t("slideshow_type.slide.title") %></th>
-		<th><%= t("slideshow_type.slide.position") %></th>
-		<th><%= t("slideshow_type.slide.url") %></th>
-		<th><%= t(:action) %></th>
-	</tr>
+<table class="index sortable" data-hook="slide_table" data-sortable-link="<%= update_positions_admin_slideshow_type_slides_url(@slideshow_type) %>">
+  <tr data-hook="images_header">
+    <th><%= t(:thumbnail) %></th>
+	<th><%= t(:title) %></th>
+    <th><%= t(:url) %></th>
+    <th><%= t(:action) %></th>
+  </tr>
 
-	<% Spree::Slide.where("slideshow_type_id = ?", @slideshow_type.id).order("position ASC").each do |slide| %>
-	<tr id="<%= dom_id(slide) %>" data-hook="images_row">
-		<td>
-			<span class="handle"></span>
-			<%= link_to image_tag(slide.attachment.url(:thumbnail)), slide.attachment.url(:medium) %>
-		</td>
-		<td><%= slide.title %></td>
-		<td><%= slide.position %></td>
-		<td><%= slide.url %></td>
-		<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 slide, {:url => admin_slideshow_type_slide_url(@slideshow_type, slide) }%>
-		</td>
-	</tr>
-	<% end %>
+  <tbody>
+  <% @slideshow_type.slides.each do |slide| %>
+    <tr id="<%= spree_dom_id slide %>" data-hook="images_row">
+      <td>
+        <span class="handle"></span>
+        <%= link_to image_tag(slide.attachment.url(:thumbnail)), slide.attachment.url(:medium) %>
+      </td>
+      <td><%= slide.title %></td>
+	  <td><%= slide.url %></td>
+      <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) }%>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
 
-</table>
+<div id="images" data-hook></div>
+<br />
+<p data-hook="links">
+    <%= link_to icon('add') + ' ' + t(:new_slide), new_admin_slideshow_type_slide_url(@slideshow_type), :id => 'new_slide_link' %>
+</p>

data/app/views/spree/admin/slides/new.html.erb

@@ -1,5 +1,5 @@
 <h4><%= t("slideshow_type.slide.new_page") %></h4>
-<%= semantic_form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
   <table class="basic-table" data-hook="new_slide">
     <%= render :partial => 'form', :locals => { :f => f } %>
   </table>

data/app/views/spree/admin/slideshow_types/_form.html.erb

@@ -1,8 +1,48 @@
-<%= f.inputs do %>
-	<%= f.input :category %>
-	<%= f.input :slide_width %>
-	<%= f.input :slide_height %>
-	<%= f.input :slide_number %>
-	<%= f.input :enable_navigation %>
-	<%= f.input :enabled %>
-<% end %>
+<div data-hook="admin_slideshow_form_fields">
+	<div class="clearfix">
+		<div class="left" data-hook="admin_product_form_left">
+			<%= f.field_container :category do %>
+				<%= f.label :category, t(:category) %> <span class="required">*</span><br />
+				<%= f.text_field :category, :class => 'fullwidth title' %>
+				<%= f.error_message_on :category %>
+			<% end %>
+
+			<%= f.field_container :slide_width do %>
+				<%= f.label :slide_width, t(:slide_width) %> <span class="required">*</span><br />
+				<%= f.text_field :slide_width, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_width %>
+			<% end %>
+
+			<%= f.field_container :slide_height do %>
+				<%= f.label :slide_height, t(:slide_height) %><br />
+				<%= f.text_field :slide_height, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_height %>
+			<% end %>
+		</div>
+		<div class="right" data-hook="admin_product_form_right">
+			<%= f.field_container :slide_number do %>
+				<%= f.label :slide_number, t(:slide_number) %> <span class="required">*</span><br />
+				<%= f.text_field :slide_number, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_number %>
+			<% end %>
+
+			<%= f.field_container :enable_navigation do %>
+				<%= f.label :enable_navigation, t(:enable_navigation) %><br />
+				<%= f.check_box :enable_navigation %>
+				<%= f.error_message_on :enable_navigation %>
+			<% end %>
+
+			<%= f.field_container :enable_pagination do %>
+				<%= f.label :enable_pagination, t(:enable_pagination) %><br />
+				<%= f.check_box :enable_pagination %>
+				<%= f.error_message_on :enable_pagination %>
+			<% end %>
+
+			<%= f.field_container :enabled do %>
+				<%= f.label :enabled, t(:enabled) %><br />
+				<%= f.check_box :enabled %>
+				<%= f.error_message_on :enabled %>
+			<% end %>
+		</div>
+	</div>
+</div>

data/app/views/spree/admin/slideshow_types/edit.html.erb

@@ -1,8 +1,7 @@
-<h1><%= t("slideshow_type.editing_page") %></h1>
-	<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slideshow_type Details'} %>
-	<%= render "spree/shared/error_messages", :target => @slideshow_type %>
+<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => { :current => 'Slideshow_type Details' } %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
-	<%= semantic_form_for([:admin, @slideshow_type]) do |f| %>
-		<%= render :partial => "form", :locals => { :f => f } %>
-		<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-	<% end %>
+<%= form_for([:admin, @slideshow_type], :html => { :multipart => true }) do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+<% end %>

data/app/views/spree/admin/slideshow_types/index.html.erb

@@ -1,32 +1,33 @@
-<div class='toolbar'>
-	<ul class='actions'>
-		<li id="new_product_link">
-			<%= button_link_to t("slideshow_type.new_page"), new_admin_slideshow_type_url, {:icon => 'add'} %>
-		</li>
-	</ul>
-	<br class='clear' />
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
+    <li id="new_slideshow_link">
+      <%= button_link_to t(:new_slideshow), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_slideshow'} %>
+    </li>
+  </ul>
+  <br class="clear" />
 </div>
 
-<h1><%= t("slideshow_type.many") %></h1>
+<h1><%= t(:listing_slideshows) %></h1>
 
-<table class="index">
-	<tr>
-		<th><%= t("slideshow_type.category") %></th>
-		<th><%= t("slideshow_type.enable") %></th>
-		<th><%= t("slideshow_type.slide_number") %></th>
-		<th><%= t("action") %></th>
-	</tr>
-	<tbody>
-		<% @slideshow_types.each do |slideshow_type| %>
-		<tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id slideshow_type %>">
-			<td><%= slideshow_type.category %></td>
-			<td><%= icon('tick') if slideshow_type.enabled %></td>
-			<td><%= slideshow_type.slide_number %></td>
-			<td>
-				<%= link_to_edit slideshow_type %> &nbsp;
-				<%= link_to_delete slideshow_type %>
-			</td>
-		</tr>
-		<% end %>
-	</tbody>
-</table>
+<div id="new_slideshow" data-hook></div>
+
+<table class="index" id="listing_products">
+  <tr data-hook="admin_products_index_headers">
+    <th><%= t(:category) %></th>
+    <th><%= t(:enable) %></th>
+    <th><%= t(:slide_number) %></th>
+    <th data-hook="admin_slideshows_index_header_actions"></th>
+  </tr>
+<% @slideshow_types.each do |slideshow_type| %>
+  <tr id="<%= spree_dom_id slideshow_type %>" data-hook="admin_slideshow_types_index_rows">
+    <td><%= slideshow_type.category %></td>
+	<td><%= icon('tick') if slideshow_type.enabled %></td>
+	<td><%= slideshow_type.slide_number %></td>
+    <td class="actions" data-hook="admin_products_index_row_actions">
+      <%= link_to_edit slideshow_type, :class => 'edit' %>
+      &nbsp;
+      <%= link_to_delete slideshow_type %>
+    </td>
+  </tr>
+<% end %>
+</table>

data/app/views/spree/admin/slideshow_types/new.html.erb

@@ -1,7 +1,53 @@
-<h1><%= t("slideshow_type.new_page") %></h1>
-<%= render "spree/shared/error_messages", :target => @slideshow_type %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @slideshow_type } %>
 
-<%= semantic_form_for([:admin, @slideshow_type], :html => { :enctype => "multipart/form-data" }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+<%= form_for [:admin, @slideshow_type], :html => { :multipart => true } do |f| %>
+<fieldset data-hook="new_slideshow_type">
+	<div class="clearfix" data-hook="new_product_attrs">
+		<div class="left">
+			<%= f.field_container :category do %>
+				<%= f.label :category, t(:category) %> <span class="required">*</span><br />
+				<%= f.text_field :category, :class => 'fullwidth title' %>
+				<%= f.error_message_on :category %>
+			<% end %>
+
+			<%= f.field_container :slide_width do %>
+				<%= f.label :slide_width, t(:slide_width) %> <span class="required">*</span><br />
+				<%= f.text_field :slide_width, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_width %>
+			<% end %>
+
+			<%= f.field_container :slide_height do %>
+				<%= f.label :slide_height, t(:slide_height) %><br />
+				<%= f.text_field :slide_height, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_height %>
+			<% end %>
+		</div>
+		<div class="right">
+			<%= f.field_container :slide_number do %>
+				<%= f.label :slide_number, t(:slide_number) %> <span class="required">*</span><br />
+				<%= f.text_field :slide_number, :class => 'fullwidth title' %>
+				<%= f.error_message_on :slide_number %>
+			<% end %>
+
+			<%= f.field_container :enable_navigation do %>
+				<%= f.label :enable_navigation, t(:enable_navigation) %><br />
+				<%= f.check_box :enable_navigation %>
+				<%= f.error_message_on :enable_navigation %>
+			<% end %>
+
+			<%= f.field_container :enable_pagination do %>
+				<%= f.label :enable_pagination, t(:enable_pagination) %><br />
+				<%= f.check_box :enable_pagination %>
+				<%= f.error_message_on :enable_pagination %>
+			<% end %>
+
+			<%= f.field_container :enabled do %>
+				<%= f.label :enabled, t(:enabled) %><br />
+				<%= f.check_box :enabled %>
+				<%= f.error_message_on :enabled %>
+			<% end %>
+		</div>
+	</div>
+	<%= render :partial => 'spree/admin/shared/new_resource_links' %>
+</fieldset>
 <% end %>

data/app/views/spree/admin/slideshow_types/new.js.erb

@@ -0,0 +1,2 @@
+$("#new_slideshow").html('<%= escape_javascript(render :template => "spree/admin/slideshow_types/new", :formats => [:html], :handlers => [:erb]) %>');
+$("#admin_new_slideshow").parent().hide();

data/config/locales/en.yml

@@ -43,6 +43,7 @@ en:
               slide_height: Height
               slide_number: Slide Number
               enable_navigation: Next and Prev enable?
+              enable_pagination: "Pagination active?"
       slide:
         attributes:
           slide:

data/config/locales/it.yml

@@ -43,6 +43,7 @@ it:
               slide_height: Altezza
               slide_number: Numero Slide
               enable_navigation: Tasti navigazione attivi?
+              enable_pagination: "Paginazione attiva?"
         slide:
           attributes:
             slide:

data/db/migrate/20120116081431_create_slideshow_types.rb

@@ -6,7 +6,7 @@ class CreateSlideshowTypes < ActiveRecord::Migration
       t.integer :slide_height, :default => 400
       t.integer :slide_width, :default => 900
       t.integer :slide_number, :default => 4
-      t.boolean :enable_navigation, :default => true
+      t.boolean :enable_navigation, :default => false
       
       t.timestamps
     end

data/db/migrate/20130114150224_add_enable_pagination.rb

@@ -0,0 +1,5 @@
+class AddEnablePagination < ActiveRecord::Migration
+  def change
+    add_column :enable_pagination, :boolean, :default => false, :after => :enable_navigation
+  end
+end

data/lib/generators/spree_multi_slideshow/install/install_generator.rb

@@ -2,15 +2,6 @@ module SpreeMultiSlideshow
   module Generators
     class InstallGenerator < Rails::Generators::Base
       
-      def add_formtastic
-        res = ask "Would you like to run the formtastic install now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate formtastic:install'
-        else
-          puts "Skiping rails generate formtastic:install, don't forget to run it!"
-        end
-      end
-      
       def add_javascripts
         append_file "app/assets/javascripts/store/all.js", "//= require store/spree_multi_slideshow\n"
         #append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"