spree_core 1.0.0.rc2 → 1.0.0.rc3

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

@@ -4,7 +4,7 @@
   <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
 </fieldset>
 
-<hr />
+<br />
 
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:place_order), :class => 'continue button primary' %>

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

@@ -11,7 +11,7 @@
             <% else %>
             <%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
             <% end %>
-          </label><br />
+          </label>
         <% end %>
       </p>
     </div>
@@ -24,6 +24,8 @@
   </div>
 </fieldset>
 
+<br />
+
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

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

@@ -24,7 +24,8 @@
   </div>
 </fieldset>
 
-<hr class="space" />
+<br class="space" />
+
 <div class="form-buttons" data-hook="buttons">
   <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
   <script>disableSaveOnClick();</script>

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

@@ -1,4 +1,5 @@
 <h3><%= t(:order_summary) %></h3>
+
 <table data-hook="order_summary">
   <tbody>
     <tr data-hook="item_total">

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

@@ -1,18 +1,28 @@
 <% content_for :head do %>
   <%= javascript_include_tag states_path %>
 <% end %>
-<div id="checkout" data-hook>
-  <h1><%= t(:checkout) %></h1>
-  <%= checkout_progress %>
-  <br clear="left" />
+<div id="checkout" data-hook>  
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
-  <% if @order.state != 'confirm' %>
-    <div id="checkout-summary" data-hook="checkout_summary_box">
-      <%= render :partial => 'summary', :locals => { :order => @order } %>
+  
+  <div class="row">
+    <h3 class="columns three alpha"><%= t(:checkout) %></h3>
+    <div class="columns thirteen omega"><%= checkout_progress %></div>
+  </div>
+  
+  <div class="row">
+    <div class="columns <%= if @order.state != 'confirm' then 'alpha twelve' else 'alpha omega sixteen' end %>">
+      <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
+        <%= render @order.state, :form => form %>
+        <%= submit_tag nil, :id => 'post-final', :style => 'display:none;' %>
+      <% end %>
     </div>
-  <% end %>
-  <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
-    <%= render @order.state, :form => form %>
-    <%= submit_tag nil, :id => 'post-final', :style => 'display:none;' %>
-  <% end %>
+    <div class="columns omega four">
+      <% if @order.state != 'confirm' %>
+        <div id="checkout-summary" data-hook="checkout_summary_box" class="columns omega four">
+          <%= render :partial => 'summary', :locals => { :order => @order } %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
 </div>

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

@@ -23,9 +23,7 @@
   <%= label_tag nil, t(:card_code) %><br />
   <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(:id => 'card_code', :class => 'required', :size => 5) %>
   <span class="req">*</span>
-  <a href="/content/cvv" target="_blank" onclick="window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false" data-hook="ccv_link">
-    (<%= t(:whats_this) %>)
-  </a>
+  <%= link_to "(#{t(:whats_this)})", spree.content_path('cvv'), :target => '_blank', :onclick => "window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false", "data-hook" => "cvv_link" %>
 </p>
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
 <%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

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

@@ -1,11 +1,11 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 <h2><%= t(:registration) %></h2>
-<div id="registration" data-hook>
+<div id="registration" data-hook class="columns alpha eight">
   <div id="account">
     <!-- TODO: add partial with registration form -->
   </div>
   <% if Spree::Config[:allow_guest_checkout] %>
-    <div id="guest_checkout" data-hook>
+    <div id="guest_checkout" data-hook class="columns omega eight">
       <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
       <h2><%= t(:guest_user_account) %></h2>
       <%= form_for @order, :url => update_checkout_registration_path, :method => :put, :html => { :id => 'checkout_form_registration' } do |f| %>

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

@@ -1,38 +1,69 @@
-<!DOCTYPE HTML>
-<html>
+<!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="inside_head">
     <%= render :partial => 'spree/shared/head' %>
   </head>
