spree_core 0.40.4 → 0.50.0

data/app/views/admin/users/show.html.erb

@@ -1,4 +1,4 @@
-<h1><%= t("user_account") %></h1>        
+<h1><%= t("user_account") %></h1>
 
 <table>
   <tr>
@@ -6,7 +6,7 @@
     <td>
       <%= @user.email %>
     </td>
-  </tr>  
+  </tr>
   <tr>
     <th><%= t("roles") %></th>
     <td>
@@ -16,6 +16,6 @@
 </table>
 
 <p>
-  <%= link_to_edit @user %> <%= t('or') %>
+  <%= link_to_edit @user, :class => 'edit_user' %> <%= t('or') %>
   <%= link_to t('back'), collection_url %>
 </p>

data/app/views/admin/variants/index.html.erb

@@ -2,7 +2,7 @@
 
 <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"} %>
 
-<table class="index">
+<table class="index sortable">
   <tr>
     <th><%= t("options") %></th>
     <th><%= t("price") %></th>
@@ -17,7 +17,7 @@
     <!-- you can skip variant with no options: that's just the default variant that all products have -->
     <% next if variant.option_values.empty? %>
     <tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' if variant.deleted? %>>
-      <td><%= variant_options variant %></td>
+      <td><span class="handle"></span> <%= variant_options variant %></td>
       <td><%= variant.price %></td>
       <td><%= variant.sku %></td>
       <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
@@ -37,15 +37,30 @@
 </table>
 
 <% if @product.options.empty? %>
-  <p>
-    <%= t("to_add_variants_you_must_first_define") %>  <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
+
+  <p class='first_add_option_types'>
+    <%= t("to_add_variants_you_must_first_define") %>
+    <%= link_to t("option_types"), selected_admin_product_option_types_url(@product) %>
   </p>
+
 <% else %>
+
   <div id="new_variant"></div>
+
   <br/>
+
   <p id="new_var_link">
-      <%= link_to icon('add') + ' ' + t("new_variant"), new_admin_product_variant_url(@product), :remote => :true, 'data-update' => 'new_variant', :class => 'iconlink' %>
-    &nbsp;|&nbsp;<%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"), admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
+
+    <%= link_to icon('add') + ' ' + t("new_variant"), new_admin_product_variant_url(@product),
+                                                      :remote => :true,
+                                                      'data-update' => 'new_variant',
+                                                      :class => 'iconlink new' %>
+
+    &nbsp;|&nbsp;
+
+    <%= link_to @deleted.blank? ? t("show_deleted") : t("show_active"),
+                            admin_product_variants_url(@product, :deleted =>  @deleted.blank? ? "on" : "off") %>
   </p>
+
   <%= image_tag "spinner.gif", :plugin=>"spree", :style => "display:none", :id => 'busy_indicator' %>
 <% end %>

data/app/views/admin/zones/_form.html.erb

@@ -1,29 +1,29 @@
-<% zone_form.field_container :name do %>
+<%= zone_form.field_container :name do %>
   <%= zone_form.label :name, t("name") %><br />
   <%=zone_form.text_field :name %>
 <% end %>
 
-<% zone_form.field_container :description do %>
+<%= zone_form.field_container :description do %>
   <%= zone_form.label :description, t("description") %><br />
   <%=zone_form.text_field :description %>
 <% end %>
 
 <p>
-  <label><%= t("type") %></label><br />  
+  <label><%= t("type") %></label><br />
   <label class="sub">
     <%= zone_form.radio_button("kind", "country", {:id => "country_based"}) %>
     <%= t("country_based") %>
-  </label> &nbsp; 
+  </label> &nbsp;
   <label class="sub">
     <%= zone_form.radio_button("kind", "state", {:id => "state_based"}) %>
     <%= t("state_based") %>
-  </label> &nbsp; 
-  <label class="sub">                                         
+  </label> &nbsp;
+  <label class="sub">
     <%= zone_form.radio_button("kind", "zone", {:id => "zone_based"}) %>
     <%= t("zone_based") %>
   </label>
 </p>
 
