spree_core 0.60.6 → 0.70.0

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

@@ -1,20 +1,18 @@
 <% content_for :head do %>
-  <%= javascript_include_tag  'checkout', '/states' %>
+  <%= javascript_include_tag '/states' %>
 <% end %>
-<div id="checkout">
-  <h1><%= t("checkout")%></h1>
+<div id="checkout" data-hook>
+  <h1><%= t(:checkout) %></h1>
   <%= checkout_progress %>
   <br clear="left" />
-  <%= render "shared/error_messages", :target => @order %>
-  <%= hook :checkout_summary_box do %>
-    <% if @order.state != 'confirm' %>
-      <div id="checkout-summary">
-        <%= render 'summary', :order => @order %>
-      </div>
-    <% end %>
+  <%= render 'shared/error_messages', :target => @order %>
+  <% if @order.state != 'confirm' %>
+    <div id="checkout-summary" data-hook="checkout_summary_box">
+      <%= render 'summary', :order => @order %>
+    </div>
   <% end %>
   <%= form_for @order, :url => update_checkout_path(@order.state), :html => { :id => "checkout_form_#{@order.state}" } do |form| %>
     <%= render @order.state, :form => form %>
-    <input id="post-final" type="submit" style="display:none"/>
+    <%= submit_tag nil, :id => 'post-final', :style => 'display:none;' %>
   <% end %>
 </div>

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

@@ -1,31 +1,31 @@
-<%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
+<%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-<p class="field">
-  <label for=""><%= t("card_number") %></label><br />
-  <% options_hash = Rails.env.production? ? {:autocomplete => "off"} : {} %>
+<p class="field" data-hook="card_number">
+  <%= label_tag nil, t(:card_number) %><br />
+  <% options_hash = Rails.env.production? ? {:autocomplete => 'off'} : {} %>
   <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(:id => 'card_number', :class => 'required', :size => 19, :maxlength => 19) %>
   <span class="req">*</span>
   &nbsp;
   <span id="card_type" style="display:none;">