+
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
-    <div id="header" data-hook>
-      <ul id="nav-bar" data-hook>
-        <%= render :partial => 'spree/shared/nav_bar' %>
-      </ul>
-      <div id="logo" data-hook>
-        <%= logo %>
-      </div>
-    </div>
+    
+    <div class="container">
+
+      <header id="header" class="row" data-hook>
+      
+        <figure id="logo" class="columns alpha six" data-hook>
+          <%= logo %>
+        </figure> 
+
+        <nav id="top-nav-bar" class="columns omega ten">
+          <ul id="nav-bar" class="inline" data-hook>
+            <%= render :partial => 'spree/shared/nav_bar' %>
+          </ul>
+        </nav>
+
+        <% if store_menu? %>
+          <nav class="columns alpha omega sixteen">
+            <ul id="main-nav-bar" class="inline" data-hook>            
+              <%= render :partial => 'spree/shared/store_menu' %>
+            </ul>
+          </nav>
+        <% end %>
+            
+      </header>
 
-    <div id="wrapper" data-hook>
-      <% if content_for?(:sidebar) %>
-        <div id="sidebar" data-hook>
-          <%= yield :sidebar %>
+      <div id="wrapper" class="row" data-hook>
+        
+        <% if content_for?(:sidebar) %>
+          <aside id="sidebar" class="columns alpha four" data-hook>
+            <%= yield :sidebar %>
+          </aside>
+        <% end %>
+
+        <div id="content" class="columns omega <% if !content_for?(:sidebar) %> sixteen alpha <% else %> twelve <% end %>" data-hook>
+          <%= breadcrumbs(@taxon) %>
+          <%= flash_messages %>
+          <%= yield %>
         </div>
-      <% end %>
 
-      <div id="content" data-hook>
-        <%= breadcrumbs(@taxon) %>
-        <%= flash_messages %>
-        <%= yield %>
       </div>
-    </div>
 
-    <div id="footer" data-hook>
-      <div id="footer-left" data-hook>
-        <p><%= t(:powered_by) %> <%= link_to 'Spree', 'http://spreecommerce.com/' %></p>
-      </div>
-      <div id="footer-right" data-hook></div>
+      <footer id="footer" class="row" data-hook>
+        <div id="footer-left" class="columns alpha eight" data-hook>
+          <p><%= t(:powered_by) %> <%= link_to 'Spree', 'http://spreecommerce.com/' %></p>
+        </div>
+        <div id="footer-right" class="columns omega eight" data-hook></div>
+      </footer>
+
     </div>
+
     <%= render :partial => 'spree/shared/google_analytics' %>
+
   </body>
-</html>
+
+</html>

data/app/views/spree/orders/_line_item.html.erb

@@ -20,7 +20,7 @@
     <%= number_to_currency line_item.variant.price %>
   </td>
   <td data-hook="cart_item_quantity">
-    <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity" %>
+    <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
   </td>
   <td data-hook="cart_item_total">
     <%= number_to_currency(line_item.variant.price * line_item.quantity) unless line_item.quantity.nil? %>

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

@@ -18,15 +18,15 @@
           <%= render :partial => 'form', :locals => { :order_form => order_form } %>
         </div>
 
-        <div id="subtotal" data-hook>
-          <h3><%= t(:subtotal) %>: <%= order_subtotal(@order) %></h3>
+        <div class="links columns ten alpha" data-hook="cart_buttons">
+          <%= button_tag :class => 'primary', :id => 'update-button' do %>
+            <%= t(:update) %>
+          <% end %>
+         <%= link_to t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link' %>
         </div>
 
-        <div class="links" data-hook="cart_buttons">
-          <%= button_tag :class => 'large primary', :id => 'update-button' do %>
-            <%= image_tag('icons/update.png') + t(:update) %>
-          <% end %>
-         <%= link_to image_tag('icons/checkout.png') + t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link' %>
+        <div id="subtotal" data-hook class="columns six omega">
+          <h5><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(@order) %></span></h5>
         </div>
 
       </div>
@@ -37,7 +37,7 @@
     <p id="clear_cart_link" data-hook>
       <%= submit_tag t(:empty_cart), :class => 'button' %>
       <%= t(:or) %>
