spree_core 1.2.5 → 1.3.0.rc1

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

@@ -3,47 +3,51 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
 
 <%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
+
 <fieldset data-hook="new_product">
-  
+
+  <legend align="center"><%= t(:new_product) %></legend>
+
   <%= 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="clearfix" data-hook="new_product_attrs">
-    <div class="left">
-
-      <% unless @product.has_variants? %>
+  <div data-hook="new_product_attrs" class="row">
+    <% unless @product.has_variants? %>
+      <div class="alpha four columns">
         <%= f.field_container :sku do %>
           <%= f.label :sku, t(:sku) %><br />
-          <%= f.text_field :sku, :size => 16 %>
+          <%= f.text_field :sku, :size => 16, :class => 'fullwidth' %>
           <%= f.error_message_on :sku %>
-        <% end %>
-      <% end %>
+        <% end %>  
+      </div>      
+    <% end %>
 
+    <div class="four columns">
       <%= f.field_container :prototype do %>
         <%= f.label :prototype_id, t(:prototype) %><br />
-        <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, :include_blank => true %>
+        <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
       <% end %>
-
     </div>
-    <div class="right">
-
+      
+    <div class="four columns">
       <%= f.field_container :price do %>
         <%= f.label :price, t(:master_price) %> <span class="required">*</span><br />
-        <%= f.text_field :price %>
+        <%= f.text_field :price, :class => 'fullwidth' %>
         <%= f.error_message_on :price %>
       <% end %>
+    </div>
 
-      <p>
-        <%= f.label :available_on, t(:available_on) %><br />
+    <div class="omega four columns">
+      <%= f.field_container :available_on do %>
+        <%= f.label :available_on, t(:available_on) %>
         <%= f.error_message_on :available_on %>
-        <%= f.text_field :available_on, :class => 'datepicker', :style => "width:150px" %>
-      </p>
-
-
+        <%= f.text_field :available_on, :class => 'datepicker fullwidth' %>
+      <% end %>
     </div>
+    
   </div>
   
   <div class="clearfix" data-hook="product-from-prototype" id="product-from-prototype">
