spree_core 0.70.0.rc2 → 0.70.0

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

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

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

@@ -1,16 +1,16 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("states") %></h1>
+<h1><%= t(:states) %></h1>
 
 <p data-hook="country">
-  <label for="country"><%= t('country') %></label>
+  <%= label_tag :country, t(:country) %>
   <select id="country" class='observe_field' data-base-url="<%=admin_states_path(:format => :js)%>?country_id=" data-update="#state-list">
   <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
 </p>
 
-<%= image_tag "spinner.gif", :plugin => "spree", :style => "display:none", :id => 'busy_indicator' %>
+<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 
 <div id="state-list" data-hook>
-  <%=render :partial => 'state_list'%>
+  <%= render :partial => 'state_list'%>
 </div>

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

@@ -2,7 +2,7 @@
 
 <%= render 'shared/error_messages', :target => @state %>
 
-<%= form_for([:admin, @country, @state]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for [:admin, @country, @state] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

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

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

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

@@ -1,12 +1,12 @@
 <%= f.field_container :name do %>
-  <%= f.label :name, t("name")%><br />
-  <%=f.text_field :name %>
+  <%= f.label :name, t(:name) %><br />
+  <%= f.text_field :name %>
 <% end %>
 <%= f.field_container :description do %>
-  <%= f.label :description, t("description")%><br />
-  <%=f.text_field :description %>
+  <%= f.label :description, t(:description) %><br />
+  <%= f.text_field :description %>
 <% end %>
 <%= f.field_container :is_default do %>
-  <%= f.label :is_default, t("default")%><br />
-  <%=f.check_box :is_default %>
+  <%= f.label :is_default, t(:default) %><br />
+  <%= f.check_box :is_default %>
 <% end %>

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

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

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

@@ -3,22 +3,21 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <p><%= button_link_to t("new_tax_category"), new_object_url,  :icon => 'add',
-                                                                    :id => 'admin_new_tax_categories_link' %>
+      <p><%= button_link_to t(:new_tax_category), new_object_url, :icon => 'add', :id => 'admin_new_tax_categories_link' %>
     </p>
     </li>
   </ul>
-  <br class="clear">
+  <br class="clear" />
 </div>
 
 
-<h1><%=t("listing_tax_categories")%></h1>
+<h1><%= t(:listing_tax_categories) %></h1>
 <table class="index" id='listing_tax_categories' data-hook>
   <thead>
     <tr data-hook="tax_header">
-      <th><%= t("name") %></th>
-      <th><%= t("description") %></th>
-      <th><%= t("default") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:description) %></th>
+      <th><%= t(:default) %></th>
       <th></th>
     </tr>
   </thead>
@@ -32,8 +31,8 @@
         <td><%= tax_category.description %></td>
         <td><%= tax_category.is_default.to_s.titleize %></td>
         <td class="actions">
-          <%=link_to_edit tax_category, :class => 'edit' %> &nbsp;
-          <%=link_to_delete tax_category %>
+          <%= link_to_edit tax_category, :class => 'edit' %> &nbsp;
+          <%= link_to_delete tax_category %>
       </tr>
     <% end %>
     <% if @tax_categories.empty? %>

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

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

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

@@ -1,16 +1,16 @@
 <table data-hook="tax_rates">
   <tr data-hook="zone">
-    <td><%=t("zone")%>:</td>
+    <td><%= t(:zone) %>:</td>
     <td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
   </tr>
   <tr data-hook="category">
-    <td><%=t("tax_category")%>:</td>
+    <td><%= t(:tax_category) %>:</td>
     <td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
   </tr>
   <tr="rate">
-    <td><%=t("rate")%>:</td>
+    <td><%= t(:rate) %>:</td>
     <td><%= f.text_field :amount %></td>
-  </tr>  
+  </tr>
 </table>
 
-<%= render "admin/shared/calculator_fields", :f => f %>
+<%= render 'admin/shared/calculator_fields', :f => f %>

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

