spree_core 1.2.5 → 1.3.0.rc1

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -6,6 +6,8 @@
     <%= f.text_field :value, :class => 'autocomplete' %>
   </td>
   <td class="actions">
-    <%= link_to_remove_fields t(:remove), f %>
+    <% unless @product.properties.empty? %>
+      <%= link_to_remove_fields t(:remove), f, :no_text => true %>
+    <% end %>
   </td>
 </tr>

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

@@ -4,38 +4,45 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
+<% content_for :page_actions do %>
+  <ul class="tollbar inline-menu">
+    <li>
+      <%= link_to_add_fields t(:add_product_properties), 'tbody#product_properties', :class => 'icon-plus button' %>
+    </li>
+    <li>
+      <span id="new_ptype_link">
+        <%= link_to t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button icon-copy' %>
+      </span>  
+    </li>
+  </ul>
+<% end %>
+
 <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
-  <table class="index">
-    <thead>
-      <tr data-hook="product_properties_header">
-        <th><%= t(:property) %></th>
-        <th><%= t(:value) %></th>
-        <th><%= t(:action) %></th>
-      </tr>
-    </thead>
-    <tbody id="product_properties" data-hook>
-      <%= f.fields_for :product_properties do |pp_form| %>
-        <%= render :partial => 'product_property_fields', :locals => { :f => pp_form } %>
-      <% end %>
-    </tbody>
-  </table>
-
-  <%= hidden_field_tag 'clear_product_properties', 'true' %>
-
-  <p class="add_product_properties" data-hook="add_product_properties">
-  <%= link_to_add_fields t(:add_product_properties), 'tbody#product_properties' %>
-
-    &nbsp;&nbsp;
-
-    <span id="new_ptype_link">
-      <%= link_to t(:select_from_prototype), available_admin_prototypes_url,
-                  :remote => true, 'data-update' => 'prototypes' %>
-    </span>
-  </p>
-  <div id="prototypes" data-hook></div>
+  <fieldset class="no-border-top">
+    <div class="add_product_properties" data-hook="add_product_properties"></div>
+    
+    <div id="prototypes" data-hook></div>
     <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
-    <br />
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    
+    <table class="index">
+      <thead>
+        <tr data-hook="product_properties_header">
+          <th><%= t(:property) %></th>
+          <th><%= t(:value) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody id="product_properties" data-hook>
+        <%= f.fields_for :product_properties do |pp_form| %>
+          <%= render :partial => 'product_property_fields', :locals => { :f => pp_form } %>
+        <% end %>
+      </tbody>
+    </table>
+
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+
+    <%= hidden_field_tag 'clear_product_properties', 'true' %>
+  </fieldset>
 <% end %>
 
 <%= javascript_tag do -%>

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

@@ -1,120 +1,148 @@
 <div data-hook="admin_product_form_fields">
