spree_core 1.2.5 → 1.3.0.rc1

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

@@ -1,11 +1,14 @@
-<div data-hook="admin_state_form_fields">
-  <%= f.field_container :name do %>
-    <%= f.label :name, t(:name) %><br />
-    <%= f.text_field :name %>
-  <% end %>
-
-  <%= f.field_container :abbr do %>
-    <%= f.label :abbr, t(:abbreviation) %><br />
-    <%= f.text_field :abbr %>
-  <% end %>
+<div data-hook="admin_state_form_fields" class="row">
+  <div class="alpha six columns">
+    <%= f.field_container :name do %>
+      <%= f.label :name, t(:name) %>
+      <%= f.text_field :name, :class => 'fullwidth' %>
+    <% end %>
+  </div>
+  <div class="omega six columns">
+    <%= f.field_container :abbr do %>
+      <%= f.label :abbr, t(:abbreviation) %>
+      <%= f.text_field :abbr, :class => 'fullwidth' %>
+    <% end %>
+  </div>
 </div>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -1,30 +1,26 @@
 <div id="new_state" data-hook></div>
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li id="new_state_link">
-      <%= button_link_to t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'add', :id => 'new_state_link' } %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
 
 <table class="index" id='listing_states' data-hook>
+  <colgroup>
+    <col style="width: 70%" />
+    <col style="width: 15%" />
+    <col style="width: 15%" />
+  </colgroup>
   <thead>
     <tr data-hook="states_header">
       <th><%= t(:name) %></th>
       <th><%= t(:abbreviation) %></th>
-      <th></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @states.each do |state| %>
-      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
+      <tr id="<%= spree_dom_id state %>" data-hook="states_row" class="<%= cycle('odd', 'even')%>">
         <td><%= state.name %></td>
-        <td><%= state.abbr %></td>
+        <td class="align-center"><%= state.abbr %></td>
         <td class="actions">
-          <%= link_to_with_icon 'edit', t(:edit), edit_admin_country_state_url(@country, state), :class => 'edit' %>
-          &nbsp;
-          <%= link_to_delete state %>
+          <%= link_to_with_icon 'icon-edit', t(:edit), edit_admin_country_state_url(@country, state), :no_text => true %>
+          <%= link_to_delete state, :no_text => true %>
         </td>
       </tr>
     <% end %>

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

@@ -1,10 +1,20 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:editing_state) %></h1>
+<% content_for :page_title do %>
+  <%= t(:editing_state) %> <i class="icon-arrow-right"></i> <%= @state.name %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_states_list), spree.admin_country_states_url(@country), :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
 
 <%= form_for [:admin, @country, @state] 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/states/index.html.erb

@@ -1,13 +1,21 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:states) %></h1>
+<% content_for :page_title do %>
+  <%= t(:states) %>
+<% end %>
 
-<p data-hook="country">
+<% content_for :page_actions do %>
+  <li id="new_state_link">
+    <%= button_link_to t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'icon-plus', :id => 'new_state_link' } %>
+  </li>
+<% end %>
+
+<div data-hook="country" class="field row">
   <%= label_tag :country, t(:country) %>
-  <select id="country" class='observe_field' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
+  <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
   <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
-</p>
+</div>
 
 <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 

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

@@ -2,8 +2,14 @@
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
 
-<h3><%= t(:new_state) %></h3>
+<% content_for :page_title do %>
+  <%= t(:new_state) %>
+<% end %>
+
 <%= form_for [:admin, @country, @state] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <fieldset>
+    <legend><%= t(:new_state) %></legend>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -1,16 +1,24 @@
-<div data-hook="admin_tax_category_form_fields">
-  <%= f.field_container :name do %>
-    <%= f.label :name, t(:name) %><br />
-    <%= f.text_field :name %>
-  <% end %>
+<div data-hook="admin_tax_category_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' %>
+    <% end %>  
+  </div>
+  
+  <div class="five columns">
+    <%= f.field_container :description do %>
+      <%= f.label :description, t(:description) %><br>
+      <%= f.text_field :description, :class => 'fullwidth' %>
+    <% end %>
+  </div>
 
