spree_core 1.2.5 → 1.3.0.rc1

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

@@ -1,10 +1,21 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:new_zone) %></h1>
+<% content_for :page_title do %>
+  <%= t(:new_zone) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_zones_list), spree.admin_zones_path, :icon => 'icon-arrow-left' %>
+  </li>
+<% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
   <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+
+  <div class="clear"></div>
+  
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>

data/app/views/spree/checkout/_address.html.erb

@@ -1,173 +1,25 @@
 <div class="columns alpha six" data-hook="billing_fieldset_wrapper">
-<fieldset id="billing" data-hook>
-  <%= form.fields_for :bill_address do |bill_form| %>
-    <legend><%= t(:billing_address) %></legend>
-    <div class="inner" data-hook="billing_inner">
-      <p class="field" id="bfirstname">
-        <%= bill_form.label :firstname, t(:first_name) %><span class="required">*</span><br />
-        <%= bill_form.text_field :firstname, :class => 'required' %>
-      </p>
-      <p class="field" id="blastname">
-        <%= bill_form.label :lastname, t(:last_name) %><span class="required">*</span><br />
-        <%= bill_form.text_field :lastname, :class => 'required' %>
-      </p>
-      <% if Spree::Config[:company] %>
-        <p class="field" id="bcompany">
-          <%= bill_form.label :company, t(:company) %><br />
-          <%= bill_form.text_field :company %>
-        </p>
-      <% end %>
-      <p class="field" id="baddress1">
-        <%= bill_form.label :address1, t(:street_address) %><span class="required">*</span><br />
-        <%= bill_form.text_field :address1, :class => 'required' %>
-      </p>
-      <p class="field" id="baddress2">
-        <%= bill_form.label :address2, t(:street_address_2) %><br />
-        <%= bill_form.text_field :address2 %>
-      </p>
-
-      <p class="field" id="bcity">
-        <%= bill_form.label :city, t(:city) %><span class="required">*</span><br />
-        <%= bill_form.text_field :city, :class => 'required' %>
-      </p>
-
-      <p class="field" id="bcountry">
-        <%= bill_form.label :country_id, t(:country) %><span class="required">*</span><br />
-        <span id="bcountry">
-          <%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
-        </span>
-      </p>
-
-      <p class="field" id="bstate">
-        <% have_states = !@order.bill_address.country.states.empty? %>
-
-        <%= bill_form.label :state, t(:state) %><%= state_required_label %><br />
-
-        <% state_elements = [
-           bill_form.collection_select(:state_id, @order.bill_address.country.states,
-                              :id, :name,
-                              {:include_blank => true},
-                              {:class => have_states ? state_required_class : 'hidden',
-                              :disabled => !have_states}) +
-           bill_form.text_field(:state_name,
-                              :class => !have_states ? state_required_class : 'hidden',
-                              :disabled => have_states)
-           ].join.gsub('"', "'").gsub("\n", "")
-        %>
-        <%= javascript_tag do -%>
-          document.write("<%== state_elements %>");
-        <% end -%>
-      </p>
-
-      <noscript>
-        <%= bill_form.text_field :state_name, :class => state_required_class %>
-      </noscript>
-
-      <p class="field" id="bzipcode">
-        <%= bill_form.label :zipcode, t(:zip) %><span class="required">*</span><br />
-        <%= bill_form.text_field :zipcode, :class => 'required' %>
-      </p>
-      <p class="field" id="bphone">
-        <%= bill_form.label :phone, t(:phone) %><span class="required">*</span><br />
-        <%= bill_form.phone_field :phone, :class => 'required' %>
-      </p>
-      <% if Spree::Config[:alternative_billing_phone] %>
-        <p class="field" id="baltphone">
-          <%= bill_form.label :alternative_phone, t(:alternative_phone) %><br />
-          <%= bill_form.phone_field :alternative_phone %>
-        </p>
-      <% end %>
-    </div>
-  <% end %>
-</fieldset>
+  <fieldset id="billing" data-hook>
+    <%= form.fields_for :bill_address do |bill_form| %>
+      <legend align="center"><%= t(:billing_address) %></legend>
+      <%= render :partial => 'spree/address/form', :locals => {:form => bill_form, :address_type => 'billing', :address => @order.bill_address} %>
+    <% end %>
+  </fieldset>
 </div>
 
 <div class="columns omega six" data-hook="shipping_fieldset_wrapper">