-    ( <span id="looks_like" ><%= t('card_type_is') %> <span id="type"></span></span>
-      <span id="unrecognized"><%= t('unrecognized_card_type') %></span>
+    ( <span id="looks_like" ><%= t(:card_type_is) %> <span id="type"></span></span>
+      <span id="unrecognized"><%= t(:unrecognized_card_type) %></span>
     )
   </span>
 </p>
-<p class="field">
-  <label for=""><%= t("expiration") %></label><br />
+<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') %>
   <span class="req">*</span>
 </p>
-<p class="field">
-  <label for=""><%= t("card_code") %></label><br />
+<p class="field" data-hook="cart_code">
+  <%= 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">
-    (<%= t("whats_this") %>)
+  <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>
 </p>
 <%= hidden_field param_prefix, 'first_name', :value => @order.billing_firstname %>
-<%= hidden_field param_prefix, 'last_name',  :value => @order.billing_lastname %>
+<%= hidden_field param_prefix, 'last_name', :value => @order.billing_lastname %>

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

@@ -1,20 +1,20 @@
-<%= render "shared/error_messages", :target => @user %>
-<h2><%= t("registration")%></h2>
-<div id="registration">
+<%= render 'shared/error_messages', :target => @user %>
+<h2><%= t(:registration) %></h2>
+<div id="registration" data-hook>
   <div id="account">
     <!-- TODO: add partial with registration form -->
   </div>
   <% if Spree::Config[:allow_guest_checkout] %>
-    <div id="guest_checkout">
-      <%= render "shared/error_messages", :target => @order %>
+    <div id="guest_checkout" data-hook>
+      <%= render 'shared/error_messages', :target => @order %>
       <h2><%= t(:guest_user_account) %></h2>
-      <%= form_for @order, :url => update_checkout_registration_path, :html => { :method => :put, :id => "checkout_form_registration"} do |f| %>
+      <%= form_for @order, :url => update_checkout_registration_path, :html => { :method => :put, :id => 'checkout_form_registration'} do |f| %>
         <p>
-          <%= f.label :email, t("email") %><br />
+          <%= f.label :email, t(:email) %><br />
           <%= f.text_field :email, :class => 'title'  %>
         </p>
-        <p><%= submit_tag t("continue"), :class => 'button primary' %></p>
+        <p><%= submit_tag t(:continue), :class => 'button primary' %></p>
       <% end %>
     </div>
   <% end %>
-</div>
+</div>

data/app/views/content/cvv.html.erb

@@ -1,13 +1,13 @@
-<div class="cvv">
-  <h2><%= t("what_is_a_cvv") %></h2>
+<div class="cvv" data-hook>
+  <h2><%= t(:what_is_a_cvv) %></h2>
   <p>For Visa, MasterCard, and Discover cards, the card code is the last 3 digit number located on the back of your card on or above your signature line. For an American Express card, it is the 4 digits on the FRONT above the end of your card number.</p>
   <p>To help reduce fraud in the card-not-present environment, credit card companies have introduced a card code program. Visa calls this code Card Verification Value (CVV); MasterCard calls it Card Validation Code (CVC); Discover calls it Card ID (CID). The card code is a three- or four- digit security code that is printed on the back of cards. The number typically appears at the end of the signature panel.</p>
   <div class="cid-caption">Visa</div>
-  <%= image_tag "visa_cid.gif" %>
+  <%= image_tag 'creditcards/visa_cid.gif' %>
   <div class="cid-caption">Master Card</div>
-  <%= image_tag "master_cid.jpg" %>
+  <%= image_tag 'creditcards/master_cid.jpg' %>
   <div class="cid-caption">American Express</div>
-  <%= image_tag "amex_cid.gif" %>
-  <div class="cid-caption">Discover</div>  
-  <%= image_tag "discover_cid.gif" %>
+  <%= image_tag 'creditcards/amex_cid.gif' %>
+  <div class="cid-caption">Discover</div>
+  <%= image_tag 'creditcards/discover_cid.gif' %>
 </div> 

data/app/views/home/index.html.erb

@@ -0,0 +1,10 @@
+<% content_for :sidebar do %>
+  <div data-hook="homepage_sidebar_navigation">
+    <%= render 'shared/taxonomies' %>
+  </div>
+<% end %>
+
+<div data-hook="homepage_products">
+  <%= render 'shared/products', :products => @products %>
+</div>
+

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

@@ -1,65 +1,58 @@
 <!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>
-  <%= hook :admin_inside_head do %>
-    <%= render :partial => "shared/admin_head" %>
-  <% end %>
+<head data-hook="admin_inside_head">
+  <%= render :partial => 'admin/shared/head' %>
 </head>
-<body class='yui-skin-sam admin'>
+<body class='admin'>
 <!--[if IE 7]>
 <div id='IE7'>
 <![endif]-->
-<div id='wrapper'>
+<div id='wrapper' data-hook>
 
-  <div id="header">
+  <div id="header" data-hook>
 
-    <%= hook :admin_login_navigation_bar %>
+    <div data-hook="admin_login_navigation_bar"></div>
 
-    <a href="<%= admin_path %>"><%= image_tag Spree::Config[:admin_interface_logo], :id => 'logo' %></a>
-    <h1><%= link_to t("administration"), admin_path %></h1>
-    <div id="progress"><%= image_tag 'progress.gif' %> <%= t('loading') %>...</div>
+    <%= link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), admin_path %>
+    <h1><%= link_to t(:administration), admin_path %></h1>
+    <div id="progress"><%= image_tag 'admin/progress.gif' %> <%= t(:loading) %>...</div>
   </div>
 
-  <div id="admin-menu">
-    <ul>
-      <%= hook :admin_tabs do %>
-        <%= render 'admin/shared/tabs' %>
-      <% end %>
+  <div id="admin-menu" data-hook>
+    <ul data-hook="admin_tabs">
+      <%= render 'admin/shared/tabs' %>
     </ul>
     <br class="clear" />
   </div>
 
-  <div id="sub-menu">
+  <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">
-
+  <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>
+      <div class="flash error"><%= flash[:error] %></div>
     <% end %>
-    <% if self.notice %>
-    <div class="flash notice"><%= self.notice %></div>
+    <% if notice %>
+      <div class="flash notice"><%= notice %></div>
     <% end %>
 
-    <%= render :partial => 'admin/shared/alert', :collection => session[:alerts] %>
-
     <%= yield %>
 
     <% if content_for?(:sidebar) %>
-      <br class='clear' />
-      <div id="sidebar">
-          <%= yield :sidebar %>
+      <br class="clear" />
+      <div id="sidebar" data-hook>
+        <%= yield :sidebar %>
       </div>
     <% end %>
 
   </div>
 
-  <div id="footer">
-    <p><%= t("icons_by") %> <a href='http://pinvoke.com'>pInvoke</a></p>
+  <div id="footer" data-hook>
+    <p><%= t(:icons_by) %> <%= link_to 'pInvoke', 'http://pinvoke.com' %></p>
   </div>
 
 
@@ -68,8 +61,6 @@
 </div>
 <![endif]-->
 
-<%= hook :admin_footer_scripts do %>
-  <%= javascript_include_tag 'admin/unobtrusive_handlers' %>
-<% end %>
+<div data-hook="admin_footer_scripts"></div>
 </body>
 </html>

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

@@ -1,52 +1,38 @@
-<!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>
-<%= hook :inside_head do %>
-  <%= render :partial => 'shared/head'%>
-<% end %>
-</head>
-<%
-if @body_class.nil?
-  if content_for?(:sidebar)
-    @body_class = 'two-col'
-  else
-    @body_class = 'one-col'
-  end
-end
- %>
-<body class="<%= @body_class %>" id="<%= @body_id %>">
-  <div id="header" class="container_bg">
-    <div class="container">
-    <div id="login-bar">
-      <ul id="nav-bar">
+<!DOCTYPE HTML>
+<html>
+  <head data-hook="inside_head">
+    <%= render '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 'shared/nav_bar' %>
       </ul>
+      <div id="logo" data-hook>
+        <%= logo %>
+      </div>
     </div>
-  <%= logo %>
-  </div>
-  </div>
 
-  <div id="wrapper" class="container">
-    <% if content_for?(:sidebar) %>
-    <div id="sidebar">
-      <%= hook :sidebar do %>
-        <%= yield :sidebar %>
+    <div id="wrapper" data-hook>
+      <% if content_for?(:sidebar) %>
+        <div id="sidebar" data-hook>
+          <%= yield :sidebar %>
+        </div>
       <% end %>
-    </div>
-    <% end %>
 
-    <div id="content">
-      <%= breadcrumbs(@taxon) if @taxon %>
-      <% if flash.notice %>
-      <div class="flash notice"><%= flash.notice %></div>
-      <% end %>
-      <% if flash[:error] %>
-      <div class="flash errors"><%= flash[:error] %></div>
-      <% end %>
-      <%= yield %>
+      <div id="content" data-hook>
+        <%= breadcrumbs(@taxon) %>
+        <%= flash_messages %>
+        <%= yield %>
+      </div>
     </div>
-    <%= render :partial => 'shared/footer'%>
-  </div>
 
-</body>
+    <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>
+    </div>
+    <%= render 'shared/google_analytics' %>
+  </body>
 </html>

data/app/views/order_mailer/cancel_email.text.erb

@@ -5,8 +5,8 @@ Your order has been CANCELED.  Please retain this cancellation information for y
 ============================================================
 Order Summary [CANCELED]
 ============================================================
-<% for item in @order.line_items %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+<% @order.line_items.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant) %> (<%= item.quantity %>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end %>
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>

data/app/views/order_mailer/confirm_email.text.erb

@@ -6,7 +6,7 @@ Please review and retain the following order information for your records.
 Order Summary
 ============================================================
 <% for item in @order.line_items %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
+<%=item.variant.sku %> <%=item.variant.product.name%> <%= item.variant.options_text -%> (<%=item.quantity%>) @ <%= number_to_currency item.price %> = <%= number_to_currency(item.price * item.quantity) %>
 <% end %>
 ============================================================
 Subtotal: <%= number_to_currency @order.item_total %>

data/app/views/orders/_form.html.erb

@@ -1,17 +1,15 @@
-<%= render "shared/error_messages", :target => @order %>
-<table id="cart-detail">
+<%= render 'shared/error_messages', :target => @order %>
+<table id="cart-detail" data-hook>
   <thead>
-    <tr>
-      <%= hook :cart_items_headers do %>
-        <th colspan="2"><%= t("item") %></th>
-        <th><%= t("price") %></th>
-        <th><%= t("qty") %></th>
-        <th><%= t("total") %></th>
-        <th></th>
-      <% end %>
+    <tr data-hook="cart_items_headers">
+      <th colspan="2"><%= t(:item) %></th>
+      <th><%= t(:price) %></th>
+      <th><%= t(:qty) %></th>
+      <th><%= t(:total) %></th>
+      <th></th>
     </tr>
   </thead>
-  <tbody id="line_items">
+  <tbody id="line_items" data-hook>
     <%= order_form.fields_for :line_items do |item_form| %>
       <%= render 'line_item', :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form %>
     <% end %>

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

@@ -1,41 +1,31 @@
 <tr class="<%= cycle('', 'alt') %>">
-  <td>
-    <%- locals = {:item_form => item_form, :variant => variant, :line_item => line_item} %>
-    <%= hook :cart_item_image, locals do %>
-      <% if variant.images.length == 0 %>
-        <%= small_image(variant.product) %>
-      <% else %>
-        <%=  image_tag variant.images.first.attachment.url(:small)   %>
-      <% end %>
+  <td data-hook="cart_item_image">
+    <% if variant.images.length == 0 %>
+      <%= small_image(variant.product) %>
+    <% else %>
+      <%= image_tag variant.images.first.attachment.url(:small) %>
     <% end %>
   </td>
-  <td>
-    <%= hook :cart_item_description, locals do %>
-      <h4><%= link_to variant.product.name,  product_path(variant.product) %></h4>
-      <%= variant_options variant %>
-      <%= truncate(variant.product.description, :length => 100, :omission => "...") %>
+  <td data-hook="cart_item_description">
+    <h4><%= link_to variant.product.name, product_path(variant.product) %></h4>
+    <%= variant.options_text %>
+    <% if @order.insufficient_stock_lines.include? line_item %>
+      <span class="out-of-stock">
+        <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br />
+      </span>
     <% end %>
+    <%= truncate(variant.product.description, :length => 100, :omission => "...") %>
   </td>
-  <td>
-    <%= hook :cart_item_price, locals do %>
-      <%=  product_price(line_item) %>
-    <% end %>
+  <td data-hook="cart_item_price">
+    <%= product_price(line_item.variant) %>
   </td>
-  <td>
-    <%= hook :cart_item_quantity, locals do %>
-      <%= item_form.text_field :quantity, :size => 3, :class => "line_item_quantity" %>
-    <% end %>
+  <td data-hook="cart_item_quantity">
+    <%= item_form.text_field :quantity, :size => 3, :class => "line_item_quantity" %>
   </td>
-
-  <td>
-    <%= hook :cart_item_total, locals do %>
-      <%= format_price(product_price(line_item, :format_as_currency => false) * line_item.quantity) unless line_item.quantity.nil? %>
-    <% end %>
+  <td data-hook="cart_item_total">
+    <%= format_price(product_price(line_item.variant, :format_as_currency => false) * line_item.quantity) unless line_item.quantity.nil? %>
   </td>
-  <td>
-    <%= hook :cart_item_delete, locals do %>
-      <%= link_to(image_tag('/images/admin/icons/delete.png'), '#', :class => 'delete') %>
-    <% end %>
+  <td data-hook="cart_item_delete">
+    <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>
   </td>
-
 </tr>

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

@@ -1,41 +1,43 @@
 <% @body_id = 'cart' %>
 
-<h1><%= t("shopping_cart")%></h1>
+<h1><%= t(:shopping_cart) %></h1>
 
 <% if @order.line_items.empty? %>
 
-  <%= hook :empty_cart do %>
-    <p><%= t("your_cart_is_empty.") %></p>
-    <p><%=link_to t("continue_shopping"), products_path, :class => 'button continue' %></p>
-  <% end %>
+  <div data-hook="empty_cart">
+    <p><%= t(:your_cart_is_empty) %></p>
+    <p><%= link_to t(:continue_shopping), products_path, :class => 'button continue' %></p>
+  </div>
 
 <% else %>
-  <%= hook :outside_cart_form do %>
-    <%= form_for(@order, :url => update_cart_path, :html=>{:id=>'updatecart'}) do |order_form| %>
-      <%= hook :inside_cart_form do %>
+  <div data-hook="outside_cart_form">
+    <%= form_for @order, :url => update_cart_path, :html => {:id => 'update-cart'} do |order_form| %>
+      <div data-hook="inside_cart_form">
 
-        <%= hook :cart_items do %>
+        <div data-hook="cart_items">
           <%= render :partial => 'form', :locals => {:order_form => order_form} %>
-        <% end %>
+        </div>
 
-        <div id="subtotal">
-          <h3><%= "#{t("subtotal")}: #{order_price(@order)}" %></h3>
-          <div class="links">
-            <%= link_to image_tag('/images/update.png') + t("update"), '#', :class => 'button checkout primary', :onclick => "$('form#updatecart').submit(); return false;" %>
-            <%= link_to image_tag('/images/checkout.png') + t("checkout"), checkout_path, :class => 'button checkout primary' %>
+        <div id="subtotal" data-hook>
+          <h3><%= "#{t(:subtotal)}: #{order_price(@order)}" %></h3>
+          <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>
         </div>
 
-        <p><%=link_to t("continue_shopping"), products_path, :class => 'button continue' %></p>
-
-      <% end %>
+      </div>
     <% end %>
-  <% end %>
-  
+  </div>
+  <div id="empty-cart" data-hook>
   <%= form_tag empty_cart_path, :method => :put do %>
-    <p id="clear_cart_link">
-      <input type="submit" value="<%= t('empty_cart') %>" class="button" />
+    <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' %>
     </p>
   <% end %>
-
+  </div>
 <% end %>

data/app/views/orders/new.html.erb

@@ -1,9 +1,9 @@
 <% @body_id = 'cart' %>
 
-<h1><%= t("shopping_cart")%></h1>
+<h1><%= t(:shopping_cart) %></h1>
 
-<%= form_for(@order, :url =>'#', :html => { :method => :put}) do |order_form| %>
+<%= form_for @order, :url =>'#', :html => {:method => :put} do |order_form| %>
   <%= render :partial => 'form', :locals => {:order_form => order_form} %>
 <% end %>
 
-<p><%=link_to t("continue_shopping"), products_path %></p>
+<p><%= link_to t(:continue_shopping), products_path %></p>

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

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