spree_core 0.60.6 → 0.70.RC1

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

@@ -4,38 +4,40 @@
 
 <% if @order.line_items.empty? %>
 
-  <%= hook :empty_cart do %>
+  <div data-hook="empty_cart">
     <p><%= t("your_cart_is_empty.") %></p>
     <p><%=link_to t("continue_shopping"), products_path, :class => 'button continue' %></p>
-  <% end %>
+  </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">
+        <div id="subtotal" data-hook>
           <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 class="links" data-hook="cart_buttons">
+            <button type="submit" class="large primary" id="update-button">
+              <%= image_tag('icons/update.png') + t('update') %>
+            </button>
+            <%= 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">
+    <p id="clear_cart_link" data-hook>
       <input type="submit" value="<%= t('empty_cart') %>" class="button" />
+      <%= t(:or) %>
+      <%=link_to t("continue_shopping"), products_path, :class => 'continue' %>
     </p>
   <% end %>
-
+  </div>
 <% end %>

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

@@ -1,11 +1,11 @@
 <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>
   <% end %>
   <%= render :partial => 'shared/order_details', :locals => {:order => @order} %>
-  <p>
+  <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%>

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

@@ -1,54 +1,49 @@
 <%= form_for :order, :url => populate_orders_url do |f| %>
-<%= hook :inside_product_cart_form do %>
+  <div data-hook="inside_product_cart_form">
 
-  <% if product_price(@product) %>
-    <%= hook :product_price do %>
-      <p class="prices">
-        <%= t("price") %>
-        <br />
-        <span class="price selling"><%= product_price(@product) %></span>
-      </p>
+    <% if @product.price %>
+      <div data-hook="product_price">
+        <dl id="product-price">
+          <dt><%= t("price") %></dt>
+          <dd><span class="price selling"><%= product_price(@product) %></span></dd>
+        </dl>
+      </div>
     <% end %>
-  <% end %>
 
-  <% if @product.has_variants? %>
-    <div id="product-variants">
-      <h2><%= t('variants') %></h2>
-      <ul>
-        <%  has_checked = false
-        @product.variants.active.each_with_index do |v,index|
-          next if v.option_values.empty? || (!v.in_stock && !Spree::Config[:show_zero_stock_products])
-          checked = !has_checked && (v.in_stock || Spree::Config[:allow_backorders])
-          has_checked = true if checked %>
-          <li>
-            <label>
+    <% if @product.has_variants? %>
+      <div id="product-variants">
+        <h2><%= t('variants') %></h2>
+        <ul>
+          <%  has_checked = false
+          @product.variants.active.each_with_index do |v,index|
+            next if v.option_values.empty? || (!v.in_stock && !Spree::Config[:show_zero_stock_products])
+            checked = !has_checked && (v.in_stock || Spree::Config[:allow_backorders])
+            has_checked = true if checked %>
+            <li>
               <%= radio_button_tag "products[#{@product.id}]", v.id, checked, :disabled => !v.in_stock && !Spree::Config[:allow_backorders] %>
-              <span class="variant-description">
-                <%= variant_options v %>
-              </span>
-              <% if variant_price_diff v %>
-                <span class="price diff"><%= variant_price_diff v %></span>
-              <% end %>
-            </label>
-          </li>
-        <% end%>
-      </ul>
-    </div>
-  <% end%>
-  <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
-    <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
-      1, :class => "title", :size => 3 %>
-    &nbsp;
-    <button type='submit' class='large primary'>
-      <%= image_tag('/images/add-to-cart.png') + t('add_to_cart') %>
-    </button>
-  <% else %>
-    <%= content_tag('strong', t('out_of_stock')) %>
-  <% end %>
-
-<% end %>
-<% end %>
+              <label for="<%= ['products', @product.id, v.id].join('_') %>">
+                <span class="variant-description">
+                  <%= variant_options v %>
+                </span>
+                <% if variant_price_diff v %>
+                  <span class="price diff"><%= variant_price_diff v %></span>
+                <% end %>
+              </label>
+            </li>
+          <% end%>
+        </ul>
+      </div>
+    <% end%>
+    <% if @product.has_stock? || Spree::Config[:allow_backorders] %>
+      <%= text_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
+        1, :class => "title", :size => 3 %>
+      &nbsp;
+      <button type="submit" class="large primary" id="add-to-cart-button">
+        <%= image_tag('icons/add-to-cart.png') + t('add_to_cart') %>
+      </button>
+    <% else %>
+      <%= content_tag('strong', t('out_of_stock')) %>
+    <% end %>
 
-<% content_for :head do %>
-  <%= javascript_include_tag 'product' %>
+  </div>
 <% end %>

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

@@ -1,8 +1,9 @@
 <% unless @product_properties.empty? %>
-<dl id="product-properties" class="table-display">
-<% for product_property in @product_properties %>
-  <dt><%= product_property.property.presentation %></dt>
-  <dd><%= product_property.value %></dd>
+<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>
 <% end %>

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

@@ -1,16 +1,14 @@
 <% if !@product.taxons.blank? %>