-      <%= link_to t(:continue_shopping), products_path, :class => 'continue' %>
+      <%= link_to t(:continue_shopping), products_path, :class => 'continue button' %>
     </p>
   <% end %>
   </div>

data/app/views/spree/orders/show.html.erb

@@ -1,14 +1,22 @@
-<h1><%= accurate_title %></h1>
+<fieldset id="order_summary" data-hook>
+  <legend><%= t(:order) + " #" + @order.number %></legend>
+  <h1><%= accurate_title %></h1>
 
 <div id="order" data-hook>
   <% if params.has_key? :checkout_complete %>
     <h3><%= t(:thank_you_for_your_order) %></h3>
   <% end %>
   <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
+
+  <br class="clear" />
+
   <p data-hook="links">
-    <%= link_to t(:back_to_store), spree.root_path %>
+    <%= link_to t(:back_to_store), spree.root_path, :class => "button" %>
     <% unless params.has_key? :checkout_complete %>
-      | <%= link_to t(:my_account), spree.account_path if current_user%>
+      <% if current_user %>
+        <%= link_to t(:my_account), spree.account_path, :class => "button" %>
+      <% end %>
     <% end %>
   </p>
 </div>
+</fieldset>

data/app/views/spree/products/_cart_form.html.erb

@@ -1,18 +1,9 @@
 <%= form_for :order, :url => populate_orders_url do |f| %>
-  <div data-hook="inside_product_cart_form">
-
-    <% if @product.price %>
-      <div data-hook="product_price">
-        <dl id="product-price">
-          <dt><%= t(:price) %></dt>
-          <dd><span class="price selling"><%= number_to_currency @product.price %></span></dd>
-        </dl>
-      </div>
-    <% end %>
+  <div data-hook="inside_product_cart_form" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
 
     <% if @product.has_variants? %>
-      <div id="product-variants">
-        <h2><%= t(:variants) %></h2>
+      <div id="product-variants" class="columns five alpha">
+        <h6 class="product-section-title"><%= t(:variants) %></h6>
         <ul>
           <% has_checked = false
           @product.variants.active.each_with_index do |v,index|
@@ -34,16 +25,30 @@
         </ul>
       </div>
     <% end%>
-    <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
-      <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-        1, :class => 'title', :in => 1..@product.on_hand %>
-      &nbsp;
-      <%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
-        <%= image_tag('icons/add-to-cart.png') + t(:add_to_cart) %>
-      <% end %>
-    <% else %>
-      <%= content_tag('strong', t(:out_of_stock)) %>
-    <% end %>
+
+    <% if @product.price %>
+      <div data-hook="product_price" class="columns five <% if !@product.has_variants? %> alpha <% else %> omega <% end %>">
+        
+        <div id="product-price">
+          <h6 class="product-section-title"><%= t(:price) %></h6>
+          <div><span class="price selling" itemprop="price"><%= number_to_currency @product.price %></span></div>
+        </div>
+
+        <div class="add-to-cart">
+          <% if @product.has_stock? || Spree::Config[:allow_backorders] %>      
+            <%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
+              1, :class => 'title', :in => 1..@product.on_hand %>
+            &nbsp;
+            <%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
+              <%= t(:add_to_cart) %>
+            <% end %>
+          <% else %>
+            <%= content_tag('strong', t(:out_of_stock)) %>
+          <% end %>
+        </div>
+
+      </div>
+    <% end %>    
 
   </div>
 <% end %>

data/app/views/spree/products/_image.html.erb

@@ -1,5 +1,5 @@
 <% if image %> 
-  <%= image_tag image.attachment.url(:product) %>
+  <%= image_tag image.attachment.url(:product), :itemprop => "description" %>
 <% else %>
-  <%= product_image(@product) %>
+  <%= product_image(@product, :itemprop => "image") %>
 <% end %>

data/app/views/spree/products/_properties.html.erb

