spree_multi_slideshow 1.1.3 → 1.1.4

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_multi_slideshow', '~> 1.1.3'
+  gem 'spree_multi_slideshow', '~> 1.1.4'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

data/app/assets/javascripts/admin/slide_settings.js

@@ -0,0 +1,31 @@
+$(document).ready(function() {
+
+  $('.destroy_slide_style').on("click", function() {
+   $(this).parent().remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $('.add_slide_style').click(function() {
+    $('#styles_list').append(generate_html_for_hash("new_slide_styles", styles_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<li>';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += 'Name</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text">';
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += 'Value</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text">';
+    html += '<a href="#" alt="Destroy" class="destroy_style">&nbsp;x</a>';
+    html += '</li>';
+
+    index += 1;
+    return html;
+  };
+
+
+
+});

data/app/assets/javascripts/admin/spree_multi_slideshow.js

@@ -1,2 +1 @@
-//= require admin/spree_core
-//= require ckeditor/init
+//= require admin/slide_settings

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

@@ -1,7 +1,3 @@
-/*
- *= require store/spree_core
-*/
-
 #slides {
 	margin-bottom: 25px;
 }

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

@@ -0,0 +1,51 @@
+module Spree
+  module Admin
+    class SlideSettingsController < Spree::Admin::BaseController
+      def show
+        styles = ActiveSupport::JSON.decode(Spree::Config[:slide_styles])
+        @styles_list = styles.collect { |k, v| k }.join(", ")
+      end
+
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:slide_styles])
+        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      end
+
+      def update
+        update_styles(params)
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:notice] = t(:slide_settings_updated)
+            redirect_to admin_slide_settings_path
+          }
+        end
+      end
+
+
+      private
+
+      def update_styles(params)
+        params[:new_slide_styles].each do |index, style|
+          params[:slide_styles][style[:name]] = style[:value] unless style[:value].empty?
+        end if params[:new_slide_styles].present?
+
+        styles = params[:slide_styles]
+
+        Spree::Config[:slide_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_paperclip_settings
+
+        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][:default_url] = Spree::Config[:slide_default_url]
+        Spree::Slide.attachment_definitions[:attachment][:default_style] = Spree::Config[:slide_default_style]
+      end
+    end
+  end
+end
+

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

@@ -5,24 +5,22 @@ module Spree
       
       def update_positions
         params[:positions].each do |id, index|
-          Spree::Slide.update_all(['position=?', index], ['id=?', id])
+          Spree::Slide.where(:id => id).update_all(:position => index)
         end
 
         respond_to do |format|
-          format.html { redirect_to admin_slideshow_type_slides_url(@slideshow_type) }
           format.js  { render :text => 'Ok' }
         end
       end
 
       protected
       def location_after_save
-        edit_admin_slideshow_type_url(@slideshow_type)
+        admin_slideshow_type_slides_url(@slideshow_type)
       end
       
       def load_data
         @slideshow_type = Spree::SlideshowType.find(params[:slideshow_type_id])
       end
-
     end
   end
 end

data/app/helpers/spree/slideshow_types_helper.rb

@@ -7,7 +7,8 @@ module Spree
       params[:id] ||= "slides"
       params[:class] ||= "my_slide"
       params[:category] ||= "home"
-      @@slideshow = Spree::SlideshowType.enable.find_by_category(params[:category])
+      logger.info("#{params[:category]}")
+      @@slideshow = Spree::SlideshowType.enable(params[:category]).try(:first)
       if @@slideshow.blank? || (!@@slideshow.blank? && @@slideshow.slides.empty?)
         return ''
       end
@@ -33,10 +34,10 @@ module Spree
     end
 
     def slide_images(params, slideshow)
-      params[:style] ||= "custom"
+      params[:style] ||= "medium"
       params[:show_content] ||= false
-      max = slideshow.slide_number || slideshow.slides.count
-      slides = slideshow.slides.limit(max).sort_by { |slide| slide.position }
+      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