@@ -59,7 +63,7 @@
 //<![CDATA[
   (function($){
     var base_url = "<%= admin_prototypes_url %>";
-    var prototype_select = $('#product_prototype_id');
+    var prototype_select = $('#product_prototype_id');    
     prototype_select.change(function() {
       var id = prototype_select.val();
       if (id.length) {

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

@@ -1,3 +1,7 @@
 $("#new_product").html('<%= escape_javascript(render :template => "spree/admin/products/new", :formats => [:html], :handlers => [:erb]) %>');
 handle_date_picker_fields();
+<% unless Rails.env.test? %>
+  $('.select2').select2();
+<% end %>
+$("#table-filter").hide();
 $("#admin_new_product").parent().hide();

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

@@ -1,13 +1,16 @@
-<div data-hook="admin_property_form">
-  <%= f.field_container :name do %>
-    <%= f.label :name, t(:name) %> <span class="required">*</span><br />
-    <%= f.text_field :name %>
-    <%= f.error_message_on :name %>
-  <% end %>
-
-  <%= f.field_container :presentation do %>
-    <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
-    <%= f.text_field :presentation %>
-    <%= f.error_message_on :presentation %>
-  <% end %>
+<div data-hook="admin_property_form" class="align-center row">
+  <div class="alpha eight columns">
+    <%= f.field_container :name do %>
+      <%= f.label :name, t(:name) %> <span class="required">*</span><br />
+      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
+  <div class="eight columns omega">
+    <%= f.field_container :presentation do %>
+      <%= f.label :presentation, t(:presentation) %> <span class="required">*</span><br />
+      <%= f.text_field :presentation, :class => 'fullwidth' %>
+      <%= f.error_message_on :presentation %>
+    <% end %>
+  </div>
 </div>

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

@@ -1,10 +1,18 @@
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
-<h1><%= t(:editing_property) %></h1>
+<% content_for :page_title do %>
+  <%= t(:editing_property) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_properties_list), admin_properties_url, :icon => 'icon-arrow-left'%></li>
+<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
 
 <%= form_for [:admin, @property] 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/properties/index.html.erb

@@ -1,37 +1,38 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<% content_for :page_title do %>
+  <%= t(:properties) %>
+<% end %>
 
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li id="new_property_link">
-      <%= button_link_to t(:new_property), new_admin_property_url, { :remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link' } %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
+<% content_for :page_actions do %>
+  <li id="new_property_link">
+    <%= button_link_to t(:new_property), new_admin_property_url, { :remote => true, :icon => 'icon-plus', 'data-update' => 'new_property', :id => 'new_property_link' } %>
+  </li>
+<% end %>
 
-<h1><%= t(:properties) %></h1>
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
 <div id="new_property"></div>
 
-<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
-
 <table class="index" id='listing_properties' data-hook>
+  <colgroup>
+    <col style="width: 45%">
+    <col style="width: 45%">
+    <col style="width: 10%">
+  </colgroup>
   <thead>
     <tr data-hook="listing_properties_header">
       <th><%= t(:name) %></th>
       <th><%= t(:presentation) %></th>
-      <th></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @properties.each do |property| %>
-      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
+      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row" class="<%= cycle('odd', 'even')%>">
         <td><%= property.name %></td>
         <td><%= property.presentation %></td>
         <td class="actions">
-          <%= link_to_edit(property, :class => 'edit') %>
-          &nbsp;
-          <%= link_to_delete(property) %>
+          <%= link_to_edit(property, :no_text => true) %>
+          <%= link_to_delete(property, :no_text => true) %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/properties/new.html.erb

@@ -4,8 +4,10 @@
 
 <%= form_for [:admin, @property] do |f| %>
 <fieldset data-hook="new_property">
-  <legend><%= t(:new_property) %></legend>
+  <legend align="center"><%= t(:new_property) %></legend>
   <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <div class="filter-actions">
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </div>
 </fieldset>
 <% end %>

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

@@ -1,46 +1,25 @@
-<div data-hook="admin_prototype_form_fields">
-  <%= f.field_container :name do %>
-    <%= f.label :name, t(:name) %><br />
-    <%= f.text_field :name %>
-    <%= f.error_message_on :name %>
-  <% end %>
+<div data-hook="admin_prototype_form_fields" class="row">
+  <div class="alpha four columns">
+    <%= f.field_container :name do %>
+      <%= f.label :name, t(:name) %>
+      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.error_message_on :name %>
+    <% end %>
+  </div>
 
-  <h3><%= t(:properties) %></h3>
+  <div class="six columns">
+    <div id='properties' data-hook>
+      <%= f.field_container :property_ids do %>
+        <%= f.label :property_ids, t(:properties) %><br>
+        <%= f.select :property_ids, Spree::Property.sorted.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <% end %>
+    </div>
+  </div>
 
-  <ul class='checkbox-list' id='properties' data-hook>
-  <% Spree::Property.sorted.each do |property| %>
-    <% selected = if @prototype.new_record?
-      (params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
-    else
-      @prototype.properties.include?(property)
-    end %>
-    <li>
-      <label>
-        <%= check_box_tag 'property[id][]', "#{property.id}", selected %>
-        <%= property.name %>
-      </label>
-    </li>
-  <% end %>
-  </ul>
-
-  <hr />
-
-  <h3><%= t(:option_types) %></h3>
-
-  <ul class="checkbox-list" id="option_types" data-hook>
-  <% Spree::OptionType.all.each do |option_type| %>
-    <% selected = if @prototype.new_record?
-      (params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
-    else
-      @prototype.option_types.include?(option_type)
-    end %>
-    <li>
-      <label>
-        <%= check_box_tag 'option_type[id][]', "#{option_type.id}", selected %>
-        <%= option_type.name %>
-      </label>
-    </li>
-  <% end %>
-  </ul>
-  <hr />
+  <div class="six columns omega">
+    <%= f.field_container :option_type_ids do %>
+      <%= f.label :option_type_ids, t(:option_types) %><br>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+    <% end %>
+  </div>
 </div>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -1,16 +1,20 @@
 <table class="index">
+  <colgroup>
+    <col style="width: 80%" />
+    <col style="width: 20%" />
+  </colgroup>
   <thead>
     <tr data-hook="avilable_header">
       <th><%= t(:name) %></th>
-      <th></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @prototypes.each do |prototype| %>
-      <tr id="row_<%= prototype.id %>" data-hook="available_row">
+      <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
         <td><%= prototype.name %></td>
         <td class="actions">
-          <%= link_to icon('add') + ' ' + t(:select), select_admin_prototype_url(prototype), :class => 'ajax iconlink select_properties_from_prototype' %>
+          <%= link_to t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype icon-ok' %>
         </td>
       </tr>
     <% end %>

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

@@ -1,9 +1,20 @@
 <%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<h1><%= t(:editing_prototype) %></h1>
+
+<% content_for :page_title do %>
+  <%= t(:editing_prototype) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
 
 <%= form_for [:admin, @prototype] 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/prototypes/index.html.erb

@@ -1,35 +1,38 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li id="new_prototype_link">
-      <%= button_link_to t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
+<% content_for :page_title do %>
+  <%= t(:prototypes) %>
+<% end %>
 
+<% content_for :page_actions do %>
+  <li id="new_prototype_link">
+    <%= button_link_to t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'icon-plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
+  </li>
+<% end %>
 
-<h1><%= t(:prototypes) %></h1>
+<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
 
 <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
+
+<%# Placeholder for new prototype form %>
 <div id="new_prototype"></div>
 
 <table class="index" id='listing_prototypes' data-hook>
+  <colgroup>
+    <col style="width: 90%">
+    <col style="width: 10%">
+  </colgroup>
   <thead>
     <tr data-hook="prototypes_header">
       <th><%= t(:name) %></th>
-      <th><%= t(:action) %></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @prototypes.each do |prototype| %>
-      <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
+      <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row" class="<%= cycle('odd', 'even')%>">
         <td><%= prototype.name %></td>
         <td class="actions">
-          <%= link_to_edit(prototype, :class => 'admin_edit_prototype') %>
-          &nbsp;
-          <%= link_to_delete(prototype) %>
+          <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
+          <%= link_to_delete(prototype, :no_text => true) %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/prototypes/new.html.erb

@@ -4,7 +4,7 @@
 
 <%= form_for [:admin, @prototype] do |f| %>
 <fieldset data-hook="new_prototype">
-  <legend><%= t(:new_prototype) %></legend>
+  <legend align="center"><%= t(:new_prototype) %></legend>
   <%= render :partial => 'form', :locals => { :f => f } %>
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 </fieldset>

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

@@ -1,2 +1,5 @@
 $("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
+<% unless Rails.env.test? %>
+  $('.select2').select2();
+<% end %>
 $("#new_prototype_link").parent().hide();

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

@@ -1,4 +1,6 @@
-<h1><%= t(:listing_reports) %></h1>
+<% content_for :page_title do %>
+  <%= t(:listing_reports) %>
+<% end %>
 
 <table class="index">
   <thead>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,23 +1,37 @@
-<h1><%= t(:sales_totals) %> </h1>
+<% content_for :page_title do %>
+  <%= t(:sales_totals) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon 'icon-arrow-left', t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
+<% end %>
+
+
+<% content_for :table_filter_title do %>
+  <%= t(:date_range) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
+<% end %>
 
 <table class="admin-report" data-hook="sales_total">
-  <tbody>
+  <thead>
     <tr>
-      <th scope="row"><%= t(:item_total) %>:</th>
-      <td align="right"><%= money @item_total %></td>
-    </tr>
-    <tr>
-      <th scope="row"><%= t(:adjustment_total) %>:</th>
-      <td align="right"><%= money @adjustment_total %></td>
-    </tr>
-    <tr>
-      <th scope="row"><%= t(:sales_total) %>:</th>
-      <td align="right"><%= money @sales_total %></td>
+      <th><%= t(:currency) %></th>
+      <th><%= t(:item_total) %></th>
+      <th><%= t(:adjustment_total) %></th>
+      <th><%= t(:sales_total) %></th>
     </tr>
+  </thead>
+  <tbody>
+    <% @totals.each do |key, row| %>
+      <tr class="align-center">
+        <td><%= key %></td>
+        <td><%= row[:item_total].format %></td>
+        <td><%= row[:adjustment_total].format %></td>
+        <td><%= row[:sales_total].format %></td>
+      </tr>
+    <% end %>
   </tbody>
 </table>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
-<% end %>
-