-<%= render "member_type", :type => "country", :zone_form => zone_form %> 
-<%= render "member_type", :type => "state", :zone_form => zone_form %>        
-<%= render "member_type", :type => "zone", :zone_form => zone_form %>
+<%= render "member_type", :type => "country", :zone_form => zone_form %>
+<%= render "member_type", :type => "state", :zone_form => zone_form %>
+<%= render "member_type", :type => "zone", :zone_form => zone_form %>

data/app/views/admin/zones/_member_type.html.erb

@@ -4,12 +4,12 @@
   <fieldset id="">
     <legend><%= t(type) %></legend>
     <ul id="ul-nested-<%= type %>" class="member-list">
-      <% zone_form.fields_for :zone_members do |member_form| %>
+      <%= zone_form.fields_for :zone_members do |member_form| %>
         <%= render "#{type}_member", :f => member_form %>
       <% end %>
     </ul>
-  </fieldset>  
-  <p>
-    <%= button_link_to t("add_#{type}"), "##{type}_member", {:icon => 'add', :id => "nested-#{type}"} %>
-  </p>      
+    <p>
+      <%= button_link_to t("add_#{type}"), "##{type}_member", {:icon => 'add', :id => "nested-#{type}"} %>
+    </p>
+  </fieldset>
 </div>

data/app/views/admin/zones/index.html.erb

@@ -3,7 +3,7 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <%= button_link_to t("new_zone"), new_object_url, :icon => 'add' %></p>
+      <%= button_link_to t("new_zone"), new_object_url, :icon => 'add', :id => 'admin_new_zone_link' %>
     </li>
   </ul>
   <br class='clear' />
@@ -11,11 +11,13 @@
 
 
 <h1><%= t("zones") %></h1>
-<table class="index">
+<table class="index" id='listing_zones'>
   <thead>
     <tr>
-      <th><%= order @search, :by => :name,        :as => t("name") %></th>
-      <th><%= order @search, :by => :description, :as => t("description") %></th>
+      <th><%= sort_link @search,:name, t("name"), :title => 'zones_order_by_name_title' %></th>
+      <th>
+        <%= sort_link @search,:description, t("description"), {}, {:title => 'zones_order_by_description_title'} %>
+      </th>
       <th></th>
     </tr>
   </thead>
@@ -25,7 +27,7 @@
         <td><%=zone.name %></td>
         <td><%=zone.description %></td>
         <td class="actions">
-          <%=link_to_edit zone %> &nbsp; 
+          <%=link_to_edit zone %> &nbsp;
           <%=link_to_delete zone %>
         </td>
       </tr>

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

@@ -61,7 +61,7 @@ div.inner input[type=text], div.inner select { width: 80%; }
       </p>
       <p id="bcountry" class="field">
         <%= bill_form.label :country_id, t(:country) %>
-        <span id="bcountry"><%= bill_form.collection_select :country_id, Country.all, :id, :name, {}, {:class => 'required'} %></span>
+        <span id="bcountry"><%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
         <span class="req">*</span>
       </p>
       <p id="bphone" class="field">
@@ -140,7 +140,7 @@ div.inner input[type=text], div.inner select { width: 80%; }
       </p>
       <p id="scountry" class="field">
         <%= ship_form.label :country_id, t(:country) %>
-        <span id="scountry"><%= ship_form.collection_select :country_id, Country.all, :id, :name, {}, {:class => 'required'} %></span>
+        <span id="scountry"><%= ship_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %></span>
         <span class="req">*</span>
       </p>
       <p id="sphone" class="field">

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

@@ -4,7 +4,7 @@
     <% @order.available_payment_methods.each do |method| %>
     <p>
       <label>
-        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.payment_method %> 
+        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.payment_method %>
         <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
       </label>
     </p>
@@ -17,13 +17,10 @@
             <%= render "checkout/payment/#{method.method_type}", :payment_method => method %>
           </fieldset>
         </li>
-      <% end %>  
+      <% end %>
     </ul>
     <br style='clear:both;' />
-    <p>
-      <label><%= t(:coupon_code) %></label><br />
-      <%= form.text_field :coupon_code, :size => 19 %>
-    </p>
+    <%= hook :coupon_code_field, {:form => form} %>
   <% end %>
 </fieldset>
 

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

@@ -13,14 +13,9 @@
 <div id='wrapper'>
 
   <div id="header">