-<div id="taxon-crumbs">
-  <h3><%= t('look_for_similar_items') %></h3>
+  <div id="taxon-crumbs" data-hook>
+    <h3><%= t('look_for_similar_items') %></h3>
 
-  <%= hook :product_taxons do %>
-  <div>
-    <ul id='similar_items_by_taxon'>
-    <% @product.taxons.each do |taxon| %>
-      <li><%= link_to taxon.name, "/t/#{taxon.permalink}" %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
+    <div data-hook="product_taxons">
+      <ul id="similar_items_by_taxon" data-hook>
+      <% @product.taxons.each do |taxon| %>
+        <li><%= link_to taxon.name, seo_url(taxon) %></li>
+      <% end %>
+      </ul>
+    </div>
 
-</div>
+  </div>
 <% end %>

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

@@ -1,40 +1,19 @@
 <!-- no need for thumnails unless there is more then one image -->
 <% if product.images.size > 1 %>
-  <ul id="product-thumbnails" class="thumbnails">
-    <% product.images.each do |i| %>  
-      <li><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>
+  <ul id="product-thumbnails" class="thumbnails" 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 %>
+    <% if @product.has_variants?
+      @variants.each do |v|
+        if v.available?
+          v.images.each do |i| %>
+            <li class="vtmb-<%= v.id.to_s %> vtmb" id="tmb-<%= i.id.to_s %>"><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>
+          <%
+          end
+        end
+      end
+    end
+    %>
   </ul>
 <% end %>
-
-<% if @product.has_variants?
-  has_checked = false %>
-  <h4 id="variant-images">
-    <%= t('images_for') %>:
-    <span><%= @selected_variant.options_text %></span>
-  </h4>
-  <ul id="variant-thumbnails" class="thumbnails">
-    <% @variants.each do |v|
-        checked = !has_checked && (v.available?)
-        has_checked = true if checked
-        
-        if checked 
-          v.images.each do |i| %>  
-            <li><%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %></li>
-          <% end %>
-        <% end %>
-      <% end %>
-    </ul>
-<% end %>
-
-<% content_for :head do %>
-  <script type="text/javascript" charset="utf-8">
-    var images = new Array();
-    <% @variants.each do |v| %>
-      images[<%= v.id.to_s %>] = new Array();
-      <% v.images.each_with_index do |image, i| %>
-        images[<%= v.id.to_s %>][<%= i %>] = <%== link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:product)).to_json %>;
-      <% end %>
-    <% end %>
-  </script>
-<% end %>

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

@@ -1,30 +1,27 @@
 <% content_for :sidebar do %>
-  <%= hook :homepage_sidebar_navigation do %>
+  <div data-hook="homepage_sidebar_navigation">
     <% if "products" == @current_controller && @taxon %>
       <%= render "shared/filters" %>
     <% else %>
       <%= render "shared/taxonomies" %>
     <% end %>
-  <% end %>
+  </div>
 <% end %>
 
 
 <% if params[:keywords] %>
 
-  <%= hook :search_results do %>
+  <div data-hook="search_results">
     <% if @products.empty? %>
       <%= t(:no_products_found) %>
     <% else %>
       <%= render "shared/products", :products => @products, :taxon => @taxon %>
     <% end %>
-  <% end %>
+  </div>
 
 <% else %>
 
-  <%= hook :homepage_products do %>
+  <div data-hook="homepage_products">
     <%= render "shared/products", :products => @products, :taxon => @taxon %>
-  <% end %>
-
-
+  </div>
 <% end %>
-

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

@@ -1,31 +1,26 @@
-<% @body_id = 'product-details' %>
-<h1><%= accurate_title %></h1>
+<div data-hook="product_show">
+  <% @body_id = 'product-details' %>
+  <h1><%= accurate_title %></h1>
 
-<div id="product-images">
-  <%= hook :product_images do %>
-  <div id="main-image">
-    <%= render 'image' %>
+  <div id="product-images" data-hook="product_images">
+    <div id="main-image" data-hook>
+      <%= render 'image' %>
+    </div>
+    <div id="thumbnails" data-hook>
+      <%= render 'thumbnails', :product => @product %>
+    </div>
   </div>
-  <div id="thumbnails">
-    <%= render 'thumbnails', :product => @product %>
+
+  <div id="cart-form" data-hook="cart_form">
+    <%= render 'cart_form' %>
   </div>
-  <% end %>
-</div>
 
-<div id="product-description">
-  <%= hook :product_description do %>
+  <div id="product-description" data-hook="product_description">
     <%= product_description(@product) rescue t("product_has_no_description") %>
-  <% end %>
-  <%= hook :product_properties do %>
-    <%= render 'properties' %>
-  <% end %>
-</div>
-
-<%= hook :cart_form do %>
-  <div id="cart-form">
-    <%= render 'cart_form' %>
+    <div data-hook="product_properties">
+      <%= render 'properties' %>
+    </div>
   </div>
-<% end %>
+</div>
 
 <%= render 'taxons' %>
-

data/app/views/shared/_error_messages.html.erb

@@ -1,5 +1,5 @@
 <% if target && target.errors.any? %>
-  <div id="errorExplanation" class="errorExplanation">
+  <div id="errorExplanation" class="errorExplanation" data-hook>
     <h2><%= t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
     <p><%= t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>

