spree_banner 1.1.6 → 1.3.0

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', '~> 1.1.6'
+  gem 'spree_banner', '~> 1.3.0'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:
@@ -22,25 +22,14 @@ Example
 
 1. add banner helper method in your view:
 <pre>
-	<%= insert_banner %>
+	<%= insert_banner_box(:category => "my_category") %>
 </pre>
 and add banner in the admin section
 2. Additional options:
 <pre>
-	<%= insert_banner(:category => "my_category") %>
+	:class => "my_class"
+	:style => "my_style"
+	:list = true|false
 </pre>
-displays banner for which the category column, dafault is ""
-<pre>
-	<%= insert_banner(:max => 10) %>
-</pre>
-limits the number of banner shown to 10 (default 1)
-<pre>
-	<%= insert_banner(:class => "your_class") %>
-</pre>
-set banner class (default banner)
-<pre>
-	<%= insert_banner(:list => true/false) %>
-</pre>
-set banner container (default false is DIV)
 
 Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

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

@@ -1,29 +1,39 @@
 $(document).ready(function() {
 
-  $('.destroy_banner_style').on("click", function() {
-   $(this).parent().remove();
-  });
+	$('.destroy_banner_style').live("click", function(e) {
+		e.preventDefault();
+		$(this).parent().remove();
+	});
+
+	$('.destroy_new_banner_styles').live("click", function(e) {
+		e.preventDefault();
+		$(this).closest('.new_banner_styles').remove();
+	});
 
   // Handle adding new styles
   var styles_hash_index = 1;
-  $('.add_banner_style').click(function() {
-    $('#styles_list').append(generate_html_for_hash("new_banner_styles", styles_hash_index));
+  $('.add_new_banner_style').live("click", function(e) {
+    e.preventDefault();
+    $('#new-banner-styles').append(generate_html_for_hash("new_banner_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_banner_style">&nbsp;x</a>';
-    html += '</li>';
-
-    index += 1;
-    return html;
+     var html = '<div class="' + hash_name + ' row"><div class="field">';
+	    html += '<div class="five columns">';
+	    html += '<label for="' + hash_name + '_' + index + '_name">';
+	    html += Spree.translations.name + '</label>';
+	    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text" class="fullwidth"><br>';
+	    html += '</div><div class="five columns">'
+	    html += '<label for="' + hash_name + '_' + index + '_value">';
+	    html += Spree.translations.value + '</label>';
+	    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text" class="fullwidth">';
+	    html += '</div><div class="two columns">'
+	    html += '<a href="#" title="' + Spree.translations.destroy + '" class="destroy_' + hash_name + ' with-tip button" style="margin-top: 19px;"><i class="icon-trash"></i> &nbsp; ' + Spree.translations.destroy + '</a>';
+	    html += '</div></div></div>';
+
+	    index += 1;
+	    return html;
   };
 
 

data/app/assets/javascripts/store/spree_banner.js

@@ -1 +1 @@
-//= require store/spree_core
+

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

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_core
-*/

data/app/controllers/spree/admin/{banner_settings_controller.rb → banner_box_settings_controller.rb}

@@ -1,9 +1,9 @@
 module Spree
   module Admin
-    class BannerSettingsController < Spree::Admin::BaseController
+    class BannerBoxSettingsController < Spree::Admin::BaseController
+      
       def show
-        styles = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
-        @styles_list = styles.collect { |k, v| k }.join(", ")
+        redirect_to( :action => :edit )
       end
 
       def edit
@@ -19,7 +19,7 @@ module Spree
         respond_to do |format|
           format.html {
             flash[:notice] = t(:banner_settings_updated)
-            redirect_to admin_banner_settings_path
+            redirect_to edit_admin_banner_box_settings_path
           }
         end
       end
@@ -38,10 +38,10 @@ module Spree
       end
 
       def update_paperclip_settings
-        Spree::Banner.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
-        Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
-        Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
-        Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
+        Spree::BannerBox.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+        Spree::BannerBox.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
+        Spree::BannerBox.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
+        Spree::BannerBox.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
       end
     end
   end

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

@@ -0,0 +1,44 @@
+module Spree
+  module Admin
+    class BannerBoxesController < ResourceController
+      
+      def index
+        respond_with(@collection)
+      end
+      
+      def show
+        redirect_to( :action => :edit )
+      end
+      
+      def clone
+        @new = @banner_box.duplicate
+
+        if @new.save
+          flash.notice = I18n.t('notice_messages.banner_box_cloned')
+        else
+          flash.notice = I18n.t('notice_messages.banner_box_not_cloned')
+        end
+
+        respond_with(@new) { |format| format.html { redirect_to edit_admin_banner_box_url(@new) } }
+      end
+      
+      protected
+      def find_resource
+        Spree::BannerBox.find(params[:id])
+      end
+      
+      def location_after_save
+         edit_admin_banner_box_url(@banner_box)
+      end
+      
+      def collection
+        return @collection if @collection.present?
+        params[:q] ||= {}
+        params[:q][:s] ||= "title asc"
+        
+        @search = super.ransack(params[:q])
+        @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
+      end
+    end
+  end
+end

data/app/helpers/spree/banner_boxes_helper.rb

@@ -0,0 +1,24 @@
+module Spree
+  module BannerBoxesHelper
+
+    def insert_banner_box(params={})
+      params[:category] ||= "home"
+      params[:class] ||= "banner"
+      params[:style] ||= "small"
+      params[:list] ||= false
+      @@banner = Spree::BannerBox.enable(params[:category])
+      if @@banner.blank?
+        return ''
+      end
+      res = []
+      banner = @@banner.sort_by { |ban| ban.position }
+        
+      if (params[:list])
+        content_tag(:ul, banner.map{|ban| content_tag(:li, link_to(image_tag(ban.attachment.url(params[:style].to_sym)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe )
+      else
+        banner.map{|ban| content_tag(:div, link_to(image_tag(ban.attachment.url(params[:style].to_sym)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe
+      end
+    end
+    
+  end
+end

data/app/models/spree/app_configuration_decorator.rb

@@ -1,3 +1,20 @@
+# This is the primary location for defining spree preferences
+#
+# The expectation is that this is created once and stored in
+# the spree environment
+#
+# setters:
+# a.color = :blue
+# a[:color] = :blue
+# a.set :color = :blue
+# a.preferred_color = :blue
+#
+# getters:
+# a.color
+# a[:color]
+# a.get :color
+# a.preferred_color
+#
 Spree::AppConfiguration.class_eval do
   # Preferences related to banner settings
   preference :banner_default_url, :string, :default => '/spree/banners/:id/:style/:basename.:extension'

data/app/models/spree/banner_box.rb

@@ -0,0 +1,65 @@
+module Spree
+  class BannerBox < ActiveRecord::Base
+    attr_accessible :presentation, :url, :category, :position, :enabled, :attachment
+    
+    has_attached_file :attachment,
+                :url  => "/spree/banners/:id/:style_:basename.:extension",
+                :path => ":rails_root/public/spree/banners/:id/:style_:basename.:extension",
+                :styles => lambda {|a|{
+                  :mini => "80x80#",
+                  :small => "120x120#",
+                  :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
+                }},
+                :convert_options => { :all => '-strip -auto-orient' }
+    # 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
+    
+    validates_presence_of :category
+    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 => I18n.t(:images_only)
+    
+    scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
+    
+    # Load user defined paperclip settings
+    include Spree::Core::S3Support
+    supports_s3 :attachment
+    
+    Spree::BannerBox.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+    Spree::BannerBox.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
+    Spree::BannerBox.attachment_definitions[:attachment][:url] = Spree::Config[:banner_url]
+    Spree::BannerBox.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
+    Spree::BannerBox.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
+        
+    def initialize(*args)
+      super(*args)
+      last_banner = BannerBox.last
+      self.position = last_banner ? last_banner.position + 1 : 0
+    end
+    
+    # for adding banner_boxes which are closely related to existing ones
+    # define "duplicate_extra" for site-specific actions, eg for additional fields
+    def duplicate
+      p = self.dup
+      p.category = 'COPY OF ' + category
+      p.created_at = p.updated_at = nil
+      p.url = url
+      p.attachment = attachment
+
+      # allow site to do some customization
+      p.send(:duplicate_extra, self) if p.respond_to?(:duplicate_extra)
+      p.save!
+      p
+    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
+    
+  end
+end

data/app/overrides/banner_admin_tab.rb

@@ -1,10 +1,9 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
-                      :name => "banner_admin_tab",
+                      :name => "banner_box_admin_tab",
                       :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                      :text => "<%= tab(:banners, :url => spree.admin_banners_path) %>",
-                      :disabled => false)
+                      :text => "<%= tab(:banner_boxes, :icon => 'icon-bookmark') %>")
 
-Deface::Override.new(:virtual_path => "spree/admin/configurations/index",
-                      :name => "add_banner_setting_to_configuration_menu",
-                      :insert_bottom => "[data-hook='admin_configurations_menu']",
-                      :partial => "spree/admin/shared/banner_setting_configurations_menu")
+Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
+                      :name => "add_banner_box_settings",
+                      :insert_bottom => "[data-hook='admin_configurations_sidebar_menu'], #admin_configurations_sidebar_menu[data-hook]",
+                      :text => "<%= configurations_sidebar_menu_item(:banner_box_settings, edit_admin_banner_box_settings_url) %>")

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

@@ -0,0 +1,72 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= t(:banner_box_settings) %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/banner_box_sub_menu' %>
+
+<%= form_tag admin_banner_box_settings_path, :method => :put do %>
+  
+  <fieldset class="no-border-top">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= t(:general_settings)%></legend>
+      
+      <div class="field">
+        <div class="warning note"><%= t(:banner_box_settings_warning) %></div>
+      </div>    
+
+      <div data-hook="attachment_path" class="field">
+        <%= label_tag 'preferences[attachment_path]', t(:banner_path) %>
+        <%= preference_field_tag 'preferences[banner_path]', Spree::Config[:banner_path], :type => :string %>
+      </div>
+
+      <div class="alpha eight columns">
+        <div data-hook="attachment_default_url" class="field">
+          <%= label_tag 'preferences[attachment_default_url]', t(:banner_default_url) %>
+          <%= preference_field_tag 'preferences[banner_default_url]', Spree::Config[:banner_default_url], :type => :string %>
+        </div>
+      </div>
+
+      <div class="alpha eight columns">
+        <div data-hook="attachment_url" class="field">
+          <%= label_tag 'preferences[attachment_url]', t(:banner_url) %>
+          <%= preference_field_tag 'preferences[banner_url]', Spree::Config[:banner_url], :type => :string %>
+        </div>
+      </div>
+
+      <div class="omega four columns">
+        <div data-hook="attachment_default_style" class="field">
+          <%= label_tag 'preferences[attachment_default_style]', t(:banner_default_style) %>
+          <%= collection_select 'preferences', 'banner_default_style', @styles, :first, :first, {:selected => Spree::Config[:banner_default_style] }, :class => 'select2 fullwidth' %> 
+        </div>
+      </div>
+
+    </fieldset>
+
+    <fieldset class="no-border-bottom" id="attachment_styles" data-hook="banner_styles">
+      <legend align="center"><%= t(:banner_styles) %></legend>
+
+      <div id="banner_styles_list" class="row frameless">      
+        <% @styles.each_with_index do |(style_name, style_value), index| %>        
+          <div class="field three columns">
+            <%= label_tag "banner_styles[#{style_name}]", style_name %>
+            <a href='#' alt="<%= t(:destroy)%>" title="<%= t(:destroy)%>" class='destroy_banner_style with-tip'><i class='icon-trash'></i></a>
+            <%= text_field_tag "banner_styles[#{style_name}]", style_value, :class => 'fullwidth' %>
+          </div>
+        <% end %>
+      </div>
+
+      <div id="new-banner-styles" class="row frameless"></div>
+
+      <div class="field">
+        <%= link_to_with_icon 'icon-plus', t(:add_new_banner_style), '#', :class => 'add_new_banner_style button' %>
+      </div>
+    </fieldset>    
+
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button t(:update), 'icon-refresh' %>
+    </div>
+  </fieldset>
+
+<% end %>

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

@@ -0,0 +1,47 @@
+<div data-hook="admin_banner_box_form_fields">
+
+	<div class="left eight columns alpha" data-hook="admin_banner_box_form_left">    
+		<%= f.field_container :category do %>
+			<%= f.label :category, raw(t(:category) + content_tag(:span, ' *', :class => 'required')) %>
+			<%= f.text_field :category, :class => 'fullwidth title' %>
+			<%= f.error_message_on :category %>
+		<% end %>
+
+		<%= f.field_container :url do %>
+			<%= f.label :url, raw(t(:url)) %>
+			<%= f.text_field :url, :class => 'fullwidth title' %>
+			<%= f.error_message_on :url %>
+		<% end %>
+
+		<%= f.field_container :presentation do %>
+			<%= f.label :presentation, t(:alt_text) %>
+			<%= f.text_field :presentation, :class => 'fullwidth' %>
+			<%= f.error_message_on :presentation %>
+		<% end %>
+	</div>
+
+	<div class="right seven columns omega" data-hook="admin_banner_box_form_right">
+		<div data-hook="thumbnail" class="field alpha six columns align-center">
+			<%= f.label t(:thumbnail) %><br>
+			<%= link_to image_tag(@banner_box.attachment.url(:mini)), @banner_box.attachment.url(:small) %>
+		</div>
+		
+		<%= f.field_container :attachment do %>
+			<%= f.label :attachment, t(:attachment) %><br />
+			<%= f.file_field :attachment %>
+			<%= f.error_message_on :attachment %>
+		<% end %>
+
+		<%= f.field_container :enabled do %>
+			<%= f.label :enabled, t(:enabled) %><br />
+			<%= f.check_box :enabled %>
+			<%= f.error_message_on :enabled %>
+		<% end %>
+	</div>
+
+	<div class="clear"></div>
+
+	<div data-hook="admin_banner_box_form_additional_fields"></div>
+
+	<div class="clear"></div>
+</div>

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

@@ -0,0 +1,17 @@
+<%= render :partial => 'spree/admin/shared/banner_box_sub_menu' %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_banner_boxes_list), admin_banner_boxes_url, :icon => 'icon-arrow-left' %></li>
+  <li id="new_banner_box_link">
+    <%= button_link_to t(:new_banner_box), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_banner_box' } %>
+  </li>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner_box } %>
+
+<%= form_for [:admin, @banner_box], :method => :put, :html => { :multipart => true } do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,63 @@
+<% content_for :page_title do %>
+	<%= t(:listing_banner_boxes) %>
+<% end %>
+
+<% content_for :page_actions do %>
+	<div class="toolbar" data-hook="toolbar">
+		<ul class="actions header-action-links inline-menu">
+			<li id="new_banner_box_link">
+				<%= button_link_to t(:new_banner_box), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_banner_box' } %>
+			</li>
+		</ul>
+	</div>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/banner_box_sub_menu' %>
+
+<div id="new_banner_box" data-hook></div>
+
+<% if @collection.any? %>
+<table class="index sortable" id="listing_banner_boxes" data-sortable-link="<%= update_positions_admin_banner_boxes_url() %>">
+	<colgroup>
+	<col style="width: 5%">
+	<col style="width: 15%;">
+	<col style="width: 10%;">
+	<col style="width: 10%;">
+	<col style="width: 17%;">
+</colgroup>
+<thead>
+	<tr data-hook="admin_products_index_headers">
+		<th colspan="2"><%= t(:thumbnail) %></th>
+		<th><%= t(:category) %></th>
+		<th><%= t(:url) %></th>
+		<th data-hook="admin_products_index_header_actions" class="actions"></th>
+	</tr>  
+</thead>  
+<tbody>
+	<% @collection.each do |banner_box| %>
+	<tr id="<%= spree_dom_id banner_box %>" data-hook="admin_banner_boxes_index_rows" class="<%= cycle('odd', 'even') %>">
+		<td class="no-border">
+			<span class="handle"></span>
+		</td>
+		<td class="align-center"><%= image_tag(banner_box.attachment(:mini)) %></td>
+		<td class="align-center"><%= banner_box.category rescue '' %></td>
+		<td class="align-center"><%= banner_box.url rescue '' %></td>
+		<td class="actions" data-hook="admin_products_index_row_actions">
+			<%= link_to_edit banner_box, :no_text => true, :class => 'edit' %>
+			&nbsp;
+			<%= link_to_with_icon 'icon-copy', t(:clone), clone_admin_banner_box_url(banner_box), :no_text => true, :class => 'clone' %>
+            &nbsp;
+			<%= link_to_delete banner_box, :no_text => true %>
+		</td>
+	</tr>
+	<% end %>
+</tbody>
+</table>
+<% else %>
+<div class="no-objects-found">
+	<%= t(:no_results) %>
+</div>
+<% end %>
+
+<%= paginate @collection %>
+

data/app/views/spree/admin/{banners → banner_boxes}/new.html.erb

@@ -1,9 +1,10 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner_box } %>
 
-<%= form_for [:admin, @banner], :html => { :multipart => true } do |f| %>
-<fieldset data-hook="new_banner">
-	<div class="clearfix" data-hook="new_banner_attrs">
-		<div class="left">
+<%= form_for [:admin, @banner_box], :html => { :multipart => true } do |f| %>
+<fieldset data-hook="new_banner_box">
+	<legend align="center"><%= t(:new_banner_box) %></legend>
+	<div data-hook="new_banner_box_attrs" class="row">
+		<div class="left alpha eight columns">
 			<%= f.field_container :category do %>
 				<%= f.label :category, t(:category) %> <span class="required">*</span><br />
 				<%= f.text_field :category, :class => 'fullwidth title' %>
@@ -16,12 +17,19 @@
 				<%= f.error_message_on :url %>
 			<% end %>
 		</div>
-		<div class="right">
+		
+		<div class="right omega four columns">
 			<%= f.field_container :attachment do %>
 				<%= f.label :attachment, t(:attachment) %><br />
 				<%= f.file_field :attachment %>
 				<%= f.error_message_on :attachment %>
 			<% end %>
+			
+			<%= f.field_container :presentation do %>
+				<%= f.label :presentation, t(:alt_text) %><br />
+				<%= f.text_field :presentation, :class => 'fullwidth' %>
+				<%= f.error_message_on :presentation %>
+			<% end %>
 
 			<%= f.field_container :enabled do %>
 				<%= f.label :enabled, t(:enabled) %><br />

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

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

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

@@ -0,0 +1,6 @@
+<% content_for :sub_menu do %>
+  <ul id="sub_nav" data-hook="admin_banner_box_sub_tabs" class="inline-menu">
+    <%= tab :banner_boxes, :match_path => '/banner_boxes' %>
+    <%= tab :banner_box_settings, edit_admin_banner_box_settings_url %>
+  </ul>
+<% end %>

data/config/locales/en.yml

@@ -1,78 +1,35 @@
----
 en:
+  images_only: "deve essere JPG, JPEG, PNG o GIF"
+  banner_box_settings: Banner Setting
+  add_new_banner_style: "Add New Banner Style"
+  banner_box_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Banner to do this."
+  banner_settings_description: "Banner Settings Description"
+  banner_settings_updated: "Banner Settings successfully updated."
+  banner_default_style: "Banner Default Path"
+  banner_default_url: "Banner Default URL"
+  banner_path: "Banner Path"
+  banner_styles: "Paperclip Styles Banner"
+  banner_url: "Banner URL"
+  back_to_banner_boxes_list: "Back To Banner List"
+  new_banner_box: "New Banner"
+  listing_banner_boxes: "Listing Banners"
+  enabled: Enabled?
+  url: Link url
+  attachment: Attachment
+  category: Category
+  banner_boxes: Banners
+  banner_box: Banner
+  notice_messages:
+    banner_box_cloned: "Banner has been cloned"
+    banner_box_not_cloned: "Banner could not be cloned"
   activerecord:
-    errors: &errors
-      format: "%{attribute} %{message}\n"
-
-      messages: &errors_messages
-        inclusion: "is not included in the list"
-        exclusion: "is reserved"
-        invalid: "is invalid"
-        confirmation: "doesn't match confirmation"
-        record_invalid: "Validation failed: %{errors}"
-        taken: has already been taken
-        accepted: "must be accepted"
-        empty: "can't be empty"
-        blank: "can't be blank"
-        too_long:
-          one: "is too long (maximum is 1 character)"
-          other: "is too long (maximum is %{count} characters)"
-        too_short:
-          one:  "is too short (minimum is 1 character)"
-          other:  "is too short (minimum is %{count} characters)"
-        wrong_length:
-          one: "is the wrong length (should be 1 character)"
-          other: "is the wrong length (should be %{count} characters)"
-        not_a_number: "is not a number"
-        not_an_integer: "must be an integer"
-        greater_than: "must be greater than %{count}"
-        greater_than_or_equal_to: "must be greater than or equal to %{count}"
-        equal_to: "must be equal to %{count}"
-        less_than: "must be less than %{count}"
-        less_than_or_equal_to: "must be less than or equal to %{count}"
-        odd: "must be odd"
-        even: "must be even"
-
-      models:
-        banner:
-          attributes:
-            banner:
-              category: Category
-              enabled: Enable?
-              url: Link to product or taxonomy or to external website
-              attachment_width: Width image
-              attachment_height: Height image
-              attachment: Image
-              attachment_file_name: Image Name
-              position: Position (if there are other banners with the same category)
-    attributes:
-      banner:
-        category: Category
-        enabled: Enable?
-        url: Link to product or taxonomy or to external website
-        attachment_width: Width image
-        attachment_height: Height image
-        attachment: Image
-        position: Position (if there are other banners with the same category)
     models:
-      banner:
+      banner_box:
         one: Banner
-        many: Banners
-
-  banner: "Banner"
-  banners: "Banners"
-  enable: Enable?
-  enabled: Enable?
-  category: Category
-  no_image: No Image Yet
-  attachment_width: Width image
-  attachment_height: Height image
-  position: Position (if there are other banners with the same category)
-  url: Link to product or taxonomy or to external website
-  image:
-    one: Image
-    many: Images
-  banner_desc: Manage banner.
-  new_banner: New banner
-  editing_banner: Edit banner
-  confirm_delete: Are you sure?
+        other: Banners
+    attributes:
+      banner_box:
+        category: Category
+        updated_at: Updated At
+        created_at: Created At
+        enabled: Enabled?

data/config/locales/it.yml

@@ -1,79 +1,35 @@
----
 it:
+  images_only: "deve essere JPG, JPEG, PNG o GIF"
+  banner_box_settings: Impostazioni Banner
+  add_new_banner_style: "Aggiungi nuovo stile dei Banner"
+  banner_box_settings_warning: "Sarà necessario rigenerare le miniature dopo aver aggiornato gli stili di paperclip delle Slide, col comando rake paperclip:refresh:thumbnails CLASS=Spree::Banner"
+  banner_settings_description: "Descrizione Impostazioni Banner"
+  banner_settings_updated: "Impostazioni Banner aggiornate con successo."
+  banner_default_style: "Stile di Default dell'allegato dei Banner"
+  banner_default_url: "URL di Default dell'allegato dei Banner"
+  banner_path: "Percorso dell'allegato dei Banner"
+  banner_styles: "Stili di Paperclip dei Banner"
+  banner_url: "URL dell'allegato dei Banner"
+  back_to_banner_boxes_list: "Torna all'elenco Banner"
+  new_banner_box: "Nuova Banner"
+  listing_banner_boxes: "Elenco Banner"
+  enabled: Attivo?
+  url: Link url
+  attachment: Immagine
+  category: Categoria
+  banner_boxes: Banners
+  banner_box: Banner
+  notice_messages:
+    banner_box_cloned: "Banner Duplicato"
+    banner_box_not_cloned: "Impossibili Duplicare il Banner"
   activerecord:
-    errors: &errors
-      format: "%{attribute} %{message}\n"
-      
-      messages: &errors_messages
-        inclusion: "non è incluso nella lista"
-        exclusion: "è riservato"
-        invalid: "non è valido"
-        confirmation: "non coincide con la conferma"
-        record_invalid: "Validazione fallita: %{errors}"
-        taken: è già in uso
-        accepted: "deve essere accettata"
-        empty: "non può essere vuoto"
-        blank: "non può essere lasciato in bianco"
-        too_long:
-          one: "è troppo lungo (il massimo è 1 carattere)"
-          other: "è troppo lungo (il massimo è %{count} caratteri)"
-        too_short:
-          one:  "è troppo corto (il minimo è 1 carattere)"
-          other:  "è troppo corto (il minimo è %{count} caratteri)"
-        wrong_length:
-          one: "è della lunghezza sbagliata (deve essere di 1 carattere)"
-          other: "è della lunghezza sbagliata (deve essere di %{count} caratteri)"
-        not_a_number: "non è un numero"
-        not_an_integer: "non è un intero"
-        greater_than: "deve essere superiore a %{count}"
-        greater_than_or_equal_to: "deve essere superiore o uguale a %{count}"
-        equal_to: "deve essere uguale a %{count}"
-        less_than: "deve essere meno di %{count}"
-        less_than_or_equal_to: "deve essere meno o uguale a %{count}"
-        odd: "deve essere dispari"
-        even: "deve essere pari" 
-      
-      models:
-        banner:
-          attributes:
-            banner:
-              category: Categoria
-              enabled: Attivo?
-              url: Link a prodotto o tassonomia o a sito esterno
-              attachment_width: Larghezza immagine
-              attachment_height: Altezza immagine
-              attachment: Immagine
-              attachment_file_name: Nome immagine
-              position: Posizione (se esistono altri banner con la stessa categoria)
+    models:
+      banner_box:
+        one: Banner
+        other: Banners
     attributes:
-      banner:
+      banner_box:
         category: Categoria
+        updated_at: Aggiornata il
+        created_at: Creata il
         enabled: Attivo?
-        url: Link a prodotto o tassonomia o a sito esterno
-        attachment_width: Larghezza immagine
-        attachment_height: Altezza immagine
-        attachment: Immagine
-        position: Posizione (se esistono altri banner con la stessa categoria)
-    models:
-      banner:
-        one: Banner
-        many: Banners
-
-  banner: "Banner"
-  banners: "Banners"
-  new_banner: "Nuovo Banner"
-  enable: Attivo?
-  category: Categoria
-  no_image: Nessuna immagine caricata
-  attachment_width: Larghezza immagine banner
-  attachment_height: Altezza immagine banner
-  position: Posizione (se esistono altri banner con la stessa categoria)
-  enabled: Attivo?
-  url: Link a prodotto o tassonomia o a sito esterno
-  image:
-    one: Immagine
-    many: Immagini
-  banner_desc: Gestione banner.
-  new_banner: Nuovo banner
-  editing_banner: Modifica banner
-  confirm_delete: Sei sicuro?

data/config/routes.rb

@@ -1,10 +1,14 @@
-Spree::Core::Engine.routes.prepend do
+Spree::Core::Engine.routes.draw do
+  
   namespace :admin do
-    resources :banners do
+    resources :banner_boxes do
       collection do
         post :update_positions
       end
+      member do
+        get :clone
+      end
     end
-    resource :banner_settings
+    resource :banner_box_settings
   end
 end

data/db/migrate/20120116204313_create_banners.rb

@@ -1,10 +1,10 @@
 class CreateBanners < ActiveRecord::Migration
   def change
     create_table :banners do |t|
-      t.string :title, :url
+      t.string :presentation, :url
       t.string :category
       t.integer :position
-      t.boolean :enabled
+      t.boolean :enabled, :default => false
       
       t.string   :attachment_content_type, :attachment_file_name
       t.datetime :attachment_updated_at

data/db/migrate/20120323174800_banner_namespace.rb

@@ -1,5 +1,5 @@
 class BannerNamespace < ActiveRecord::Migration
   def change
-    rename_table :banners, :spree_banners
+    rename_table :banners, :spree_banner_boxes
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -75,20 +75,19 @@ files:
 - app/assets/javascripts/store/spree_banner.js
 - app/assets/stylesheets/admin/spree_banner.css
 - app/assets/stylesheets/store/spree_banner.css
-- app/controllers/spree/admin/banner_settings_controller.rb
-- app/controllers/spree/admin/banners_controller.rb
-- app/helpers/spree/banners_helper.rb
+- app/controllers/spree/admin/banner_box_settings_controller.rb
+- app/controllers/spree/admin/banner_boxes_controller.rb
+- app/helpers/spree/banner_boxes_helper.rb
 - app/models/spree/app_configuration_decorator.rb
-- app/models/spree/banner.rb
+- app/models/spree/banner_box.rb
 - app/overrides/banner_admin_tab.rb
-- app/views/spree/admin/banner_settings/edit.html.erb
-- app/views/spree/admin/banner_settings/show.html.erb
-- app/views/spree/admin/banners/_form.html.erb
-- app/views/spree/admin/banners/edit.html.erb
-- app/views/spree/admin/banners/index.html.erb
-- app/views/spree/admin/banners/new.html.erb
-- app/views/spree/admin/banners/new.js.erb
-- app/views/spree/admin/shared/_banner_setting_configurations_menu.html.erb
+- app/views/spree/admin/banner_box_settings/edit.html.erb
+- app/views/spree/admin/banner_boxes/_form.html.erb
+- app/views/spree/admin/banner_boxes/edit.html.erb
+- app/views/spree/admin/banner_boxes/index.html.erb
+- app/views/spree/admin/banner_boxes/new.html.erb
+- app/views/spree/admin/banner_boxes/new.js.erb
+- app/views/spree/admin/shared/_banner_box_sub_menu.html.erb
 - db/migrate/20120116204313_create_banners.rb
 - db/migrate/20120323174800_banner_namespace.rb
 - config/locales/en.yml

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

@@ -1,26 +0,0 @@
-module Spree
-  module Admin
-    class BannersController < ResourceController
-            
-      def show
-        redirect_to(:action => :edit)
-      end
-      
-      def update_positions
-        params[:positions].each do |id, index|
-          Spree::Banner.where(:id => id).update_all(:position => index)
-        end
-
-        respond_to do |format|
-          format.js  { render :text => 'Ok' }
-        end
-      end
-      
-      private
-      def location_after_save
-        edit_admin_banner_url(@banner)
-      end
-      
-    end
-  end
-end

data/app/helpers/spree/banners_helper.rb

@@ -1,24 +0,0 @@
-module Spree
-  module BannersHelper
-
-    def insert_banner(params={})
-      params[:max] ||= 1
-      params[:category] ||= "home"
-      params[:class] ||= "banner"
-      params[:style] ||= "small"
-      params[:list] ||= false
-      banner = Spree::Banner.enable(params[:category]).limit(params[:max])
-      if !banner.blank?
-        banner = banner.sort_by { |ban| ban.position }
-        
-        if (params[:list])
-          content_tag(:ul, banner.map{|ban| content_tag(:li, link_to(image_tag(ban.attachment.url(params[:style].to_sym)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe )
-        else
-          banner.map{|ban| content_tag(:div, link_to(image_tag(ban.attachment.url(params[:style].to_sym)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe
-        end
-        
-      end
-    end
-    
-  end
-end

data/app/models/spree/banner.rb

@@ -1,51 +0,0 @@
-module Spree
-  class Banner < ActiveRecord::Base
-    attr_accessible :title, :url, :category, :position, :enabled, :attachment
-    
-    has_attached_file :attachment,
-                      :styles => { :mini => '80x80#', :small => '120x120#' },
-                      :url  => "/spree/banners/:id/:style_:basename.:extension",
-                      :path => ":rails_root/public/spree/banners/:id/:style_:basename.:extension",
-                      :convert_options => { :all => '-strip' }
-    
-    after_post_process :find_dimensions
-    
-    validates_presence_of :category
-    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"
-    
-    scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
-    
-    # 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::Banner.attachment_definitions[:attachment][:storage] = :s3
-      Spree::Banner.attachment_definitions[:attachment][:s3_credentials] = s3_creds
-      Spree::Banner.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-      Spree::Banner.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
-      Spree::Banner.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
-    end
-    
-    Spree::Banner.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
-    Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
-    Spree::Banner.attachment_definitions[:attachment][:url] = Spree::Config[:banner_url]
-    Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
-    Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
-        
-    def initialize(*args)
-      super(*args)
-      last_banner = Banner.last
-      self.position = last_banner ? last_banner.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
-    
-  end
-end

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

@@ -1,48 +0,0 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<h1><%= t(:banner_settings) %></h1>
-
-<p><span class="warning"><%= t(:banner_settings_warning) %></span></p>
-
-<%= form_tag admin_banner_settings_path, :method => :put do %>
-
-  <p data-hook="banner_path">
-    <label>
-      <%= label_tag 'preferences[banner_path]', t(:banner_path) %>
-      <%= preference_field_tag 'preferences[banner_path]', Spree::Config[:banner_path], :type => :string %>
-    </label>
-  </p>
-
-  <p data-hook="banner_default_url">
-    <label>
-      <%= label_tag 'preferences[banner_default_url]', t(:banner_default_url) %>
-      <%= preference_field_tag 'preferences[banner_default_url]', Spree::Config[:banner_default_url], :type => :string %>
-    </label>
-  </p>
-
-  <p data-hook="banner_default_style">
-    <label>
-      <%= label_tag 'preferences[banner_default_style]', t(:banner_default_style) %>
-      <%= collection_select 'preferences', 'banner_default_style', @styles, :first, :first, {:selected => Spree::Config[:banner_default_style] } %> 
-    </label>
-  </p>
-
-  <div id="banner_styles" data-hook="banner_styles">
-    <h2><%= t(:banner_styles) %></h2>
-    <ul id="styles_list">
-      <% @styles.each do |style_name, style_value| %>
-        <li>
-          <%= label_tag "banner_styles[#{style_name}]", style_name %>
-          <%= text_field_tag "banner_styles[#{style_name}]", style_value %>
-          <a href="#" alt="Destroy" class="destroy_banner_style">x</a>
-        </li>
-      <% end %>
-    </ul>
-    <p><a href="#" alt="Add Style" class="add_banner_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/banner_settings/show.html.erb

@@ -1,10 +0,0 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<h1><%= t(:banner_settings) %></h1>
-
-<h4><%= t(:banner_path) %>: <%= Spree::Config[:banner_path] %></h4>
-<h4><%= t(:banner_default_url) %>: <%= Spree::Config[:banner_default_url] %></h4>
-<h4><%= t(:banner_default_style) %>: <%= Spree::Config[:banner_default_style] %></h4>
-<h4><%= t(:defined_paperclip_styles) %>: <%= @styles_list %></h4>
-
-<%= link_to_with_icon 'edit', t(:edit), edit_admin_banner_settings_path, :id => 'admin_banner_settings_link' %>

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

@@ -1,30 +0,0 @@
-<div data-hook="admin_banner_form_fields">
-	<div class="clearfix">
-		<div class="left" data-hook="admin_banner_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 :url do %>
-				<%= f.label :url, t(:url) %><br />
-				<%= f.text_field :url, :class => 'fullwidth title' %>
-				<%= f.error_message_on :url %>
-			<% end %>
-		</div>
-		<div class="right" data-hook="admin_banner_form_right">
-			<%= f.field_container :attachment do %>
-				<%= f.label :attachment, t(:attachment) %><br />
-				<%= f.file_field :attachment %>
-				<%= f.error_message_on :attachment %>
-			<% 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/banners/edit.html.erb

@@ -1,6 +0,0 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
-
-<%= form_for([:admin, @banner], :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/banners/index.html.erb

@@ -1,36 +0,0 @@
-<div class="toolbar" data-hook="toolbar">
-	<ul class="actions">
-		<li id="new_banner_link">
-			<%= button_link_to t(:new_banner), new_object_url, {:remote => true, :icon => 'add', :id => 'admin_new_banner'} %>
-		</li>
-	</ul>
-	<br class="clear" />
-</div>
-
-<h1><%= t(:listing_banners) %></h1>
-
-<div id="new_banner" data-hook></div>
-
-<table class="index sortable" data-hook="listing_banners" data-sortable-link="<%= update_positions_admin_banners_url() %>">
-	<tr data-hook="admin_banners_index_headers">
-		<th><%= t(:thumbnail) %></th>
-		<th><%= t(:category) %></th>
-		<th><%= t(:enable) %></th>
-		<th data-hook="admin_banners_index_header_actions"></th>
-	</tr>
-	<% @banners.each do |banner| %>
-	<tr id="<%= spree_dom_id banner %>" data-hook="admin_banners_index_rows">
-		<td>
-			<span class="handle"></span>
-			<%= link_to image_tag(banner.attachment.url(:mini)), banner.attachment.url(:small) %>
-		</td>
-		<td><%= banner.category %></td>
-		<td><%= icon('tick') if banner.enabled %></td>
-		<td class="actions" data-hook="admin_banners_index_row_actions">
-			<%= link_to_edit banner, :class => 'edit' %>
-			&nbsp;
-			<%= link_to_delete banner %>
-		</td>
-	</tr>
-	<% end %>
-</table>

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

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

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

@@ -1,4 +0,0 @@
-<tr>
-  <td><%= link_to t(:banner_settings), admin_banner_settings_path %></td>
-  <td><%= t(:banner_settings_description) %></td>
-</tr>