spree_banner 1.1.2 → 1.1.3

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', '~> 1.1.1'
+  gem 'spree_banner', '~> 1.1.3'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:
@@ -39,8 +39,8 @@ limits the number of banner shown to 10 (default 1)
 </pre>
 set banner class (default banner)
 <pre>
-	<%= insert_banner(:style => "your_container") %>
+	<%= insert_banner(:list => true/false) %>
 </pre>
-set banner container (default list [possibile: div, p, ...])
+set banner container (default false is DIV)
 
 Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

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

@@ -1,17 +1,3 @@
 /*
  *= 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/controllers/spree/admin/banners_controller.rb

@@ -20,7 +20,7 @@ module Spree
       
       private
       def location_after_save
-        admin_banners_url(@banner)
+        edit_admin_banner_url(@banner)
       end
       
     end

data/app/helpers/spree/banners_helper.rb

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

data/app/models/spree/banner.rb

@@ -31,12 +31,6 @@ module Spree
       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[:attachment_styles])
-    Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
-    Spree::Banner.attachment_definitions[:attachment][:url] = Spree::Config[:attachment_url]
-    Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
-    Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
         
     def initialize(*args)
       super(*args)

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

@@ -1,9 +1,48 @@
-<%= f.inputs do %>
-	<%= f.input :category, :required => true, :label => t("banner.category") %>
-	<%= f.input :url, :label => t("banner.url") %>
-	<%= f.input :position, :label => t("banner.position") %>
-	<%= f.input :attachment_width, :required => true, :label => t("banner.attachment_width") %>
-	<%= f.input :attachment_height, :required => true, :label => t("banner.attachment_height") %>
-	<%= f.input :enabled, :label => t("banner.enabled") %>
-	<%= f.input :attachment, :required => true, :as => :file, :label => t("banner.image.one").capitalize, :hint => f.object.attachment.blank? ? f.template.content_tag(:span, t("banner.no_image")) : f.template.image_tag(f.object.attachment.url(:thumbnail)) %>
-<% end %>
+<div data-hook="admin_slideshow_form_fields">
+	<div class="clearfix">
+		<div class="left" data-hook="admin_product_form_left">
+			<%= f.field_container :category do %>
+				<%= f.label :category, t(:category) %> <span class="required">*</span><br />
+				<%= f.text_field :category, :class => 'fullwidth title' %>
+				<%= f.error_message_on :category %>
+			<% end %>
+
+			<%= f.field_container :url do %>
+				<%= f.label :url, t(:url) %><br />
+				<%= f.text_field :url, :class => 'fullwidth title' %>
+				<%= f.error_message_on :url %>
+			<% end %>
+
+			<%= f.field_container :attachment do %>
+				<%= f.label :attachment, t(:attachment) %><br />
+				<%= f.file_field :attachment %>
+				<%= f.error_message_on :attachment %>
+			<% end %>
+		</div>
+		<div class="right" data-hook="admin_product_form_right">
+			<%= f.field_container :attachment_width do %>
+				<%= f.label :attachment_width, t(:attachment_width) %> <span class="required">*</span><br />
+				<%= f.text_field :attachment_width, :class => 'fullwidth title' %>
+				<%= f.error_message_on :attachment_width %>
+			<% end %>
+
+			<%= f.field_container :attachment_height do %>
+				<%= f.label :attachment_height, t(:attachment_height) %> <span class="required">*</span><br />
+				<%= f.text_field :attachment_height, :class => 'fullwidth title' %>
+				<%= f.error_message_on :attachment_height %>
+			<% end %>
+
+			<%= f.field_container :position do %>
+				<%= f.label :position, t(:position) %><br />
+				<%= f.text_field :position, :class => 'fullwidth title' %>
+				<%= f.error_message_on :position %>
+			<% 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,7 +1,6 @@
-<h1><%= t("banner.editing_banner") %></h1>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
 
-<%= semantic_form_for([:admin, @banner]) do |f| %>
-<%= render :partial => "form", :locals => { :f => f } %>
-<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-<% end %>
+<%= 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,35 +1,29 @@
-<div class='toolbar'>
-  <ul class='actions'>
-    <li>
-      <%= button_link_to t("banner.new_banner"), spree.new_admin_banner_path, :icon => 'add' %>
+<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("banner.many") %></h1>
+<h1><%= t(:listing_banners) %></h1>
 
-<table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_banners_url %>">
-	<tr>
-		<th><%= t("banner.category") %></th>
-		<th><%= t("banner.position") %></th>
-		<th><%= t("banner.enable") %></th>
-		<th><%= t(:action) %></th>
-	</tr>
-	<tbody>
-		<% @banners.each do |banner| %>
-		<tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id banner %>">
-			<td>
-				<span class="handle"></span>
-				<%= banner.category %>
-			</td>
-			<td><%= banner.position %></td>
-			<td><%= icon('tick') if banner.enabled %></td>
-			<td>
-				<%= link_to_edit banner %> &nbsp;
-				<%= link_to_delete banner %>
-			</td>
-		</tr>
-		<% end %>
-	</tbody>
-</table>
+<div id="new_banner" data-hook></div>
+
+<table class="index" id="listing_banners">
+  <tr data-hook="admin_banners_index_headers">
+    <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><%= 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.html.erb

@@ -4,4 +4,58 @@
 <%= semantic_form_for([:admin, @banner], :html => { :enctype => "multipart/form-data" }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+<% end %>
+
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
+
+<%= form_for [:admin, @banner], :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 :url do %>
+				<%= f.label :url, t(:url) %><br />
+				<%= f.text_field :url, :class => 'fullwidth title' %>
+				<%= f.error_message_on :url %>
+			<% end %>
+
+			<%= f.field_container :attachment do %>
+				<%= f.label :attachment, t(:attachment) %><br />
+				<%= f.file_field :attachment %>
+				<%= f.error_message_on :attachment %>
+			<% end %>
+		</div>
+		<div class="right">
+			<%= f.field_container :attachment_width do %>
+				<%= f.label :attachment_width, t(:attachment_width) %> <span class="required">*</span><br />
+				<%= f.text_field :attachment_width, :class => 'fullwidth title' %>
+				<%= f.error_message_on :attachment_width %>
+			<% end %>
+
+			<%= f.field_container :attachment_height do %>
+				<%= f.label :attachment_height, t(:attachment_height) %> <span class="required">*</span><br />
+				<%= f.text_field :attachment_height, :class => 'fullwidth title' %>
+				<%= f.error_message_on :attachment_height %>
+			<% end %>
+
+			<%= f.field_container :position do %>
+				<%= f.label :position, t(:position) %><br />
+				<%= f.text_field :position, :class => 'fullwidth title' %>
+				<%= f.error_message_on :position %>
+			<% end %>
+
+			<%= f.field_container :enabled do %>
+				<%= f.label :enabled, t(:enabled) %><br />
+				<%= f.check_box :enabled %>
+				<%= f.error_message_on :enabled %>
+			<% end %>
+		</div>
+	</div>
+	<%= render :partial => 'spree/admin/shared/new_resource_links' %>
+</fieldset>
 <% end %>

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

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

data/config/locales/en.yml

@@ -59,21 +59,20 @@ en:
         one: Banner
         many: Banners
 
-  banner:
-    one: Banner
-    many: 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?
+  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?

data/config/locales/it.yml

@@ -59,21 +59,21 @@ it:
         one: Banner
         many: Banners
 
-  banner:
-    one: Banner
-    many: Banners
-    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?
+  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/db/migrate/20120116204313_create_banners.rb

@@ -10,7 +10,6 @@ class CreateBanners < ActiveRecord::Migration
       t.datetime :attachment_updated_at
       t.integer  :attachment_width, :attachment_height, :default => 100
       t.integer  :attachment_size
-      t.string   :type, :limit => 75
       
       t.timestamps
     end

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

@@ -2,15 +2,6 @@ module SpreeBanner
   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_stylesheets
         inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_banner\n", :before => /\*\//, :verbose => true
         inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_banner\n", :before => /\*\//, :verbose => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: formtastic
-  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: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +98,7 @@ files:
 - 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
 - db/migrate/20120116204313_create_banners.rb
 - db/migrate/20120323174800_banner_namespace.rb
 - config/locales/en.yml