spree_banner 1.1.5 → 1.1.6

data/README.md

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

data/app/helpers/spree/banners_helper.rb

@@ -2,22 +2,19 @@ module Spree
   module BannersHelper
 
     def insert_banner(params={})
-      # max items show for list
       params[:max] ||= 1
-      # category items show
       params[:category] ||= "home"
-      # class items show
       params[:class] ||= "banner"
-      # style items show
+      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(:custom)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe )
+          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(:custom)), (ban.url.blank? ? "javascript: void(0)" : ban.url)), :class => params[:class])}.join().html_safe
+          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

data/app/models/spree/banner.rb

@@ -3,18 +3,10 @@ module Spree
     attr_accessible :title, :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 => {
-                  :mini => "-gravity center",
-                  :small => "-gravity center",
-                  :custom => "-gravity center"
-                }
+                      :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
     

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

@@ -12,31 +12,13 @@
 				<%= 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 %>
-		</div>
-		<div class="right" data-hook="admin_banner_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 />

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

@@ -1,29 +1,36 @@
 <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" />
+	<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" 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 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.html.erb

@@ -15,31 +15,13 @@
 				<%= f.text_field :url, :class => 'fullwidth title' %>
 				<%= f.error_message_on :url %>
 			<% end %>
-
+		</div>
+		<div class="right">
 			<%= 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 />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core