data/app/models/spree/app_configuration_decorator.rb

@@ -0,0 +1,8 @@
+Spree::AppConfiguration.class_eval do
+  # Preferences related to slide settings
+  preference :slide_default_url, :string, :default => '/spree/slides/:id/:style/:basename.:extension'
+  preference :slide_path, :string, :default => ':rails_root/public/spree/slides/:id/:style/:basename.:extension'
+  preference :slide_url, :string, :default => '/spree/slides/:id/:style/:basename.:extension'
+  preference :slide_styles, :string, :default => "{\"mini\":\"100x33#\",\"small\":\"300x100#\",\"medium\":\"600x200#\",\"large\":\"900x300#\"}"
+  preference :slide_default_style, :string, :default => 'medium'
+end

data/app/models/spree/slide.rb

@@ -1,27 +1,28 @@
 module Spree
   class Slide < ActiveRecord::Base
     belongs_to :slideshow_type
+    validate :no_attachment_errors
     
     attr_accessor :attachment_width, :attachment_height
-    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment
+    attr_accessible :title, :url, :attachment_width, :attachment_height, :content, :slideshow_type_id, :attachment, :enable
     
     has_attached_file :attachment,
             :url  => "/spree/slides/:id/:style_:basename.:extension",
             :path => ":rails_root/public/spree/slides/:id/:style_:basename.:extension",
             :styles => lambda {|a|
               {
-                  :thumbnail => "100x33#",
+                  :mini => "100x33#",
                   :small =>  "300x100#",
                   :medium => "600x200#",
-                  :slide =>  "900x300#",
+                  :large =>  "900x300#",
                   :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
               }
             },
             :convert_options => {
-                  :thumbnail => "-gravity center",
+                  :mini => "-gravity center",
                   :small => "-gravity center",
                   :medium => "-gravity center",
-                  :slide => "-gravity center",
+                  :large => "-gravity center",
                   :custom => "-gravity center"
             } 
     
@@ -30,33 +31,51 @@ module Spree
     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 => {:enabled => true}}
+    after_post_process :find_dimensions
     
-    # 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 = {
-              :storage => 's3',
-              :s3_credentials => Rails.root.join('config', 's3.yml')
-            }
-    elsif (FileTest.exist?(Rails.root.join('config', 's3.yml')) &&!ENV['S3_KEY'].blank? && !ENV['S3_SECRET'].blank? && !ENV['S3_BUCKET'].blank?)
-      S3_OPTIONS = {
-              :storage => 's3',
-              :s3_credentials => {
-                :access_key_id     => ENV['S3_KEY'],
-                :secret_access_key => ENV['S3_SECRET']
-              },
-              :bucket => ENV['S3_BUCKET']
-            }
-    else
-      S3_OPTIONS = { :storage => 'filesystem' }
+    # 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
-    
-    attachment_definitions[:attachment] = (attachment_definitions[:attachment] || {}).merge(S3_OPTIONS)
+
+    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]
     
     def initialize(*args)
       super(*args)
-      last_slide = Slide.last
+      last_slide = Spree::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
+    end
+    
+    # if there are errors from the plugin, then add a more meaningful message
+    def no_attachment_errors
+      unless attachment.errors.empty?
+        # uncomment this to get rid of the less-than-useful interrim messages
+        # errors.clear
+        errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
+        false
+      end
+    end
   end
 end

data/app/models/spree/slideshow_type.rb

@@ -2,12 +2,11 @@ module Spree
   class SlideshowType < ActiveRecord::Base
     has_many :slides
     
-    attr_accessible :category, :slide_width, :slide_height, :slide_number, :enable_navigation, :enabled, :enable_pagination
+    attr_accessible :category, :enable_navigation, :enabled, :enable_pagination
     
-    validates :slide_number, :slide_width, :slide_height, :presence => true
+    validates :category, :presence => true
     validates_uniqueness_of :category