-  <%= f.field_container :description do %>
-    <%= f.label :description, t(:description) %><br />
-    <%= f.text_field :description %>
-  <% end %>
-
-  <%= f.field_container :is_default do %>
-    <%= f.label :is_default, t(:default) %><br />
-    <%= f.check_box :is_default %>
-  <% end %>
-</div>
+  <div class="three columns omega">
+    <%= f.field_container :is_default, :class => ['checkbox'] do %>
+      <label>
+        <%= f.check_box :is_default %>
+        <%= t(:default) %>
+      </label>
+    <% end %>
+  </div>
+</div>

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

@@ -1,10 +1,18 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:editing_tax_category) %></h1>
+<% content_for :page_title do %>
+  <%= t(:editing_tax_category) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon 'icon-arrow-left', t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
 
 <%= form_for [:admin, @tax_category] 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/tax_categories/index.html.erb

@@ -1,24 +1,30 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
+<% content_for :page_title do %>
+  <%= t(:listing_tax_categories) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <ul class="actions inline-menu">
     <li>
-      <p><%= button_link_to t(:new_tax_category), new_object_url, :icon => 'add', :id => 'admin_new_tax_categories_link' %>
-    </p>
+      <%= button_link_to t(:new_tax_category), new_object_url, :icon => 'icon-plus', :id => 'admin_new_tax_categories_link' %>
     </li>
   </ul>
-  <br class="clear" />
-</div>
-
+<% end %>
 
-<h1><%= t(:listing_tax_categories) %></h1>
 <table class="index" id='listing_tax_categories' data-hook>
+  <colgroup>
+    <col style="width: 30%" />
+    <col style="width: 40%" />
+    <col style="width: 15%" />
+    <col style="width: 15%" />
+  </colgroup>
   <thead>
     <tr data-hook="tax_header">
       <th><%= t(:name) %></th>
       <th><%= t(:description) %></th>
       <th><%= t(:default) %></th>
-      <th></th>
+      <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
@@ -26,18 +32,17 @@
          @edit_url = edit_admin_tax_category_path(tax_category)
          @delete_url = admin_tax_category_path(tax_category)
     %>
-      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
+      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row" class="<%= cycle('odd', 'even')%>">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.description %></td>
-        <td><%= tax_category.is_default.to_s.titleize %></td>
+        <td class="align-center"><%= tax_category.is_default.to_s.titleize %></td>
         <td class="actions">
-          <%= link_to_edit tax_category, :class => 'edit' %> &nbsp;
-          <%= link_to_delete tax_category %>
+          <%= link_to_edit tax_category, :no_text => true %>
+          <%= link_to_delete tax_category, :no_text => true %>
       </tr>
     <% end %>
     <% if @tax_categories.empty? %>
       <tr data-hook="tax_none"><td colspan="4"><%= t(:none) %></td></tr>
     <% end %>
   </tbody>
-</table>
-
+</table>

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

@@ -1,10 +1,19 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:new_tax_category) %></h1>
+<% content_for :page_title do %>
+  <%= t(:new_tax_category) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= link_to_with_icon 'icon-arrow-left', t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+<% end %>
+
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -1,30 +1,41 @@
 <div data-hook="admin_tax_rate_form_fields">
-  <table data-hook="tax_rates">
-    <tr data-hook="zone">
-      <td><%= f.label :zone, t(:zone) %></td>
-      <td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
-    </tr>
-    <tr data-hook="name">
-      <td><%= f.label :name, t(:name) %></td>
-      <td><%= f.text_field :name %></td>
-    </tr>
-    <tr data-hook="category">
-      <td><%= f.label :tax_category_id, t(:tax_category) %></td>
-      <td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
-    </tr>
-    <tr data-hook="included">
-      <td><%= f.label :included_in_price, t(:included_in_price) %></td>
-      <td><%= f.check_box :included_in_price %></td>
-    </tr>
-    <tr data-hook="rate">
-      <td><%= f.label :amount, t(:rate) %></td>
-      <td><%= f.text_field :amount %></td>
-    </tr>
-    <tr data-hook="show_rate">
-      <td><%= f.label :show_rate_in_label, t(:show_rate_in_label) %></td>
-      <td><%= f.check_box :show_rate_in_label %></td>
-    </tr>
-  </table>
+  <div class="alpha twelve columns">
+    <fieldset data-hook="tax_rates" class=" no-border-bottom">
+      <legend align="center"><%= t(:general_settings) %></legend>
+      
+      <div class="alpha six columns">
+        <div data-hook="name" class="field">
+          <%= f.label :name, t(:name) %>
+          <%= f.text_field :name, :class => 'fullwidth' %>
+        </div>
+        <div data-hook="rate" class="field">
+          <%= f.label :amount, t(:rate) %>
+          <%= f.text_field :amount, :class => 'fullwidth' %>
+        </div>
+        <div data-hook="included" class="field">
+          <%= f.check_box :included_in_price %>
+          <%= f.label :included_in_price, t(:included_in_price) %>      
+        </div>
+      </div>
+
+      <div class="omega six columns">
+        <div data-hook="zone" class="field">
+          <%= f.label :zone, t(:zone) %>
+          <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2 fullwidth'}) %>
+        </div>      
+        <div data-hook="category" class="field">
+          <%= f.label :tax_category_id, t(:tax_category) %>
+          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2 fullwidth'}) %>
+        </div>
+        <div data-hook="show_rate" class="field">
+          <%= f.check_box :show_rate_in_label %>
+          <%= f.label :show_rate_in_label, t(:show_rate_in_label) %>      
+        </div>  
+      </div>
+    </fieldset>
+  </div>
+  
+  <div class="clear"></div>
 
   <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