-    <% if current_user %>
-    <ul id="login-nav">
-      <li><%= t('logged_in_as') %>: <%= current_user.email %></li>
-      <li><%= link_to t('account'), edit_user_path(current_user) %></li>
-      <li><%= link_to t('logout'), destroy_user_session_path %></li>
-      <li><%= link_to t('store'), products_path %></li>
-    </ul>
-    <% end %>
+
+    <%= hook :admin_login_navigation_bar %>
+
     <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>
@@ -50,7 +45,6 @@
     <div class="flash notice"><%= self.notice %></div>
     <% end %>
 
-    <%= render :partial => 'admin/shared/alert', :collection => session[:alerts] %>
 
     <%= yield %>
 

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

@@ -1,4 +1,5 @@
-<%= render :partial => 'shared/doc_and_xmlns'%>
+<!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'%>

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

@@ -34,7 +34,7 @@
   </td>
   <td>
     <%= hook :cart_item_delete, locals do %>
-      <%= link_to(image_tag('/images/admin/icons/delete.png'), '#', :class => 'delete', :style => 'display:none') %>
+      <%= link_to(image_tag('/images/admin/icons/delete.png'), '#', :class => 'delete') %>
     <% end %>
   </td>
 

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

@@ -10,27 +10,28 @@
   <% end %>
 
 <% else %>
+  <%= hook :outside_cart_form do %>
+    <%= form_for(@order, :url => update_cart_path, :html=>{:id=>'updatecart'}) do |order_form| %>
+      <%= hook :inside_cart_form do %>
 
-  <%= form_for(@order, :url => update_cart_path, :html=>{:id=>'updatecart'}) do |order_form| %>
-  <%= hook :inside_cart_form do %>
+        <%= hook :cart_items do %>
+          <%= render :partial => 'form', :locals => {:order_form => order_form} %>
+        <% end %>
 
-    <%= hook :cart_items do %>
-      <%= render :partial => 'form', :locals => {:order_form => order_form} %>
-    <% end %>
-
-    <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>
-    </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>
+        </div>
 
-    <p><%=link_to t("continue_shopping"), products_path, :class => 'button continue' %></p>
+        <p><%=link_to t("continue_shopping"), products_path, :class => 'button continue' %></p>
 
+      <% end %>
+    <% end %>
   <% end %>
-  <% end %>
-
+  
   <%= form_tag empty_cart_path, :method => :put do %>
     <p id="clear_cart_link">
       <input type="submit" value="<%= t('empty_cart') %>" class="button" />

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

@@ -5,7 +5,7 @@
   	<br/><br/>
   	<h3><%= t('thank_you_for_your_order') %></h3>         
   <% else %>
-  	| <%= link_to t('my_account'), user_path(current_user) if current_user%>
+  	| <%= link_to t('my_account'), account_path if current_user%>
   <% end %>
   <br/><br/>
 

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

@@ -15,7 +15,7 @@
   %>
 <% end %>
 
-<%= stylesheet_link_tag 'admin/admin-reset', 'admin/grids', 'admin/admin-typography', 'admin/admin-forms', 'admin/admin-tables', 'admin/admin', 'admin/autocomplete', 'admin/token-input', :cache => 'admin-all' %>
+<%= stylesheet_link_tag 'admin/admin-reset', 'admin/grids', 'admin/admin-typography', 'admin/admin-forms', 'admin/admin-tables', 'admin/admin', 'admin/autocomplete', 'admin/token-input', :cache => 'admin/admin-all' %>
 <%= javascript_include_tag 'jquery-1.4.2.min.js', 'rails', 'jquery-ui', 'jquery.suggest', 'jquery.tokeninput.js', 'jquery.delayedobserver.js', :cache => 'jquery-admin-plugins' %>
 <%= javascript_include_tag('jquery.template') unless controller.controller_name == "overview" %>
 <%= javascript_include_tag 'admin', 'nested-attribute', 'zone', 'calculator', 'gateway' %>

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

@@ -1,7 +1,7 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation">
-    <h2><%= pluralize(target.errors.count, "error") %> prohibited this record from being saved:</h2>
-    <p>There were problems with the following fields:</p>
+    <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>
      <% target.errors.full_messages.each do |msg| %>
        <li><%= msg %></li>

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