-<fieldset id="shipping" data-hook>
-  <%= form.fields_for :ship_address do |ship_form| %>
-    <legend><%= t(:shipping_address) %></legend>
-    <p class="field checkbox" data-hook="use_billing">
-      <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
-      <%= label_tag :order_use_billing, t(:use_billing_address), :id => 'use_billing' %>
-    </p>
-    <div class="inner" data-hook="shipping_inner">
-      <p class="field" id="sfirstname">
-        <%= ship_form.label :firstname, t(:first_name) %><span class="required">*</span><br />
-        <%= ship_form.text_field :firstname, :class => 'required' %>
-      </p>
-      <p class="field" id="slastname">
-        <%= ship_form.label :lastname, t(:last_name) %><span class="required">*</span><br />
-        <%= ship_form.text_field :lastname, :class => 'required' %>
-      </p>
-      <% if Spree::Config[:company] %>
-        <p class="field" id="scompany">
-          <%= ship_form.label :company, t(:company) %><br />
-          <%= ship_form.text_field :company %>
-        </p>
-      <% end %>
-      <p class="field" id="saddress1">
-        <%= ship_form.label :address1, t(:street_address) %><span class="required">*</span><br />
-        <%= ship_form.text_field :address1, :class => 'required' %>
-      </p>
-      <p class="field" id="saddress2">
-        <%= ship_form.label :address2, t(:street_address_2) %><br />
-        <%= ship_form.text_field :address2 %>
-      </p>
-
-      <p class="field" id="scity">
-        <%= ship_form.label :city, t(:city) %><span class="required">*</span><br />
-        <%= ship_form.text_field :city, :class => 'required' %>
-      </p>
-
-      <p class="field" id="scountry">
-        <%= ship_form.label :country_id, t(:country) %><span class="required">*</span><br />
-        <span id="scountry">
-          <%= ship_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
-        </span>
-      </p>
-
-      <p class="field" id="sstate">
-        <% have_states = !@order.ship_address.country.states.empty? %>
-        <%= ship_form.label :state, t(:state) %><%= state_required_label %><br />
-        <% state_elements = [
-           ship_form.collection_select(:state_id, @order.ship_address.country.states,
-                              :id, :name,
-                              {:include_blank => true},
-                              {:class => have_states ? state_required_class : 'hidden',
-                              :disabled => !have_states}) +
-           ship_form.text_field(:state_name,
-                              :class => !have_states ? state_required_class : 'hidden',
-                              :disabled => have_states)
-           ].join.gsub('"', "'").gsub("\n", "")
-        %>
-        <%= javascript_tag do -%>
-          document.write("<%== state_elements %>");
-        <% end %>
-      </p>
-
-      <noscript>
-        <%= ship_form.text_field :state_name, :class => state_required_class %>
-      </noscript>
-
-      <p class="field" id="szipcode">
-        <%= ship_form.label :zipcode, t(:zip) %><span class="required">*</span><br />
-        <%= ship_form.text_field :zipcode, :class => 'required' %>
-      </p>
-      <p class="field" id="sphone">
-        <%= ship_form.label :phone, t(:phone) %><span class="required">*</span><br />
-        <%= ship_form.phone_field :phone, :class => 'required' %>
-      </p>
-      <% if Spree::Config[:alternative_shipping_phone] %>
-        <p class="field" id="saltphone">
-          <%= ship_form.label :alternative_phone, t(:alternative_phone) %><br />
-          <%= ship_form.phone_field :alternative_phone %>
-        </p>
-      <% end %>
-    </div>
-  <% end %>
-</fieldset>
+  <fieldset id="shipping" data-hook>
+    <%= form.fields_for :ship_address do |ship_form| %>
+      <legend align="center"><%= t(:shipping_address) %></legend>
+      <p class="field checkbox" data-hook="use_billing">
+        <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) || @order.bill_address.same_as?(@order.ship_address)) %>
+        <%= label_tag :order_use_billing, t(:use_billing_address), :id => 'use_billing' %>
+      </p>
+      <%= render :partial => 'spree/address/form', :locals => {:form => ship_form, :address_type => 'shipping', :address => @order.ship_address} %>
+    <% end %>
+  </fieldset>
 </div>
-<hr class="clear" />
+<hr class="clear"/>
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

data/app/views/spree/checkout/_confirm.html.erb

@@ -1,6 +1,6 @@
 <fieldset id="order_details" data-hook>
   <div class="clear"></div>
-  <legend><%= t(@order.state, :scope => :order_state).titleize %></legend>
+  <legend align="center"><%= t(@order.state, :scope => :order_state).titleize %></legend>
   <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
 </fieldset>
 

data/app/views/spree/checkout/_delivery.html.erb

@@ -1,5 +1,5 @@
 <fieldset id='shipping_method' data-hook>
-  <legend><%= t(:shipping_method) %></legend>
+  <legend align="center"><%= t(:shipping_method) %></legend>
   <div class="inner" data-hook="shipping_method_inner">
     <div id="methods">
       <p class="field radios">