-</div>
+</div>

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

@@ -1,6 +1,21 @@
-<h1><%= t(:editing_tax_rate) %></h1>
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= t(:editing_tax_rate) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>
+
 <%= form_for [:admin, @tax_rate] 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 } %>
+    <div class="clear"></div>
+    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -1,40 +1,59 @@
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li>
-      <%= button_link_to t(:new_tax_rate), new_object_url, :icon => 'add' %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
-<h1><%= t(:tax_rates) %></h1>
-<table class="index">
-  <thead>
-    <tr data-hook="rate_header">
-      <th><%= t(:zone) %></th>
-      <th><%= t(:name) %></th>
-      <th><%= t(:category) %></th>
-      <th><%= t(:amount) %></th>
-      <th><%= t(:included_in_price) %></th>
-      <th><%= t(:show_rate_in_label) %></th>
-      <th><%= t(:calculator) %></th>
-      <th><%= t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @tax_rates.each do |tax_rate|%>
-    <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-      <td><%=tax_rate.zone.try(:name) || t(:not_available) %></td>
-      <td><%=tax_rate.name %></td>
-      <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
-      <td><%=tax_rate.amount %></td>
-      <td><%=tax_rate.included_in_price %></td>
-      <td><%=tax_rate.show_rate_in_label %></td>
-      <td><%=tax_rate.calculator.to_s %></td>
-      <td>
-        <%= link_to_edit tax_rate %> &nbsp;
-        <%= link_to_delete tax_rate %>
-      </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<% content_for :page_title do %>
+  <%= t(:tax_rates) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_tax_rate), new_object_url, :icon => 'icon-plus' %>
+  </li>
+<% end %>
+
+<% unless @tax_rates.any? %>
+  <div class="no-objects-found">
+    <%= t(:no_results) %>
+  </div>
+<% else %>
+  <table class="index">
+    <colgroup>
+      <col style="width: 15%">
+      <col style="width: 15%">
+      <col style="width: 10%">
+      <col style="width: 10%">
+      <col style="width: 10%">
+      <col style="width: 10%">
+      <col style="width: 15%">
+      <col style="width: 15%">
+    </colgroup>
+    <thead>
+      <tr data-hook="rate_header">
+        <th><%= t(:zone) %></th>
+        <th><%= t(:name) %></th>
+        <th><%= t(:category) %></th>
+        <th><%= t(:amount) %></th>
+        <th><%= t(:included_in_price) %></th>
+        <th><%= t(:show_rate_in_label) %></th>
+        <th><%= t(:calculator) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @tax_rates.each do |tax_rate|%>
+      <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row" class="<%= cycle('odd', 'even')%>">
+        <td><%=tax_rate.zone.try(:name) || t(:not_available) %></td>
+        <td><%=tax_rate.name %></td>
+        <td><%=tax_rate.tax_category.try(:name) || t(:not_available) %></td>
+        <td class="align-center"><%=tax_rate.amount %></td>
+        <td class="align-center"><%=tax_rate.included_in_price %></td>
+        <td class="align-center"><%=tax_rate.show_rate_in_label %></td>
+        <td class="align-center"><%=tax_rate.calculator.to_s %></td>
+        <td class="actions">
+          <%= link_to_edit tax_rate, :no_text => true %>
+          <%= link_to_delete tax_rate, :no_text => true %>
+        </td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>