@@ -1,9 +1,14 @@
-<% unless @product_properties.empty? %>
-<dl id="product-properties" class="table-display" data-hook>
-<% for product_property in @product_properties 
-    css_class = cycle('even', 'odd') %>
-  <dt class="<%= css_class %>"><%= product_property.property.presentation %></dt>
-  <dd class="<%= css_class %>"><%= product_property.value %></dd>
-<% end %>
-</dl>
+<% unless @product_properties.empty? %>  
+  <h6 class="product-section-title"><%= t('properties')%></h6>
+  <table id="product-properties" class="table-display" data-hook width="100%">
+    <tbody>
+      <% for product_property in @product_properties 
+        css_class = cycle('even', 'odd') %>
+        <tr class="<%= css_class %>">
+          <td><strong><%= product_property.property.presentation %></strong></td>
+          <td><%= product_property.value %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 <% end %>

data/app/views/spree/products/_taxons.html.erb

@@ -1,6 +1,6 @@
 <% if !@product.taxons.blank? %>
-  <div id="taxon-crumbs" data-hook>
-    <h3><%= t(:look_for_similar_items) %></h3>
+  <div id="taxon-crumbs" data-hook class="columns five omega">
+    <h6 class="product-section-title"><%= t(:look_for_similar_items) %></h6>
 
     <div data-hook="product_taxons">
       <ul id="similar_items_by_taxon" data-hook>

data/app/views/spree/products/_thumbnails.html.erb

@@ -1,6 +1,6 @@
 <!-- no need for thumnails unless there is more then one image -->
 <% if product.images.size > 1 %>
-  <ul id="product-thumbnails" class="thumbnails" data-hook>
+  <ul id="product-thumbnails" class="thumbnails inline" data-hook>
     <% product.images.each do |i| %>
       <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
     <% end %>

data/app/views/spree/products/index.html.erb

@@ -13,7 +13,7 @@
 
   <div data-hook="search_results">
     <% if @products.empty? %>
-      <%= t(:no_products_found) %>
+      <h6 class="search-results-title"><%= t(:no_products_found) %></h6>
     <% else %>
       <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
     <% end %>

data/app/views/spree/products/show.html.erb

@@ -1,26 +1,47 @@
-<div data-hook="product_show">
+<div data-hook="product_show" itemscope itemtype="http://schema.org/Product">
   <% @body_id = 'product-details' %>
-  <h1><%= accurate_title %></h1>
 
-  <div id="product-images" data-hook="product_images">
-    <div id="main-image" data-hook>
-      <%= render :partial => 'image' %>
-    </div>
-    <div id="thumbnails" data-hook>
-      <%= render :partial => 'thumbnails', :locals => { :product => @product } %>
+  <div class="columns six alpha">
+    <div class="row">
+
+      <div id="product-images" data-hook="product_images">
+        <div id="main-image" data-hook>
+          <%= render :partial => 'image' %>
+        </div>
+        <div id="thumbnails" data-hook>
+          <%= render :partial => 'thumbnails', :locals => { :product => @product } %>
+        </div>
+      </div>
+
+      <div data-hook="product_properties">
+        <%= render :partial => 'properties' %>
+      </div>
+    
     </div>
   </div>
 
-  <div id="cart-form" data-hook="cart_form">
-    <%= render :partial => 'cart_form' %>
-  </div>
+  <div class="columns ten omega">
+    <div class="row">
+
+      <div id="product-description" data-hook="product_description">
+
+        <h1 class="product-title" itemprop="name"><%= accurate_title %></h1>
+
+        <div itemprop="description">
+          <%= product_description(@product) rescue t(:product_has_no_description) %>
+        </div>
+
+        <div id="cart-form" data-hook="cart_form">
+          <%= render :partial => 'cart_form' %>
+        </div>
+
+      </div>  
+
+      
+    
+      <%= render :partial => 'taxons' %>
 
-  <div id="product-description" data-hook="product_description">
-    <%= product_description(@product) rescue t(:product_has_no_description) %>
-    <div data-hook="product_properties">
-      <%= render :partial => 'properties' %>
     </div>
   </div>
-</div>
 
-<%= render :partial => 'taxons' %>
+</div>