data/app/views/spree/checkout/_payment.html.erb

@@ -1,5 +1,5 @@
 <fieldset id="payment" data-hook>
-  <legend><%= t(:payment_information) %></legend>
+  <legend align="center"><%= t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
     <% @order.available_payment_methods.each do |method| %>
     <p>

data/app/views/spree/checkout/_summary.html.erb

@@ -4,27 +4,27 @@
   <tbody>
     <tr data-hook="item_total">
       <td><strong><%= t(:item_total) %>:</strong></td>
-      <td><strong><%= money order.item_total %></strong></td>
+      <td><strong><%= order.display_item_total %></strong></td>
     </tr>
     <tbody id="summary-order-charges" data-hook>
       <% order.adjustments.eligible.each do |adjustment| %>
       <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
         <tr>
           <td><%= adjustment.label %>: </td>
-          <td><%= money adjustment.amount %></td>
+          <td><%= adjustment.display_amount %></td>
         </tr>
       <% end %>
     </tbody>
     <tr data-hook="order_total">
       <td><strong><%= t(:order_total) %>:</strong></td>
-      <td><strong><span id='summary-order-total'><%= money @order.total %></span></strong></td>
+      <td><strong><span id='summary-order-total'><%= @order.display_total %></span></strong></td>
     </tr>
     <% if order.price_adjustment_totals.present? %>
       <tbody id="price-adjustments" data-hook="order_details_price_adjustments">
         <% @order.price_adjustment_totals.keys.each do |key| %>
           <tr class="total">
             <td><strong><%= key %></strong></td>
-            <td><strong><span><%= money @order.price_adjustment_totals[key] %></span></strong></td>
+            <td><strong><span><%= @order.price_adjustment_totals[key].display_total %></span></strong></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/spree/checkout/edit.html.erb

@@ -1,6 +1,8 @@
 <% content_for :head do %>
   <%= javascript_include_tag states_url(:format => :js) %>
+  <%= javascript_include_tag countries_url(:format => :js) %>
 <% end %>
+
 <div id="checkout" data-hook>  
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
   

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -15,8 +15,8 @@
 </p>
 <p class="field" data-hook="card_expiration">
   <%= label_tag nil, t(:expiration) %><br />
-  <%= select_month(Date.today, { :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true }, :class => 'required') %>
-  <%= select_year(Date.today, { :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15 }, :class => 'required') %>
+  <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required') %>
+  <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
   <span class="required">*</span>
 </p>
 <p class="field" data-hook="card_code">

data/app/views/spree/checkout/registration.html.erb

@@ -7,7 +7,7 @@
   <% if Spree::Config[:allow_guest_checkout] %>
     <div id="guest_checkout" data-hook class="columns omega eight">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-      <h1><%= t(:guest_user_account) %></h1>
+      <h6><%= t(:guest_user_account) %></h6>
       <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>
         <p>
           <%= f.label :email, t(:email) %><br />

data/app/views/spree/countries/index.js.erb

@@ -0,0 +1 @@
+states_required_mapper = <%== @states_required %>

data/app/views/spree/layouts/admin.html.erb

@@ -1,68 +1,132 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head data-hook="admin_inside_head">
-  <%= render :partial => 'spree/admin/shared/head' %>
-</head>
-<body class='admin' data-ajax-root-path="<%= spree.root_path %>">
-<!--[if IE 7]>
-<div id='IE7'>
-<![endif]-->
-<div id='wrapper' data-hook>
-
-  <div id="header" data-hook>
-
-    <div data-hook="admin_login_navigation_bar"></div>
-
-    <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path %>
-    <h1><%= link_to t(:administration), spree.admin_path %></h1>
-    <div id="progress"><%= image_tag 'admin/progress.gif' %> <%= t(:loading) %>...</div>
-  </div>
-
-  <div id="admin-menu" data-hook>
-    <ul data-hook="admin_tabs">
-      <%= render :partial => 'spree/admin/shared/tabs' %>
-    </ul>
-    <br class="clear" />
-  </div>
-
-  <div id="sub-menu" data-hook>
-    <%= yield :sub_menu %>
-    <br class="clear" />
-  </div>
-
-  <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %> clear tile_bg" id="content" data-hook>
-
-    <% if flash[:error] %>
-      <div class="flash error"><%= flash[:error] %></div>
-    <% end %>
-    <% if notice %>
-      <div class="flash notice"><%= notice %></div>
-    <% end %>
-
-    <%= render :partial => 'spree/admin/shared/alert', :collection => session[:alerts] %>
-
-    <%= yield %>
-
-    <% if content_for?(:sidebar) %>
-      <br class="clear" />
-      <div id="sidebar" data-hook>
-        <%= yield :sidebar %>
+<!doctype html>
+<!--[if lt IE 7 ]> <html class="ie ie6" lang="en"> <![endif]-->
+<!--[if IE 7 ]>    <html class="ie ie7" lang="en"> <![endif]-->
+<!--[if IE 8 ]>    <html class="ie ie8" lang="en"> <![endif]-->
+<!--[if IE 9 ]>    <html class="ie ie9" lang="en"> <![endif]-->
+<!--[if gt IE 9]><!--><html lang="en"><!--<![endif]-->
+  <head data-hook="admin_inside_head">
+    <%= render :partial => 'spree/admin/shared/head' %>
+  </head>
+  
+  <body class='admin' data-ajax-root-path="<%= spree.root_path %>">
+    <div id='wrapper' data-hook>
+
+      <% if flash[:error] %>
+        <div class="flash error"><%= flash[:error] %></div>
+      <% end %>
+      <% if notice %>
+        <div class="flash notice"><%= notice %></div>
+      <% end %>
+      <% if flash[:success] %>
+        <div class="flash success"><%= flash[:success] %></div>
+      <% end %>
+
+      <div id="progress">
+        <div class="wrapper">
+          <div id="spinner"></div>
+          <div class="progress-message"><%= t(:loading) %>...</div>
+        </div>
       </div>