@@ -1,6 +1,6 @@
-<h1><%= t("editing_tax_rate") %></h1>
-<%= render "shared/error_messages", :target => @tax_rate %>
-<%= form_for([:admin, @tax_rate]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/edit_resource_links" %>
+<h1><%= t(:editing_tax_rate) %></h1>
+<%= render 'shared/error_messages', :target => @tax_rate %>
+<%= form_for [:admin, @tax_rate] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,20 +1,20 @@
 <div class="toolbar" data-hook="toolbar">
   <ul class="actions">
     <li>
-      <%= button_link_to t("new_tax_rate"), new_object_url, :icon => 'add'  %>
+      <%= button_link_to t(:new_tax_rate), new_object_url, :icon => 'add' %>
     </li>
   </ul>
-  <br class="clear">
+  <br class="clear" />
 </div>
-<h1><%=t("tax_rates") %></h1>
+<h1><%= t(:tax_rates) %></h1>
 <table class="index">
   <thead>
     <tr data-hook="rate_header">
-      <th><%=t("zone")%></th>
-      <th><%=t("category")%></th>
-      <th><%=t("amount")%></th>
-      <th><%=t("calculator")%></th>
-      <th><%=t("action")%></th>
+      <th><%= t(:zone) %></th>
+      <th><%= t(:category) %></th>
+      <th><%= t(:amount) %></th>
+      <th><%= t(:calculator) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
@@ -25,8 +25,8 @@
       <td><%=tax_rate.amount %></td>
       <td><%=tax_rate.calculator.to_s %></td>
       <td>
-      	<%= link_to_edit tax_rate %> &nbsp;
-      	<%= link_to_delete tax_rate %>
+        <%= link_to_edit tax_rate %> &nbsp;
+        <%= link_to_delete tax_rate %>
       </td>
     </tr>
     <% end %>

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

@@ -1,8 +1,8 @@
-<h1><%= t("new_tax_rate") %></h1>
+<h1><%= t(:new_tax_rate) %></h1>
 
 <%= render 'shared/error_messages', :target => @tax_rate %>
 
-<%= form_for([:admin, @tax_rate]) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/new_resource_links" %>
+<%= form_for [:admin, @tax_rate] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/new_resource_links' %>
 <% end %>

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

@@ -1,23 +1,23 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t('tax_settings') %></h1>
+<h1><%= t(:tax_settings) %></h1>
 
-<%= form_tag(admin_tax_settings_path, :method => :put) do %>
+<%= form_tag admin_tax_settings_path, :method => :put do %>
 
   <p data-hook="show_vat">
-  	<label><%= t("show_price_inc_vat") %></label>
-    <input name="preferences[show_price_inc_vat]" type="hidden" value="0" />
-	  <%= check_box_tag('preferences[show_price_inc_vat]', "1",  Spree::Config[:show_price_inc_vat]) %>
+    <%= label_tag nil, t(:show_price_inc_vat) %>
+    <%= hidden_field_tag 'preferences[show_price_inc_vat]', '0' %>
+    <%= check_box_tag 'preferences[show_price_inc_vat]', '1',  Spree::Config[:show_price_inc_vat] %>
   </p>
 
   <p data-hook="shipment_vat">
-  	<label><%= t("shipment_inc_vat") %></label>
-    <input name="preferences[shipment_inc_vat]" type="hidden" value="0" />
-	  <%= check_box_tag('preferences[shipment_inc_vat]', "1",  Spree::Config[:shipment_inc_vat]) %>
+    <%= label_tag nil, t(:shipment_inc_vat) %>
+    <%= hidden_field_tag 'preferences[shipment_inc_vat]', '0' %>
+    <%= check_box_tag 'preferences[shipment_inc_vat]', '1',  Spree::Config[:shipment_inc_vat] %>
   </p>
 
   <p class="form-buttons" data-hook="buttons">
-    <%= button t('update') %> 
-    <%= t("or") %> <%= link_to t("cancel"), admin_tax_settings_url %>
+    <%= button t(:update) %> 
+    <%= t(:or) %> <%= link_to t(:cancel), admin_tax_settings_url %>
   </p>
 <% end %>

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

@@ -1,18 +1,18 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("tax_settings") %></h1>
+<h1><%= t(:tax_settings) %></h1>
 
 <table id='listing_tax_settings' data-hook>
   <tr>
-    <th scope="row"><%= t("show_price_inc_vat") %>:</th>
-    <td><%=  Spree::Config[:show_price_inc_vat] %></td>
+    <th scope="row"><%= t(:show_price_inc_vat) %>:</th>
+    <td><%= Spree::Config[:show_price_inc_vat] %></td>
   </tr>
   <tr>
-    <th scope="row"><%= t("shipment_inc_vat") %>:</th>
-    <td><%=  Spree::Config[:shipment_inc_vat] %></td>
+    <th scope="row"><%= t(:shipment_inc_vat) %>:</th>
+    <td><%= Spree::Config[:shipment_inc_vat] %></td>
   </tr>
 </table>
 
 <p data-hook="buttons">
-  <%= link_to_with_icon 'edit', t("edit"), edit_admin_tax_settings_path %>
+  <%= link_to_with_icon 'edit', t(:edit), edit_admin_tax_settings_path %>
 </p>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxonomy_form">
   <%= f.field_container :name do %>
-    <%= f.label :name, t("name") %> <span class="required">*</span><br />
+    <%= f.label :name, t(:name) %> <span class="required">*</span><br />
     <%= error_message_on :taxonomy, :name, :class => 'fullwidth title'  %>
     <%= text_field :taxonomy, :name  %>
   <% end %>

data/app/views/admin/taxonomies/_js_head.html.erb

@@ -1,8 +1,8 @@
 <% content_for :head do %>
   <%= javascript_tag "var taxonomy_id = #{@taxonomy.id};
-    var loading = '#{escape_javascript t('loading')}';
-    var new_taxon = '#{escape_javascript t('new_taxon')}';
-    var server_error = '#{escape_javascript t('server_error')}';
-    var taxonomy_tree_error = '#{escape_javascript t('taxonomy_tree_error')}';"
+    var loading = '#{escape_javascript t(:loading)}';
+    var new_taxon = '#{escape_javascript t(:new_taxon)}';
+    var server_error = '#{escape_javascript t(:server_error)}';
+    var taxonomy_tree_error = '#{escape_javascript t(:taxonomy_tree_error)}';"
   %>
 <% end %>

data/app/views/admin/taxonomies/_list.html.erb

@@ -1,12 +1,12 @@
 <table class="index" id='listing_taxonomies' data-hook>
   <tr data-hook="taxonomies_header">
-    <th><%= t("name") %></th>
+    <th><%= t(:name) %></th>
     <th></th>
   </tr>
-<% for taxonomy in @taxonomies %>
+<% @taxonomies.each do |taxonomy| %>
   <tr id="<%= dom_id taxonomy %>" data-hook="taxonomies_row">
-	  <td>
-	    <%= taxonomy.name %>
+    <td>
+      <%= taxonomy.name %>
     </td>
     <td class="actions">
       <%= link_to_edit taxonomy.id, :class => 'edit' %>

data/app/views/admin/taxonomies/_taxon.html.erb

@@ -2,9 +2,9 @@
   <ul>
     <% taxon.children.each do |child| %>
       <li id="<%= child.id %>" rel="taxon">
-        <a style="background-image: url(<%=child.icon.url%>)" href="#"><%= child.name %></a>
+        <a style="background-image: url(<%= child.icon.url %>);" href="#"><%= child.name %></a>
         <% if child.children.length > 0 %>
-          <%= render :partial => "taxon", :locals => {:taxon => child} %>
+          <%= render :partial => 'taxon', :locals => {:taxon => child} %>
         <% end %>
       </li>
     <% end %>

data/app/views/admin/taxonomies/edit.erb

@@ -1,49 +1,48 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<%= render :partial => "js_head" %>
+<%= render :partial => 'js_head' %>
 
-<h1><%= t("taxonomy_edit")%></h1>
+<h1><%= t(:taxonomy_edit) %></h1>
 
 <p id="ajax_error" class="errorExplanation" style="display:none;"></p>
 
-<%= form_for([:admin, @taxonomy]) do |f| %>
+<%= form_for [:admin, @taxonomy] do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
-	  <div>
-	    <label><%= t("tree")%></label><br />
+    <div>
+      <%= label_tag nil, t(:tree) %><br />
       <div id="taxonomy_tree" class="tree"></div>
-  	</div>
-  	<p id="progress" style="display:none;">
-      <img src="/assets/spinner.gif?1234540747" alt="Spinner" style="vertical-align:bottom;"/> <%= t('updating') %>..
+    </div>
+    <p id="progress" style="display:none;">
+      <%= image_tag 'spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= t(:updating) %>..
     </p>
-    <p><br/><small><%= t("taxonomy_tree_instruction")%></small></p>
+    <p><br /><small><%= t(:taxonomy_tree_instruction) %></small></p>
 
-	<p class="form-buttons">
-	  <%= button t("update") %> <%= t("or") %> <%= link_to t("cancel"), admin_taxonomies_path %>
-  </p>
+    <p class="form-buttons">
+      <%= button t(:update) %> <%= t(:or) %> <%= link_to t(:cancel), admin_taxonomies_path %>
+    </p>
 <% end %>
 
 
 <% content_for :head do %>
-  <script type="text/javascript">
+  <%= javascript_tag do -%>
     var initial = [
-	   	{ "attr" :
-	   	  { "id" : "<%= @taxonomy.root.id %>", "rel" : "root" },
-			"data" : "<%= @taxonomy.root.name %>",
-			"state" : "open",
-			"children" : [
-				<% @taxonomy.root.children.each_with_index do |taxon,i| %>
-					{
-						"attr" :
-						{ "id" : "<%= taxon.id %>"},
-						"data" : "<%= taxon.name %>"
-						<% unless taxon.children.empty? %>
-							,"state" : "closed"
-						<% end %>
-					}<%= "," if i < (@taxonomy.root.children.size - 1) %>
-				<% end %>
-			]
-      	}
+      { "attr" :
+      { "id" : "<%= @taxonomy.root.id %>", "rel" : "root" },
+      "data" : "<%= @taxonomy.root.name %>",
+      "state" : "open",
+      "children" : [
+        <% @taxonomy.root.children.each_with_index do |taxon,i| %>
+          {
+            "attr" :
+            { "id" : "<%= taxon.id %>"},
+            "data" : "<%= taxon.name %>"
+            <% unless taxon.children.empty? %>
+              ,"state" : "closed"
+            <% end %>
+          }<%= ',' if i < (@taxonomy.root.children.size - 1) %>
+        <% end %>
+      ]
+        }
     ];
-
-  </script>
+  <% end -%>
 <% end %>

data/app/views/admin/taxonomies/get_children.json.erb

@@ -1,9 +1,9 @@
 [<% @taxons.each_with_index do |t,i| %>
-	{ "attr" :
-	  { "id" : "<%= t.id %>" },
-		"data" : "<%= t.name %>"
-		<% unless t.children.empty? %>
-			,"state" : "closed"
-		<% end %>
-	}<%= "," if i < (@taxons.size - 1) %>
+  { "attr" :
+    { "id" : "<%= t.id %>" },
+    "data" : "<%= t.name %>"
+    <% unless t.children.empty? %>
+      ,"state" : "closed"
+    <% end %>
+  }<%= "," if i < (@taxons.size - 1) %>
 <% end %>]