-  <div class="clearfix">
-    <div class="left" data-hook="admin_product_form_left">
-      <%= f.field_container :name do %>
-        <%= f.label :name, t(:name) %> <span class="required">*</span><br />
-        <%= f.text_field :name, :class => 'fullwidth title' %>
-        <%= f.error_message_on :name %>
-      <% end %>
+  
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">    
+    <%= f.field_container :name do %>
+      <%= f.label :name, raw(t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+      <%= f.text_field :name, :class => 'fullwidth title' %>
+      <%= f.error_message_on :name %>
+    <% end %>
 
-      <%= f.field_container :permalink do %>
-        <%= f.label :permalink, t(:permalink) %> <span class="required">*</span><br />
-        <%= f.text_field :permalink, :class => 'fullwidth title' %>
-        <%= f.error_message_on :permalink %>
-      <% end %>
+    <%= f.field_container :permalink do %>
+      <%= f.label :permalink, raw(t(:permalink) + content_tag(:span, ' *',  :class => "required")) %>
+      <%= f.text_field :permalink, :class => 'fullwidth title' %>
+      <%= f.error_message_on :permalink %>
+    <% end %>
 
-      <%= f.field_container :description do %>
-        <%= f.label :description, t(:description) %><br />
-        <%= f.text_area :description, {:cols => 60, :rows => 4, :class => 'fullwidth'} %>
-        <%= f.error_message_on :description %>
+    <%= f.field_container :description do %>
+      <%= f.label :description, t(:description) %>
+      <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
+      <%= f.error_message_on :description %>
+    <% end %>
+  </div>
+
+  <div class="right four columns omega" data-hook="admin_product_form_right">
+    <%= f.field_container :price do %>
+      <%= f.label :price, raw(t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
+      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
+      <%= f.error_message_on :price %>
+    <% end %>
+
+    <div class="alpha two columns">
+      <%= f.field_container :cost_price do %>
+        <%= f.label :cost_price, t(:cost_price) %>
+        <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
+        <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
-    <div class="right" data-hook="admin_product_form_right">
-        <%= f.field_container :price do %>
-          <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
-          <%= f.error_message_on :price %>
-        <% end %>
-
-        <%= f.field_container :cost_price do %>
-          <%= f.label :cost_price, t(:cost_price) %><br />
-          <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
-        <%= f.error_message_on :cost_price %>
+    <div class="omega two columns">
+      <%= f.field_container :cost_currency do %>
+        <%= f.label :cost_currency, t(:cost_currency) %>
+        <%= f.text_field :cost_currency %>
+        <%= f.error_message_on :cost_currency %>
       <% end %>
+    </div>
 
-      <%= f.field_container :available_on do %>
-        <%= f.label :available_on, t(:available_on) %><br />
-        <%= f.error_message_on :available_on %>
-        <% if @product.available_on? %>
-          <% available_on = l(@product.available_on, :format => t('spree.date_picker.format')) %>
-        <% else %>
-          <% available_on = nil %>
-        <% end %>
-        <%= f.text_field :available_on, :value => available_on, :class => 'datepicker' %>
+    <div class="clear"></div>
+
+    <%= f.field_container :available_on do %>
+      <%= f.label :available_on, t(:available_on) %>
+      <%= f.error_message_on :available_on %>
+      <% if @product.available_on? %>
+        <% available_on = l(@product.available_on, :format => t('spree.date_picker.format')) %>
+      <% else %>
+        <% available_on = nil %>
       <% end %>
+      <%= f.text_field :available_on, :value => available_on, :class => 'datepicker' %>
+    <% end %>
 
-      <% unless @product.has_variants? %>
-        <%= f.field_container :sku do %>
-          <%= f.label :sku, t(:sku) %><br />
-          <%= f.text_field :sku, :size => 16 %>
-        <% end %>
+    <% unless @product.has_variants? %>
+      <%= f.field_container :sku do %>
+        <%= f.label :sku, t(:sku) %>
+        <%= f.text_field :sku, :size => 16 %>
+      <% end %>
 
-        <% if Spree::Config[:track_inventory_levels] %>
+      <% if Spree::Config[:track_inventory_levels] %>        
+        <div class="alpha two columns">
           <%= f.field_container :on_hand do %>
-            <%= f.label :on_hand, t(:on_hand) %><br />
+            <%= f.label :on_hand, t(:on_hand) %>
             <%= f.number_field :on_hand, :min => 0 %>
           <% end %>
-        <% end %>
-
-        <ul id="shipping_specs">
-          <li id="shipping_specs_weight_field">
-            <%= f.label :weight, t(:weight) %>
-            <%= f.text_field :weight, :size => 4 %>
-          </li>
-          <li id="shipping_specs_height_field">
-            <%= f.label :height, t(:height) %>
-            <%= f.text_field :height, :size => 4 %>
-          </li>
-          <li id="shipping_specs_width_field">
-            <%= f.label :width, t(:width) %>
-            <%= f.text_field :width, :size => 4 %>
-          </li>
-          <li id="shipping_specs_depth_field">
-            <%= f.label :depth, t(:depth) %>
-            <%= f.text_field :depth, :size => 4 %>
-          </li>
-        </ul>
-      <% end %>
+        </div>
+        <div class="omega two columns">
+          <%= f.field_container :on_demand, :class => ['checkbox'] do %>
+            <label>
+              <%= f.check_box :on_demand %>
+              <%= t(:on_demand) %>
+            </label>
+          <% end %>
+        </div>
 
-      <%= f.field_container :shipping_categories do %>
-        <%= f.label :shipping_category_id, t(:shipping_categories) %><br />
-        <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
-        <%= f.error_message_on :shipping_category %>
+        <div class="clear"></div>
       <% end %>
 
-      <%= f.field_container :tax_category do %>
-        <%= f.label :tax_category_id, t(:tax_category) %><br />
-        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => true }, { 'style' => 'width:200px' }) %>
-        <%= f.error_message_on :tax_category %>
-      <% end %>
-    </div>
-  </div>
+      <ul id="shipping_specs">
+        <li id="shipping_specs_weight_field" class="field alpha two columns">
+          <%= f.label :weight, t(:weight) %>
+          <%= f.text_field :weight, :size => 4 %>
+        </li>
+        <li id="shipping_specs_height_field" class="field omega two columns">
+          <%= f.label :height, t(:height) %>
+          <%= f.text_field :height, :size => 4 %>
+        </li>
+        <li id="shipping_specs_width_field" class="field alpha two columns">
+          <%= f.label :width, t(:width) %>
+          <%= f.text_field :width, :size => 4 %>
+        </li>
+        <li id="shipping_specs_depth_field" class="field omega two columns">
+          <%= f.label :depth, t(:depth) %>
+          <%= f.text_field :depth, :size => 4 %>
+        </li>
+      </ul>
+    <% end %>
 
+    <%= f.field_container :shipping_categories do %>
+      <%= f.label :shipping_category_id, t(:shipping_categories) %>
+      <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => 'None' }, { :class => 'select2' }) %>
+      <%= f.error_message_on :shipping_category %>
+    <% end %>
 
-  <%= f.field_container :taxons do %>
-    <%= f.label :taxon_ids, t(:taxons) %><br />
-    <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
-  <% end %>
+    <%= f.field_container :tax_category do %>
+      <%= f.label :tax_category_id, t(:tax_category) %>
+      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => 'None' }, { :class => 'select2' }) %>
+      <%= f.error_message_on :tax_category %>
+    <% end %>
+  </div>
 
-  <%= f.field_container :option_types do %>
-    <%= f.label :option_type_ids, t(:option_types) %><br />
-    <%= f.select :option_type_ids, option_types_options_for(@product), {}, :class => "select2", :multiple => true %>
-  <% end %>
+  <div class="twelve columns alpha omega">
+    <%= f.field_container :taxons do %>
+      <%= f.label :taxon_ids, t(:taxons) %><br />
+      <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
+    <% end %>
 
-  <h2><%= t(:metadata) %></h2>
-  <div data-hook="admin_product_form_meta">
+    <%= f.field_container :option_types do %>
+      <%= f.label :option_type_ids, t(:option_types) %>
+      <%= f.select :option_type_ids, option_types_options_for(@product), {}, :class => "select2", :multiple => true %>
+    <% end %>
+  </div>
+
+  <!-- <h2><%= t(:metadata) %></h2> -->
+  <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
     <%= f.field_container :meta_keywords do %>
-      <%= f.label :meta_keywords, t(:meta_keywords) %><br />
+      <%= f.label :meta_keywords, t(:meta_keywords) %>
       <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description, t(:meta_description) %><br />
+      <%= f.label :meta_description, t(:meta_description) %>
       <%= f.text_field :meta_description, :class => 'fullwidth' %>
     <% end %>
   </div>
 
+  <div class="clear"></div>
+
   <div data-hook="admin_product_form_additional_fields"></div>
+
+  <div class="clear"></div>
 </div>
 
 <% unless Rails.env.test? %>

data/app/views/spree/admin/products/_properties_form.erb

@@ -1,7 +1,10 @@
-<h2><%= t(:properties) %></h2>
+<% content_for :page_title do %>
+  <%= t(:properties) %>
+<% end %>
+
 <% f.fields_for :product_properties do |properties_form| %>
-    <p data-hook="value">
+    <div data-hook="value">
       <%= properties_form.label :value, properties_form.object.property.presentation %><br />
       <%= properties_form.text_field :value %>
-    </p>
+    </div>
 <% end %>

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

@@ -1,9 +1,15 @@
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_products_list), admin_products_url, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
 <%= form_for [:admin, @product], :method => :put, :html => { :multipart => true } do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  <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/products/index.html.erb

@@ -1,71 +1,104 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li id="new_product_link">
-      <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'add', :id => 'admin_new_product' } %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
+<% content_for :page_title do %>
+  <%= t(:listing_products) %>
+<% end %>
 
-<h1><%= t(:listing_products) %></h1>
+<% content_for :page_actions do %>
+  <div class="toolbar" data-hook="toolbar">
+    <ul class="actions header-action-links inline-menu">
+      <li id="new_product_link">
+        <%= button_link_to t(:new_product), new_object_url, { :remote => true, :icon => 'icon-plus', :id => 'admin_new_product' } %>
+      </li>
+    </ul>
+  </div>
+<% end %>
 
-<div id="new_product" data-hook></div>
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
-<table class="index" id="listing_products">
-  <tr data-hook="admin_products_index_headers">
-    <th><%= t(:sku) %></th>
-    <th><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
-    <th><%= sort_link @search,:master_price, t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
-    <th data-hook="admin_products_index_header_actions"></th>
-  </tr>
-<% @collection.each do |product| %>
-  <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows">
-    <td><%= product.sku rescue '' %></td>
-    <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-    <td><%= money(product.price) rescue '' %></td>
-    <td class="actions" data-hook="admin_products_index_row_actions">
-      <%= link_to_edit product, :class => 'edit' unless product.deleted? %>
-      &nbsp;
-      <%= link_to_clone product, :class => 'clone' %>
-      &nbsp;
-      <%= link_to_delete product unless product.deleted? %>
-    </td>
-  </tr>
+<% content_for :table_filter_title do %>
+  <%= t(:search) %>
 <% end %>
-</table>
-<%= paginate @collection %>
 
-<% content_for :sidebar do %>
+<% content_for :table_filter do %>
   <div data-hook="admin_products_sidebar">
-    <%= search_form_for [:admin, @search] do |f| %>
-      <div class="box">
-        <h3><%= t(:search) %></h3>
+    
+    <%= search_form_for [:admin, @search] do |f| %>      
 
         <%- locals = {:f => f} %>
+
         <div data-hook="admin_products_index_search">
-          <p>
-            <%= f.label :name_cont, t(:name) %><br />
-            <%= f.text_field :name_cont, :size => 15 %>
-          </p>
-          <p>
-            <%= f.label :variants_including_master_sku_cont, t(:sku) %><br />
-            <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
-          </p>
-          <p>
-            <%= f.label :deleted_at_null, t(:show_deleted) %><br />
-            <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null].blank?}, '', '1' %>
-          </p>
+          <div class="alpha nine columns">
+            <div class="field">
+              <%= f.label :name_cont, t(:name) %>
+              <%= f.text_field :name_cont, :size => 15 %>
+            </div>  
+          </div>
+          <div class="four columns">
+            <div class="field">
+              <%= f.label :variants_including_master_sku_cont, t(:sku) %>
+              <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
+            </div>
+          </div>
+          <div class="three columns omega">
+            <div class="field checkbox">
+              <label>
+                <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null].blank?}, '', '1' %>
+                <%= t(:show_deleted) %>  
+              </label>
+            </div>
+          </div>
         </div>
+        
+        <div class="clear"></div>
 
-        <div data-hook="admin_products_index_search_buttons">
-          <p class="form-buttons">
-            <%= button t(:search) %>
-          </p>
+        <div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
+          <%= button t(:search), 'icon-search' %>
         </div>
-      </div>
     <% end %>
   </div>
 <% end %>
 
+<div id="new_product" data-hook></div>
+
+<% if @collection.any? %>
+  <table class="index" id="listing_products">
+    <colgroup>
+       <col style="width: 15%;">
+       <col style="width: 10%;">
+       <col style="width: 48%;">
+       <col style="width: 10%;">
+       <col style="width: 17%;">
+    </colgroup>
+    <thead>
+      <tr data-hook="admin_products_index_headers">
+        <th><%= t(:sku) %></th>
+        <th colspan="2"><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
+        <th><%= sort_link @search,:master_default_price_amount, t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
+        <th data-hook="admin_products_index_header_actions" class="actions"></th>
+      </tr>  
+    </thead>  
+    <tbody>
+      <% @collection.each do |product| %>
+          <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
+            <td class="align-center"><%= product.sku rescue '' %></td>
+            <td class="align-center"><%= mini_image(product) %></td>
+            <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
+            <td class="align-center"><%= product.display_price rescue '' %></td>
+            <td class="actions" data-hook="admin_products_index_row_actions">
+              <%= link_to_edit product, :no_text => true, :class => 'edit' unless product.deleted? %>
+              &nbsp;
+              <%= link_to_clone product, :no_text => true, :class => 'clone' %>
+              &nbsp;
+              <%= link_to_delete product, :no_text => true unless product.deleted? %>
+            </td>
+          </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= t(:no_results) %>
+  </div>
+<% end %>
+
+<%= paginate @collection %>
+