-    <% end %>
 
-  </div>
+      <%= render :partial => 'spree/admin/shared/alert', :collection => session[:alerts] %>
+
+      <header id="header" data-hook>
+
+        <div class="container">
+          <figure data-hook="logo-wrapper" class="columns five">
+            <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path %>
+          </figure>
+
+          <nav data-hook="admin_login_navigation_bar" class="columns eleven"></nav>
+        </div>
+        
+      </header>
+
+      <nav id="admin-menu" data-hook>
+        <div class="container">
+          <div class="sixteen columns main-menu-wrapper">
+            <ul data-hook="admin_tabs" class="inline-menu fullwidth-menu">
+              <%= render :partial => 'spree/admin/shared/tabs' %>
+            </ul>
+          </div>
+        </div>
+      </nav>
+
+      <% if content_for?(:sub_menu) %>
+        <nav id="sub-menu" data-hook>
+          <div class="container">
+            
+              <div class="sixteen columns">
+                <%= yield :sub_menu %>
+              </div>
+            
+          </div>
+        </nav>
+      <% end %>
+
+      <% if content_for?(:page_title) || content_for?(:page_actions) %>
+        <div id="content-header" data-hook>
+          <div class="container">
+            
+              <div class="sixteen columns">
+                <div class="block-table">
+                  <% if content_for?(:page_title) %>
+                    <div class="table-cell">
+                      <h1 class="page-title <%= yield :page_title_classes %>"><%= yield :page_title %></h1>
+                    </div>
+                  <% end %>
+                  <% if content_for?(:page_actions) %>
+                    <div class="page-actions table-cell toolbar" data-hook="toolbar">
+                      <ul class="inline-menu">
+                        <%= yield :page_actions %>
+                      </ul>
+                    </div>
+                  <% end %>
+                </div>
+              </div>
+            
+          </div>
+        </div>
+      <% end %>
+
+      <div class="container">
+        <div class="row">
+          <div class="<%= 'with-sidebar ' if content_for?(:sidebar) %>" id="content" data-hook>
+            
+            <% if content_for?(:table_filter) %>
+              <div id="table-filter" data-hook class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+                <fieldset>
+                  <legend align="center"><%= yield :table_filter_title %></legend>
+                  <%= yield :table_filter %>
+                </fieldset>
+              </div>
+            <% end %>
+
+            <div class="<%= if content_for?(:sidebar) then 'twelve' else 'sixteen' end %> columns">
+              <%= yield %>
+            </div>
+
+
+            <% if content_for?(:sidebar) %>
+              <aside id="sidebar" data-hook class="four columns">
+
+                <% if content_for?(:sidebar_title) %>
+                  <h5 class="sidebar-title"><span><%= yield :sidebar_title %></span></h5>
+                <% end %>
+
+                <%= yield :sidebar %>
+              </aside>
+            <% end %>
+
+          </div>
+        </div>
+
+      </div>
 
-  <div id="footer" data-hook>
-    <p><%= t(:icons_by) %> <%= link_to 'pInvoke', 'http://pinvoke.com' %></p>
-  </div>
+    </div>
 
+    <div data-hook="admin_footer_scripts"></div>
 
-</div>
-<!--[if IE]>
-</div>
-<![endif]-->
 
-<div data-hook="admin_footer_scripts"></div>
-</body>
+  </body>
 </html>