-    validates_numericality_of :slide_number, :only_integer => true
-
-    scope :enable, where("enabled IS NOT NULL AND enabled = 1")
+    
+    scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
   end
 end

data/app/overrides/slideshow_type_admin_tab.rb

@@ -1,4 +1,9 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                       :name => "slideshow_type_admin_tab",
                       :insert_bottom => "[data-hook='admin_tabs']",
-                      :text => "<%= tab(:slideshow_types) %>")
+                      :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")

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

@@ -0,0 +1,4 @@
+<tr>
+  <td><%= link_to t(:slide_settings), admin_slide_settings_path %></td>
+  <td><%= t(:slide_settings_description) %></td>
+</tr>

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

@@ -9,7 +9,7 @@
     <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' %>>
+    <li<%== ' class="active"' if current == 'Slides' %>>
       <%= link_to t(:slides), admin_slideshow_type_slides_path(@slideshow_type) %>
     </li>
   </ul>

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

@@ -0,0 +1,48 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:slide_settings) %></h1>
+
+<p><span class="warning"><%= t(:slide_settings_warning) %></span></p>
+
+<%= form_tag admin_slide_settings_path, :method => :put do %>
+
+  <p data-hook="slide_path">
+    <label>
+      <%= label_tag 'preferences[slide_path]', t(:slide_path) %>
+      <%= preference_field_tag 'preferences[slide_path]', Spree::Config[:slide_path], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="slide_default_url">
+    <label>
+      <%= label_tag 'preferences[slide_default_url]', t(:slide_default_url) %>
+      <%= preference_field_tag 'preferences[slide_default_url]', Spree::Config[:slide_default_url], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="slide_default_style">
+    <label>
+      <%= label_tag 'preferences[slide_default_style]', t(:slide_default_style) %>
+      <%= collection_select 'preferences', 'slide_default_style', @styles, :first, :first, {:selected => Spree::Config[:slide_default_style] } %> 
+    </label>
+  </p>
+
+  <div id="slide_styles" data-hook="slide_styles">
+    <h2><%= t(:slide_styles) %></h2>
+    <ul id="styles_list">
+      <% @styles.each do |style_name, style_value| %>
+        <li>
+          <%= label_tag "slide_styles[#{style_name}]", style_name %>
+          <%= text_field_tag "slide_styles[#{style_name}]", style_value %>
+          <a href="#" alt="Destroy" class="destroy_slide_style">x</a>
+        </li>
+      <% end %>
+    </ul>
+    <p><a href="#" alt="Add Style" class="add_slide_style"><%= t(:add_new_style) %></a></p>
+  </div>
+
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %>
+  </p>
+
+<% end %>

data/app/views/spree/admin/slide_settings/show.html.erb

@@ -0,0 +1,10 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:slide_settings) %></h1>
+
+<h4><%= t(:slide_path) %>: <%= Spree::Config[:slide_path] %></h4>
+<h4><%= t(:slide_default_url) %>: <%= Spree::Config[:slide_default_url] %></h4>
+<h4><%= t(:slide_default_style) %>: <%= Spree::Config[:slide_default_style] %></h4>
+<h4><%= t(:defined_paperclip_styles) %>: <%= @styles_list %></h4>
+
+<%= link_to_with_icon 'edit', t(:edit), edit_admin_slide_settings_path, :id => 'admin_slide_settings_link' %>

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

@@ -1,9 +1,22 @@
-<%= f.inputs do %>
-	<%= f.input :title %>
-	<%= f.input :url %>
-	<%= f.input :attachment_width, :input_html => { :value => @slideshow_type.slide_width}, :as => :hidden %>
-	<%= f.input :attachment_height, :input_html => { :value => @slideshow_type.slide_height}, :as => :hidden %>
-	<%= f.cktext_area :content, :input_html => { :value => @slide.content }, :label => t("slideshow_type.slide.content") %>
-	<%= f.input :attachment, :as => :file, :label => I18n.t("slideshow_type.slide.image.one").capitalize, :hint => f.object.attachment.blank? ? f.template.content_tag(:span, "No Image Yet") : f.template.image_tag(f.object.attachment.url(:thumbnail)) %>
-	<%= f.input :slideshow_type_id, :as => :hidden, :value => params[:slideshow_type_id] %>
-<% end %>
+<div data-hook="admin_slide_form_fields">
+	<tr data-hook="file">
+		<td><%= t(:filename) %>:</td>
+		<td><%= f.file_field :attachment %></td>
+	</tr>
+	<tr data-hook="title">
+		<td><%= t(:title) %>:</td>
+		<td><%= f.text_field :title %></td>
+	</tr>
+	<tr data-hook="url">
+		<td><%= t(:url) %>:</td>
+		<td><%= f.text_field :url %></td>
+	</tr>
+	<tr data-hook="content">
+		<td><%= t(:content) %>:</td>
+		<td><%= f.text_area :content %></td>
+	</tr>
+	<tr data-hook="enable">
+		<td><%= t(:enable) %>:</td>
+		<td><%= f.check_box :enable %></td>
+	</tr>
+</div>

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

@@ -1,5 +1,5 @@
-<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Image'} %>
-<h1><%= t("slideshow_type.slide.editing_page") %></h1>
+<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slides'} %>
+
 <%= render 'spree/shared/error_messages', :target => @slide %>
 
 <%= form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Images'} %>
+<%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => {:current => 'Slides'} %>
 
 <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">
@@ -13,7 +13,7 @@
     <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) %>
+        <%= link_to image_tag(slide.attachment.url(:mini)), slide.attachment.url(:medium) %>
       </td>
       <td><%= slide.title %></td>
 	  <td><%= slide.url %></td>

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

@@ -1,37 +1,19 @@
 <div data-hook="admin_slideshow_form_fields">
 	<div class="clearfix">
-		<div class="left" data-hook="admin_product_form_left">
+		<div class="left" data-hook="admin_slideshow_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 %>
-
+		</div>
+		<div class="right" data-hook="admin_slideshow_form_right">
 			<%= f.field_container :enable_pagination do %>
 				<%= f.label :enable_pagination, t(:enable_pagination) %><br />
 				<%= f.check_box :enable_pagination %>

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

@@ -1,5 +1,5 @@
 <%= render :partial => 'spree/admin/shared/slideshow_type_tabs', :locals => { :current => 'Slideshow_type Details' } %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @slideshow_type } %>
 
 <%= form_for([:admin, @slideshow_type], :html => { :multipart => true }) do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>

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

@@ -12,7 +12,7 @@
 <div id="new_slideshow" data-hook></div>
 
 <table class="index" id="listing_products">
-  <tr data-hook="admin_products_index_headers">
+  <tr data-hook="admin_slideshows_index_headers">
     <th><%= t(:category) %></th>
     <th><%= t(:enable) %></th>
     <th><%= t(:slide_number) %></th>
@@ -23,7 +23,7 @@
     <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">
+    <td class="actions" data-hook="admin_slideshows_index_row_actions">
       <%= link_to_edit slideshow_type, :class => 'edit' %>
       &nbsp;
       <%= link_to_delete slideshow_type %>

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

@@ -2,39 +2,21 @@
 
 <%= 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="clearfix" data-hook="new_slideshow_type_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 %>
-
+		</div>
+		<div class="right">
 			<%= f.field_container :enable_pagination do %>
 				<%= f.label :enable_pagination, t(:enable_pagination) %><br />
 				<%= f.check_box :enable_pagination %>

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

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

data/config/routes.rb

@@ -8,6 +8,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
     end
+    resource :slide_settings
   end
 
 end

data/db/migrate/20120116081431_create_slideshow_types.rb

@@ -3,9 +3,6 @@ class CreateSlideshowTypes < ActiveRecord::Migration
     create_table :slideshow_types do |t|
       t.string :category
       t.boolean :enabled, :default => false
-      t.integer :slide_height, :default => 400
-      t.integer :slide_width, :default => 900
-      t.integer :slide_number, :default => 4
       t.boolean :enable_navigation, :default => false
       
       t.timestamps

data/db/migrate/20120116083546_create_slides.rb

@@ -7,7 +7,6 @@ class CreateSlides < ActiveRecord::Migration
       t.string   :attachment_content_type, :attachment_file_name
       t.datetime :attachment_updated_at
       t.integer  :attachment_size, :position
-      t.string   :type, :limit => 75
 
       t.references :slideshow_type
       

data/db/migrate/20130226082756_add_enable_to_slide.rb

@@ -0,0 +1,8 @@
+class AddEnableToSlide < ActiveRecord::Migration
+  def change
+    add_column :spree_slides, :enable, :boolean, :default => true, :after => :content
+    remove_column :spree_slideshow_types, :slide_number
+    remove_column :spree_slideshow_types, :slide_width
+    remove_column :spree_slideshow_types, :slide_height
+  end
+end

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

@@ -4,12 +4,11 @@ module SpreeMultiSlideshow
       
       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"
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"
       end
 
       def add_stylesheets
         inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
-        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations
@@ -23,17 +22,7 @@ module SpreeMultiSlideshow
          else
            puts "Skiping rake db:migrate, don't forget to run it!"
          end
-      end
-      
-      def add_ckeditor
-        res = ask "Would you like to run the ckeditor generator now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate ckeditor:install --orm=active_record --backend=paperclip'
-        else
-          puts "Skiping rails generate ckeditor:install --orm=active_record --backend=paperclip, don't forget to run it!"
-        end
-      end
-      
+      end      
     end
   end
 end

data/lib/spree_multi_slideshow.rb

@@ -1,4 +1,2 @@
 require 'spree_core'
-require 'ckeditor'
-require 'formtastic'
 require 'spree_multi_slideshow/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -59,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ckeditor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
@@ -104,20 +72,24 @@ files:
 - lib/spree_multi_slideshow.rb
 - app/assets/images/store/slides/pagination.png
 - app/assets/images/store/slides/sprite01.png
+- app/assets/javascripts/admin/slide_settings.js
 - app/assets/javascripts/admin/slides/index.js
 - app/assets/javascripts/admin/slides/new.js
 - app/assets/javascripts/admin/spree_multi_slideshow.js
 - app/assets/javascripts/store/spree_multi_slideshow.js
-- app/assets/stylesheets/admin/spree_multi_slideshow.css
 - app/assets/stylesheets/store/spree_multi_slideshow.css
+- app/controllers/spree/admin/slide_settings_controller.rb
 - app/controllers/spree/admin/slides_controller.rb
 - app/controllers/spree/admin/slideshow_types_controller.rb
-- app/helpers/spree/slides_helper.rb
 - app/helpers/spree/slideshow_types_helper.rb
+- app/models/spree/app_configuration_decorator.rb
 - app/models/spree/slide.rb
 - app/models/spree/slideshow_type.rb
 - app/overrides/slideshow_type_admin_tab.rb
+- app/views/spree/admin/shared/_slide_setting_configurations_menu.html.erb
 - app/views/spree/admin/shared/_slideshow_type_tabs.html.erb
+- app/views/spree/admin/slide_settings/edit.html.erb
+- app/views/spree/admin/slide_settings/show.html.erb
 - app/views/spree/admin/slides/_form.html.erb
 - app/views/spree/admin/slides/edit.html.erb
 - app/views/spree/admin/slides/index.html.erb
@@ -131,6 +103,7 @@ files:
 - db/migrate/20120116083546_create_slides.rb
 - db/migrate/20120323164044_multi_slideshow_namespace.rb
 - db/migrate/20130114150224_add_enable_pagination.rb
+- db/migrate/20130226082756_add_enable_to_slide.rb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb

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

@@ -1,17 +0,0 @@
-/*
- *= require admin/spree_core
- *= 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/helpers/spree/slides_helper.rb

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