@@ -1,4 +1,4 @@
-<%= form_tag '', :method => :get do  %>
+<%= form_tag '', :method => :get, :id => 'sidebar_products_search' do  %>
   <% params[:search] ||= {} %>
   <input type="hidden" name="per_page" value="<%= params[:per_page] %>"/>
 
@@ -12,9 +12,9 @@
         <% labels.each do |nm,val| %>
           <% label = "#{filter[:name]}_#{nm}".gsub(/\s+/,'_') %>
           <li class="nowrap">
-            <input type="checkbox" 
-                   id="<%= label %>" 
-                   name="search[<%= filter[:scope].to_s %>][]" 
+            <input type="checkbox"
+                   id="<%= label %>"
+                   name="search[<%= filter[:scope].to_s %>][]"
                    value="<%= val %>"
                    <%= params[:search][filter[:scope]] && params[:search][filter[:scope]].include?(val.to_s) ? "checked" : "" %> />
             <label class="nowrap" for="<%= label %>"> <%= nm %> </label>

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

@@ -1,10 +1,10 @@
 <title><%= title %></title>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<%= raw stylesheet_tags %>
+<%== 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 %>
 <%= yield :head %>
-<%= raw meta_data_tags %>

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

@@ -1,5 +1,5 @@
 <li><%= render 'shared/search' %></li>
-<%= render 'shared/login_bar' %>
+  <%= hook :shared_login_bar %>
 <% if store_menu? %>
   <%= render 'shared/store_menu' %>
-<% end %>
+<% end %>

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

@@ -13,8 +13,10 @@
   <% products.each do |product| %>
     <% if Spree::Config[:show_zero_stock_products] || product.has_stock? %>
       <li id="product_<%= product.id %>">
-        <%= link_to small_image(product), product %>
-        <%= link_to raw(product.name + " <span class='price selling'>#{product_price(product)}</span>"), product, :class => 'info' %>
+        <%= hook :products_list_item, {:product => product} do %>
+          <%= link_to small_image(product), product %>
+          <%= link_to raw(product.name + " <span class='price selling'>#{product_price(product)}</span>"), product, :class => 'info' %>
+        <% end %>
       </li>
     <% end %>
   <% end %>

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

@@ -1,10 +1,17 @@
 <div id="taxonomies" class="sidebar-item">
-<% get_taxonomies.each do |taxonomy| %>
-  <ul class="navigation-list">
-	  <li<%= ' class="current"' if @taxon && @taxon == taxonomy.root %>><%= link_to t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize), seo_url(taxonomy.root), :class => 'root' %></li>
-	  <% taxonomy.root.children.each do |taxon| %>
-	    <li<%= ' class="current"' if @taxon and ([@taxon] + @taxon.ancestors).include?(taxon) %>><%= link_to taxon.name, seo_url(taxon) %></li>
-	  <% end %>
-	</ul>
-<% end %>
+  <% get_taxonomies.each do |taxonomy| %>
+    <ul class="navigation-list">
+      <li<%== ' class="current"' if @taxon && @taxon == taxonomy.root %>>
+        <%= link_to t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize), seo_url(taxonomy.root),
+                                          :class => 'root' %>
+      </li>
+
+      <% taxonomy.root.children.each do |taxon| %>
+        <li<%== ' class="current"' if @taxon and ([@taxon] + @taxon.ancestors).include?(taxon) %>>
+          <%= link_to taxon.name, seo_url(taxon) %>
+        </li>
+	    <% end %>
+
+	  </ul>
+  <% end %>
 </div>

data/app/views/shipment_mailer/shipped_email.text.erb

@@ -6,10 +6,10 @@ Your order has been shipped
 Shipment Summary
 ============================================================
 <% for item in @shipment.line_items %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>) %>
+<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>)
 <% end %>
 ============================================================
 
 <%= "Tracking Information: #{@shipment.tracking}" if @shipment.tracking %>
 
-Thank you for your business.
+Thank you for your business.

data/config/cucumber.yml

@@ -0,0 +1,10 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+ci_opts = "--format progress --strict"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+ci: <%= ci_opts %> features CI=true
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip