spree_multi_slideshow 0.70.7 → 0.70.8

data/app/models/slideshow_type.rb

@@ -1,16 +1,21 @@
 class SlideshowType < ActiveRecord::Base
-  belongs_to :slide
+  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}} }
-
-  def initialize(*args)
-    super(*args)
+  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/shared/_slideshow_type_tabs.html.erb

@@ -1,14 +1,12 @@
 <% content_for :sidebar do %>
-
-  <h3><%= t("slideshow_type.sidebar") %></h3>
+  <h3><%= t(:sidebar) %></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<%== ' class="active"' if current == 'Slideshow Details' %>>
+	  <%= link_to t(: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 == 'Slides' %>>
+      <%= link_to t(:slide), admin_slideshow_type_slides_path(@slideshow_type) %>
     </li>
   </ul>
   <br class="clear" />

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

@@ -1,8 +1,15 @@
-<%= 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.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 %>
+<%= 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">
+  <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>

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

@@ -1,12 +1,12 @@
-<%= render :partial => 'admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Image'} %>
-<h1><%= t("slideshow_type.slide.editing_page") %></h1>
+<%= render :partial => 'admin/shared/slideshow_type_tabs', :locals => {:current => 'Slides'} %>
+
 <%= render 'shared/error_messages', :target => @slide %>
 
-<%= semantic_form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
-  <table class="basic-table" data-hook="edit_image">
+<%= form_for [:admin, @slideshow_type, @slide], :html => { :multipart => true } do |f| %>
+  <table class="basic-table" data-hook="edit_slide">
     <tr data-hook="thumbnail">
       <td><%= t(:thumbnail) %>:</td>
-      <td><%= link_to image_tag(@slide.attachment.url(:small)), @slide.image.url(:medium) %></td>
+      <td><%= link_to image_tag(@slide.attachment.url(:small)), @slide.attachment.url(:medium) %></td>
     </tr>
     <%= render :partial => 'form', :locals => { :f => f } %>
   </table>

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

@@ -1,26 +1,20 @@
-<%= render :partial => 'admin/shared/slideshow_type_tabs', :locals => {:current => 'Slide Image'} %>
+<%= render :partial => 'admin/shared/slideshow_type_tabs', :locals => {:current => 'Slides'} %>
 
-<%= 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 %>">
+<table class="index sortable" data-hook="images_table">
   <tr data-hook="images_header">
-    <th><%= t("slideshow_type.slide.thumbnail") %></th>
-    <th><%= t("slideshow_type.slide.title") %></th>
-	<th><%= t("slideshow_type.slide.url") %></th>
+    <th><%= t(:thumbnail) %></th>
+    <th><%= t(:title) %></th>
+	<th><%= t(:url) %></th>
     <th><%= t(:action) %></th>
   </tr>
 
-  <% Slide.find_all_by_slideshow_type_id(@slideshow_type.id).each do |slide| %>
-    <tr id="<%= dom_id(slide) %>" data-hook="images_row">
+  <% @slideshow_type.slides.each do |slide| %>
+    <tr id="<%= dom_id(slide) %>" data-hook="slides_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.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' %>
@@ -29,5 +23,10 @@
       </td>
     </tr>
   <% end %>
+</table>
 
-</table>
+<div id="slides" 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/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| %>
+<h4><%= t(:new_slide) %></h4>
+<%= 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/admin/slideshow_types/_form.html.erb

@@ -1,8 +1,40 @@
-<%= 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 class="clearfix">
+	<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)%> <span class="required">*</span><br />
+			<%= f.text_field :slide_height, :class => 'fullwidth title' %>
+			<%= f.error_message_on :slide_height %>
+		<% end %>
+	</div>
+	<div class="right" data-hook="admin_slideshow_form_right">
+		<%= f.field_container :slide_number do %>
+			<%= f.label :slide_number, t(:slide_number) %><br />
+			<%= f.text_field :slide_number, :class => '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, :class => 'title'  %>
+			<%= f.error_message_on :enable_navigation %>
+		<% end %>
+
+		<%= f.field_container :enabled do %>
+			<%= f.label :enabled, t(:enabled) %> <span class="required">*</span><br />
+			<%= f.check_box :enabled, :class => 'title'  %>
+			<%= f.error_message_on :enabled %>
+		<% end %>
+	</div>
+</div>

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

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

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

@@ -1,32 +1,32 @@
-<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_type_link">
+      <%= button_link_to t(:new_slideshow_type), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_slideshow_type'} %>
+    </li>
+  </ul>
+  <br class="clear" />
 </div>
 