data/app/views/shared/_filters.html.erb

@@ -6,7 +6,7 @@
   <% filters.each do |filter| %>
     <% labels = filter[:labels] || filter[:conds].map {|m,c| [m,m]} %>
     <% next if labels.empty? %>
-    <div class="navigation">
+    <div class="navigation" data-hook="navigation">
       <span class="category"> <%= filter[:name] %> </span>
       <ul style="list-style-type:none; padding-left: 0px;" class="filter_choices">
         <% labels.each do |nm,val| %>

data/app/views/shared/_head.html.erb

@@ -1,10 +1,7 @@
 <title><%= title %></title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <%== meta_data_tags %>
-<%== stylesheet_tags %>
-<%= csrf_meta_tag %>
-<%= javascript_include_tag 'jquery-1.4.2.min', 'jquery.validate.min.js', 'rails', 'application', :cache => 'jquery-core' %>
-<% unless I18n.locale.to_s[0..1] == 'en' %>
-  <%= javascript_include_tag ['localization/messages_', I18n.locale.to_s[0..1], '.js'].join %>
-<% end %>
+<%= stylesheet_link_tag "store/all", :media => "screen" %>
+<%= csrf_meta_tags %>
+<%= javascript_include_tag "store/all" %>
 <%= yield :head %>

data/app/views/shared/_nav_bar.html.erb

@@ -1,5 +1,6 @@
-<li><%= render 'shared/search' %></li>
-  <%= hook :shared_login_bar %>
+<li id="search-bar" data-hook>
+  <%= render 'shared/search' %>
+</li>
 <% if store_menu? %>
   <%= render 'shared/store_menu' %>
 <% end %>

data/app/views/shared/_order_details.html.erb

@@ -1,50 +1,40 @@
-<table class="index">
-  <tbody id='line-items'>
-    <tr>
-      <%= hook :order_details_line_items_headers do %>
-        <th><%= t('item_description') %></th>
-        <th class="price"><%= t('price') %></th>
-        <th class="qty"><%= t('qty') %></th>
-        <th class="total"><span><%= t('total') %></span></th>
-      <% end %>
+<table class="index" data-hook="order_details">
+  <tbody id='line-items' data-hook>
+    <tr data-hook="order_details_line_items_headers">
+      <th><%= t('item_description') %></th>
+      <th class="price"><%= t('price') %></th>
+      <th class="qty"><%= t('qty') %></th>
+      <th class="total"><span><%= t('total') %></span></th>
     </tr>
 
     <% @order.line_items.each do |item| %>
-      <tr>
-        <%- locals = {:item => item} %>
-        <%= hook :order_details_line_item_row, locals do %>
-          <td width="300"><%=item.variant.product.name%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
-          <td class="price"><%= number_to_currency item.price %></td>
-          <td class="qty"><%=item.quantity%></td>
-          <td class="total"><span><%= number_to_currency (item.price * item.quantity)%></span></td>
-        <% end %>
+      <tr data-hook="order_details_line_item_row">
+        <td width="300"><%=item.variant.product.name%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td class="price"><%= number_to_currency item.price %></td>
+        <td class="qty"><%=item.quantity%></td>
+        <td class="total"><span><%= number_to_currency (item.price * item.quantity)%></span></td>
       </tr>
     <% end %>
   </tbody>
-  <%= hook :order_details_subtotal do %>
-    <tbody id='subtotal'>
-      <tr class="total" id="subtotal-row">
-        <td colspan="3"><b><%= t('subtotal') %>:</b></td>
-        <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
-      </tr>
-    </tbody>
-  <% end %>
-  <%= hook :order_details_adjustments do %>
-    <tbody id="order-charges">
-      <% @order.adjustments.each do |adjustment| %>
-        <tr class="total">
-          <td colspan="3"><strong><%= adjustment.label %></strong></td>
-          <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
-        </tr>
-      <% end %>
-    </tbody>
-  <% end %>
-  <%= hook :order_details_total do %>
-    <tbody id='order-total'>
+  <tbody id='subtotal' data-hook="order_details_subtotal">
+    <tr class="total" id="subtotal-row">
+      <td colspan="3"><b><%= t('subtotal') %>:</b></td>
+      <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
+    </tr>
+  </tbody>
+  <tbody id="order-charges" data-hook="order_details_adjustments">
+    <% @order.adjustments.eligible.each do |adjustment| %>
+    <% next if (adjustment.originator_type == "TaxRate") and (adjustment.amount == 0) %>
       <tr class="total">
-        <td colspan="3"><b><%= t('order_total') %>:</b></td>
-        <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+        <td colspan="3"><strong><%= adjustment.label %></strong></td>
+        <td class="total"><span><%= number_to_currency adjustment.amount %></span></td>
       </tr>
-    </tbody>
-  <% end %>
+    <% end %>
+  </tbody>
+  <tbody id='order-total' data-hook="order_details_total">
+    <tr class="total">
+      <td colspan="3"><b><%= t('order_total') %>:</b></td>
+      <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
+    </tr>
+  </tbody>
 </table>