spree_core 0.70.0.rc2 → 0.70.0

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

@@ -1,8 +1,8 @@
-<%= render "shared/error_messages", :target => @variant %>
+<%= render 'shared/error_messages', :target => @variant %>
 
-<%= form_for([:admin, @product, @variant]) do |f| %>
+<%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset data-hook="admin_variant_new_form">
-    <%= render :partial => "form", :locals => { :f => f } %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/admin/variants/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_variant").html('<%= escape_javascript(render :template => "admin/variants/new.html.erb") %>');
+$("#new_variant").html('<%= escape_javascript(render :template => 'admin/variants/new.html.erb') %>');
 $("#new_var_link").hide();

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

@@ -1,5 +1,5 @@
 <li data-hook="country_member">
-  <%= f.hidden_field :zoneable_type, :value => "Country" %>
+  <%= f.hidden_field :zoneable_type, :value => 'Country' %>
   <%= f.collection_select(:zoneable_id, @countries, :id, :name, :include_blank => true) %>
   <%= remove_nested f %>
 </li>

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

@@ -1,29 +1,29 @@
 <%= zone_form.field_container :name do %>
-  <%= zone_form.label :name, t("name") %><br />
-  <%=zone_form.text_field :name %>
+  <%= zone_form.label :name, t(:name) %><br />
+  <%= zone_form.text_field :name %>
 <% end %>
 
 <%= zone_form.field_container :description do %>
-  <%= zone_form.label :description, t("description") %><br />
-  <%=zone_form.text_field :description %>
+  <%= zone_form.label :description, t(:description) %><br />
+  <%= zone_form.text_field :description %>
 <% end %>
 
 <p data-hook="type">
-  <label><%= t("type") %></label><br />
+  <%= label_tag nil, t(:type) %><br />
   <label class="sub">
-    <%= zone_form.radio_button("kind", "country", {:id => "country_based"}) %>
-    <%= t("country_based") %>
+    <%= zone_form.radio_button('kind', 'country', {:id => 'country_based'}) %>
+    <%= t(:country_based) %>
   </label> &nbsp;
   <label class="sub">
-    <%= zone_form.radio_button("kind", "state", {:id => "state_based"}) %>
-    <%= t("state_based") %>
+    <%= zone_form.radio_button('kind', 'state', {:id => 'state_based'}) %>
+    <%= t(:state_based) %>
   </label> &nbsp;
   <label class="sub">
-    <%= zone_form.radio_button("kind", "zone", {:id => "zone_based"}) %>
-    <%= t("zone_based") %>
+    <%= 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/_state_member.html.erb

@@ -1,5 +1,5 @@
 <li data-hook="state_member">
-  <%= f.hidden_field :zoneable_type, :value => "State" %>
+  <%= f.hidden_field :zoneable_type, :value => 'State' %>
   <%= f.collection_select(:zoneable_id, @states, :id, :name, :include_blank => true) %>
   <%= remove_nested f %>
 </li>

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

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("editing_zone") %></h1>
+<h1><%= t(:editing_zone) %></h1>
 
-<%= render "shared/error_messages", :target => @zone %>
+<%= render 'shared/error_messages', :target => @zone %>
 
-<%= form_for([:admin, @zone]) do |zone_form| %>
-  <%= render :partial => "form", :locals => { :zone_form => zone_form } %>
-  <%= render :partial => "admin/shared/edit_resource_links" %>
+<%= form_for [:admin, @zone] do |zone_form| %>
+  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -3,20 +3,20 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_zone"), new_object_url, :icon => 'add', :id => 'admin_new_zone_link' %>
+      <%= button_link_to t(:new_zone), new_object_url, :icon => 'add', :id => 'admin_new_zone_link' %>
     </li>
   </ul>
-  <br class="clear">
+  <br class="clear" />
 </div>
 
 
-<h1><%= t("zones") %></h1>
+<h1><%= t(:zones) %></h1>
 <table class="index" id='listing_zones' data-hook>
   <thead>
     <tr data-hook="zones_header">
-      <th><%= sort_link @search,:name, t("name"), :title => 'zones_order_by_name_title' %></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'} %>
+        <%= sort_link @search,:description, t(:description), {}, {:title => 'zones_order_by_description_title'} %>
       </th>
       <th></th>
     </tr>

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

@@ -1,10 +1,10 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("new_zone") %></h1>
+<h1><%= t(:new_zone) %></h1>
 
-<%= render "shared/error_messages", :target => @zone %>
+<%= render 'shared/error_messages', :target => @zone %>
 
-<%= form_for([:admin, @zone]) do |zone_form| %>
-  <%= render "form", :zone_form => zone_form %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for [:admin, @zone] do |zone_form| %>
+  <%= render 'form', :zone_form => zone_form %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

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

@@ -3,30 +3,30 @@
     <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="req">*</span><br/>
+        <%= bill_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
         <%= bill_form.text_field :firstname, :class => 'required' %>
       </p>
       <p class="field" id="blastname">
-        <%= bill_form.label :lastname, t(:last_name) %><span class="req">*</span><br/>
+        <%= bill_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
         <%= bill_form.text_field :lastname, :class => 'required' %>
       </p>
       <p class="field" id="baddress1">
-        <%= bill_form.label :address1, t(:street_address) %><span class="req">*</span><br/>
+        <%= bill_form.label :address1, t(:street_address) %><span class="req">*</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.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="req">*</span><br/>
+        <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
         <%= bill_form.text_field :city, :class => 'required' %>
       </p>
 
       <% if Spree::Config[:address_requires_state] %>
         <p class="field" id="bstate">
           <% have_states = !@order.bill_address.country.states.empty? %>
-          <%= bill_form.label :state, t(:state) %><span class="req">*</span><br/>
+          <%= bill_form.label :state, t(:state) %><span class="req">*</span><br />
           <noscript>
             <%= bill_form.text_field :state_name, :class => 'required' %>
           </noscript>
@@ -34,21 +34,21 @@
              bill_form.collection_select(:state_id, @order.bill_address.country.states,
                                 :id, :name,
                                 {:include_blank => true},
-                                {:class => have_states ? "required" : "hidden",
+                                {:class => have_states ? 'required' : 'hidden',
                                 :disabled => !have_states}) +
              bill_form.text_field(:state_name,
-                                :class => !have_states ? "required" : "hidden",
+                                :class => !have_states ? 'required' : 'hidden',
                                 :disabled => have_states)
              ].join.gsub('"', "'").gsub("\n", "")
           %>
           <%= javascript_tag do -%>
             document.write("<%== state_elements %>");
-          <% end %>
+          <% end -%>
         </p>
       <% end %>
 
       <p class="field" id="bzipcode">
-        <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br/>
+        <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
         <%= bill_form.text_field :zipcode, :class => 'required' %>
       </p>
       <p class="field" id="bcountry">
@@ -58,12 +58,12 @@
         </span>
       </p>
       <p class="field" id="bphone">
-        <%= bill_form.label :phone, t(:phone) %><span class="req">*</span><br/>
+        <%= bill_form.label :phone, t(:phone) %><span class="req">*</span><br />
         <%= bill_form.text_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.label :alternative_phone, t(:alternative_phone) %><br />
           <%= bill_form.text_field :alternative_phone %>
         </p>
       <% end %>
@@ -76,34 +76,34 @@
     <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.eql?(@order.ship_address)) %> 
-      <label for="order_use_billing" id="use_billing"><%= t("use_billing_address") %></label>
+      <%= 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="req">*</span><br/>
+        <%= ship_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
         <%= ship_form.text_field :firstname, :class => 'required' %>
       </p>
       <p class="field" id="slastname">
-        <%= ship_form.label :lastname, t(:last_name) %><span class="req">*</span><br/>
+        <%= ship_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
         <%= ship_form.text_field :lastname, :class => 'required' %>
       </p>
       <p class="field" id="saddress1">
-        <%= ship_form.label :address1, t(:street_address) %><span class="req">*</span><br/>
+        <%= ship_form.label :address1, t(:street_address) %><span class="req">*</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.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="req">*</span><br/>
+        <%= ship_form.label :city, t(:city) %><span class="req">*</span><br />
         <%= ship_form.text_field :city, :class => 'required' %>
       </p>
 
       <% if Spree::Config[:address_requires_state] %>
         <p class="field" id="sstate">
           <% have_states = !@order.ship_address.country.states.empty? %>
-          <%= ship_form.label :state, t(:state) %><span class="req">*</span><br/>
+          <%= ship_form.label :state, t(:state) %><span class="req">*</span><br />
           <noscript>
             <%= ship_form.text_field :state_name, :class => 'required' %>
           </noscript>
@@ -111,10 +111,10 @@
              ship_form.collection_select(:state_id, @order.ship_address.country.states,
                                 :id, :name,
                                 {:include_blank => true},
-                                {:class => have_states ? "required" : "hidden",
+                                {:class => have_states ? 'required' : 'hidden',
                                 :disabled => !have_states}) +
              ship_form.text_field(:state_name,
-                                :class => !have_states ? "required" : "hidden",
+                                :class => !have_states ? 'required' : 'hidden',
                                 :disabled => have_states)
              ].join.gsub('"', "'").gsub("\n", "")
           %>
@@ -125,7 +125,7 @@
       <% end %>
 
       <p class="field" id="szipcode">
-        <%= ship_form.label :zipcode, t(:zip) %><span class="req">*</span><br/>
+        <%= ship_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
         <%= ship_form.text_field :zipcode, :class => 'required' %>
       </p>
       <p class="field" id="scountry">
@@ -135,12 +135,12 @@
         </span>
       </p>
       <p class="field" id="sphone">
-        <%= ship_form.label :phone, t(:phone) %><span class="req">*</span><br/>
+        <%= ship_form.label :phone, t(:phone) %><span class="req">*</span><br />
         <%= ship_form.text_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.label :alternative_phone, t(:alternative_phone) %><br />
           <%= ship_form.text_field :alternative_phone %>
         </p>
       <% end %>
@@ -150,5 +150,5 @@
 
 <hr class="space" />
 <div class="form-buttons" data-hook="buttons">
-  <%= submit_tag I18n.t(:save_and_continue), :class => "continue button primary" %>
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

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

@@ -7,5 +7,5 @@
 <hr />
 
 <div class="form-buttons" data-hook="buttons">
-  <input type="submit" class="continue button primary" value="<%=t("place_order") %>"/>
+  <%= submit_tag t(:place_order), :class => 'continue button primary' %>
 </div>

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

@@ -1,23 +1,23 @@
 <fieldset id='shipping_method' data-hook>
-  <legend><%= t("shipping_method") %></legend>
+  <legend><%= t(:shipping_method) %></legend>
   <div class="inner" data-hook="shipping_method_inner">
     <div id="methods">
       <p class="field radios">
         <% @order.rate_hash.each do |shipping_method| %>
           <label>
             <%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
-            <%if Spree::Config[:shipment_inc_vat] %>
-              <%= shipping_method[:name] %> <%= format_price (1+TaxRate.default)*shipping_method[:cost] %>
-            <%else%>
+            <% if Spree::Config[:shipment_inc_vat] %>
+              <%= shipping_method[:name] %> <%= format_price (1 + TaxRate.default) * shipping_method[:cost] %>
+            <% else %>
             <%= shipping_method[:name] %> <%= number_to_currency shipping_method[:cost] %>
-            <%end%>
+            <% end %>
           </label><br />
         <% end %>
       </p>
     </div>
     <% if Spree::Config[:shipping_instructions] && @order.rate_hash.present? %>
       <p id="minstrs" data-hook>
-        <%= form.label :special_instructions, t("shipping_instructions") %><br />
+        <%= form.label :special_instructions, t(:shipping_instructions) %><br />
         <%= form.text_area :special_instructions, :cols => 40, :rows => 7 %>
       </p>
     <% end %>
@@ -25,5 +25,5 @@
 </fieldset>
 
 <div class="form-buttons" data-hook="buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>"/>
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

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

@@ -1,5 +1,5 @@
 <fieldset id="payment" data-hook>
-  <legend><%= t("payment_information") %></legend>
+  <legend><%= t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
     <% @order.available_payment_methods.each do |method| %>
     <p>
@@ -19,12 +19,12 @@
         </li>
       <% end %>
     </ul>
-    <br style='clear:both;' />
+    <br style="clear:both;" />
     <div data-hook="coupon_code_field" data-hook></div>
   </div>
 </fieldset>
 
 <hr class="space" />
 <div class="form-buttons" data-hook="buttons">
-  <input type="submit" class="continue button primary" value="<%=t("save_and_continue") %>" />
+  <%= submit_tag t(:save_and_continue), :class => 'continue button primary' %>
 </div>

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

@@ -2,7 +2,7 @@
 <table data-hook="order_summary">
   <tbody>
     <tr data-hook="item_total">
-      <td><strong><%= t('item_total') %>:</strong></td>
+      <td><strong><%= t(:item_total) %>:</strong></td>
       <td><strong><%= number_to_currency order.item_total %></strong></td>
     </tr>
     <tbody id="summary-order-charges" data-hook>
@@ -15,7 +15,7 @@
       <% end %>
     </tbody>
     <tr data-hook="order_total">
-      <td><strong><%= t('order_total') %>:</strong></td>
+      <td><strong><%= t(:order_total) %>:</strong></td>
       <td><strong><span id='summary-order-total'><%= number_to_currency @order.total %></span></strong></td>
     </tr>
   </tbody>

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

@@ -2,10 +2,10 @@
   <%= javascript_include_tag '/states' %>
 <% end %>
 <div id="checkout" data-hook>
-  <h1><%= t("checkout")%></h1>
+  <h1><%= t(:checkout) %></h1>
   <%= checkout_progress %>
   <br clear="left" />
-  <%= render "shared/error_messages", :target => @order %>
+  <%= render 'shared/error_messages', :target => @order %>
   <% if @order.state != 'confirm' %>
     <div id="checkout-summary" data-hook="checkout_summary_box">
       <%= render 'summary', :order => @order %>
@@ -13,6 +13,6 @@
   <% 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 "creditcards/creditcard.gif", :id => 'creditcard-image' %>
+<%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
 <p class="field" data-hook="card_number">
-  <label for=""><%= t("card_number") %></label><br />
-  <% options_hash = Rails.env.production? ? {:autocomplete => "off"} : {} %>
+  <%= 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" data-hook="card_expiration">
-  <label for=""><%= t("expiration") %></label><br />
+  <%= 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" data-hook="cart_code">
-  <label for=""><%= t("card_code") %></label><br />
+  <%= 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") %>)
+    (<%= 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 %>