-<h1><%= t("slideshow_type.many") %></h1>
+<h1><%= "#{t('actions.listing')} #{t(:slideshow_type)}" %></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_slideshow_types">
+  <tr data-hook="admin_slideshow_types_index_headers">
+    <th><%= t(:category) %></th>
+    <th><%= t(:enable) %></th>
+    <th><%= t(:slide_number) %></th>
+    <th data-hook="admin_slideshow_types_index_header_actions"></th>
+  </tr>
+<% @slideshow_types.each do |slideshow_type| %>
+  <tr id="<%= 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/admin/slideshow_types/new.html.erb

@@ -1,7 +1,49 @@
-<h1><%= t("slideshow_type.new_page") %></h1>
-<%= render "shared/error_messages", :target => @slideshow_type %>
+<%= render 'shared/error_messages', :target => @slideshow_type %>
 
-<%= semantic_form_for([:admin, @slideshow_type], :html => { :enctype => "multipart/form-data" }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => '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) %> <span class="required">*</span><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) %><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, :class => 'fullwidth title'  %>
+				<%= f.error_message_on :enable_navigation %>
+			<% end %>
+			
+			<%= f.field_container :enabled do %>
+				<%= f.label :enabled, t(:enabled) %> <span class="required">*</span><br />
+				<%= f.check_box :enabled, :class => 'fullwidth title'  %>
+				<%= f.error_message_on :enabled %>
+			<% end %>
+		</div>
+	</div>
+
+	<%= render :partial => 'admin/shared/new_resource_links' %>
+
+</fieldset>
 <% end %>

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

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

data/config/locales/it.yml

@@ -9,6 +9,7 @@ it:
         slide_height: Altezza
         slide_number: Numero Slide
         enable_navigation: Tasti navigazione attivi?
+        enable_pagination: Paginazione attiva?
       slide:
         title: Titolo
         url: Link a prodotto o tassonomia o a sito esterno
@@ -21,25 +22,23 @@ it:
         one: Slide
         many: Slides
 
-  slideshow_type:
-    one: Slideshow
-    many: Slideshows
-    enable: Attivo?
-    category: Categoria
-    slide_number: Numero Slide
-    detail: Attributi
-    sidebar: Gestione slideshow e slide.
-    new_page: Nuovo slideshow
-    slide:
-      one: Slide
-      many: Slides
-      new_page: Nuova slide
-      image:
-        one: Immagine
-        many: Immagini
-      thumbnail: Miniatura
-      title: Titolo
-      url: Link a prodotto o tassonomia o a sito esterno
-      editing_page: Modifica slide
-    editing_page: Modifica slideshow
-    confirm_delete: Sei sicuro?
+  new_slideshow_type: "Nuovo Slideshow"
+  slideshow_type: "Slideshow"
+  slideshow_types: "Slideshows"
+  enable: Attivo?
+  category: Categoria
+  slide_number: Numero Slide
+  detail: Attributi
+  sidebar: Gestione slideshow e slide.
+  new_page: Nuovo slideshow
+  slide: "Slide"
+  slides: "Slides"
+  new_slide: Nuova slide
+  image:
+    one: Immagine
+    many: Immagini
+  thumbnail: Miniatura
+  title: Titolo
+  url: Link a prodotto o tassonomia o a sito esterno
+  editing_page: Modifica
+  confirm_delete: Sei sicuro?

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 => 1
+      t.boolean :enable_navigation, :default => 0
       
       t.timestamps
     end

data/db/migrate/20130116143809_add_option_pagination.rb

@@ -0,0 +1,13 @@
+class AddOptionPagination < ActiveRecord::Migration
+  def up
+    add_column :slideshow_types, :enable_pagination, :boolean, :default => false, :after => :enable_navigation
+    add_column :slides, :attachment_width, :string, :after => :attachment_size
+    add_column :slides, :attachment_height, :string, :after => :attachment_width
+  end
+  
+  def down
+    remove_column :slideshow_types, :enable_pagination
+    remove_column :slides, :attachment_width
+    remove_column :slides, :attachment_height
+  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 0.70.7
+  version: 0.70.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: formtastic
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,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
@@ -113,9 +99,11 @@ files:
 - app/views/admin/slideshow_types/edit.html.erb
 - app/views/admin/slideshow_types/index.html.erb
 - app/views/admin/slideshow_types/new.html.erb
+- app/views/admin/slideshow_types/new.js.erb
 - db/migrate/20120116081431_create_slideshow_types.rb
 - db/migrate/20120116083546_create_slides.rb
 - db/migrate/20120719112245_rename_image_to_attachment.rb
+- db/migrate/20130116143809_add_option_pagination.rb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb