spree_core 0.60.6 → 0.70.0

data/app/views/admin/taxons/available.js.erb

@@ -1,17 +1,10 @@
-<script type="text/javascript">
-  function displayRow(){
-    var row = document.getElementById("captionRow");
-    if (row.style.display == '') row.style.display = 'none';
-    else row.style.display = '';
-  }
-</script>
-<h4><%= t('available_taxons') %></h4>
+<h4><%= t(:available_taxons) %></h4>
 <table class="index">
   <thead>
     <tr>
-      <th><%= t("name") %></th>
-      <th><%= t("path") %></th>
-      <th><%= t("action") %></th>
+      <th><%= t(:name) %></th>
+      <th><%= t(:path) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
@@ -20,14 +13,14 @@
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
         <td class="actions">
-          <%= link_to icon('add') + ' ' + t("select"),
+          <%= link_to icon(:add) + ' ' + t(:select),
                             select_admin_product_taxon_path(@product, taxon),
                            :remote => true, :class => 'iconlink' %>
-        </td>        
+        </td>
       </tr>
     <% end %>
     <% if @taxons.empty? %>
-     <tr><td colspan="3"><%= t('no_match_found') %>.</td></tr>
+     <tr><td colspan="3"><%= t(:no_match_found) %>.</td></tr>
     <% end %>
   </tbody>
 </table>

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

@@ -1,11 +1,11 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("taxon_edit")%></h1>
+<h1><%= t(:taxon_edit) %></h1>
 
-<%= form_for(:taxon, :url => admin_taxonomy_taxon_url(@taxonomy, @taxon), :html => { :method => :put, :multipart => true}) do |f| %>
+<%= form_for [:admin, @taxonomy, @taxon], :html => { :method => :put, :multipart => true} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 
-  <p class="form-buttons">
-    <%= button t("update") %> <%= t("or") %> <%= link_to t("cancel"), edit_admin_taxonomy_url(@taxonomy) %>
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %> <%= t(:or) %> <%= link_to t(:cancel), edit_admin_taxonomy_url(@taxonomy) %>
   </p>
 <% end %>

data/app/views/admin/taxons/remove.html.erb

@@ -1 +1 @@
-<%= render :partial => "taxon_table", :locals => {:taxons => @taxons} %>
+<%= render :partial => 'taxon_table', :locals => {:taxons => @taxons} %>

data/app/views/admin/taxons/select.js.erb

@@ -1,2 +1,2 @@
-$("#selected-taxons").html("<%= escape_javascript(render(:partial => "taxon_table", :locals => {:taxons => @taxons})) %>");
+$("#selected-taxons").html("<%= escape_javascript(render(:partial => 'taxon_table', :locals => {:taxons => @taxons})) %>");
 $("#<%= dom_id @taxon, :sel %>").hide();

data/app/views/admin/taxons/selected.html.erb

@@ -1,30 +1,30 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Taxons"} %>
-<div id="selected-taxons">
-  <%= render :partial => "taxon_table", :locals => {:taxons => @taxons} %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Taxons'} %>
+<div id="selected-taxons" data-hook>
+  <%= render :partial => 'taxon_table', :locals => {:taxons => @taxons} %>
 </div>
 
 
-<%= form_tag('#') do %>
-  <label><%= t('search') %>:</label>
+<%= form_tag '#' do %>
+  <%= label_tag nil, t(:search) %>:
   <input id="searchtext" size="25">
 <% end %>
 
 <%= javascript_tag do %>
   function search_for_taxons(){
-    jQuery.ajax({
-     data: {q: jQuery("#searchtext").val() }, 
-     dataType: 'script',
+    $.ajax({
+     data: {q: $("#searchtext").val() },
+     dataType: 'html',
      success: function(request){
        jQuery('#search_hits').html(request);
      },
-     type: 'post',
-     url: '<%= available_admin_product_taxons_url(@product) %>'
+     type: 'POST',
+     url: '<%= available_admin_product_taxons_url(@product, :format => 'js') %>'
     });
   }
 
-  jQuery("#searchtext").keypress(function (e) {
+  $("#searchtext").keypress(function (e) {
     if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
       search_for_taxons();
 
@@ -34,10 +34,10 @@
     }
   });
 
-  jQuery("#searchtext").delayedObserver(function() {
+  $("#searchtext").delayedObserver(function() {
     search_for_taxons();
   }, 0.75);
 <% end %>
-<br/>
-<div id="search_hits"></div>
+<br />
+<div id="search_hits" data-hook></div>
 

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

@@ -1,26 +1,27 @@
 <table>
-	<tr>
-    <td><label><%=t("google_analytics_id")%></label></td>
-    <td><%= text_field :tracker, :analytics_id, {"style" => "width:200px"} %></td>
+  <tr data-hook="analytics_id">
+    <td><%= label_tag nil, t(:google_analytics_id) %></td>
+    <td><%= text_field :tracker, :analytics_id, {'style' => 'width:200px;'} %></td>
   </tr>
-  <tr>
-    <td><label><%=t("environment")%></label></td>
+  <tr data-hook="environment">
+    <td><%= label_tag nil, t(:environment) %></td>
     <td>
-      <%= collection_select(:tracker, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "tracker-env"}) %>
+      <%= collection_select(:tracker, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'tracker-env'}) %>
     </td>
   </tr>
-  <tr>
-    <td><label><%= t("active") %></label></td>
+  <tr data-hook="active">
+    <td><%= label_tag nil, t(:active) %></td>
     <td>
       <label class="sub">
-        <%= radio_button(:tracker, :active, true ) %>
-        <%= t("yes") %>
-      </label> &nbsp; 
+        <%= radio_button(:tracker, :active, true) %>
+        <%= t(:yes) %>
+      </label> &nbsp;
       <label class="sub">
-        <%= radio_button(:tracker, :active, false ) %>
-        <%= t("no") %>
+        <%= radio_button(:tracker, :active, false) %>
+        <%= t(:no) %>
       </label>
     </td>
   </tr>
-  <%= hook :additional_tracker_fields %>
-</table>
+  <tbody data-hook="additional_tracker_fields">
+  </tbody>
+</table>

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

@@ -1,8 +1,8 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<h1><%= t("editing_tracker") %></h1>
-<%= render "shared/error_messages", :target => @tracker %>
-<%= form_for(@tracker, :url => object_url, :html => { :method => :put }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => "admin/shared/edit_resource_links" %>
+<h1><%= t(:editing_tracker) %></h1>
+<%= render 'shared/error_messages', :target => @tracker %>
+<%= form_for [:admin, @tracker] do |f| %>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,39 +1,34 @@
 <%= render :partial => 'admin/shared/configuration_menu' %>
 
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
-      <%= button_link_to t("new_tracker"), new_object_url, :icon => 'add', :id => 'admin_new_tracker_link'  %>
+      <%= button_link_to t(:new_tracker), new_object_url, :icon => 'add', :id => 'admin_new_tracker_link'  %>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
-<h1><%= t("analytics_trackers") %></h1>
+<h1><%= t(:analytics_trackers) %></h1>
 
 <table class="index">
   <thead>
-    <tr>
-    <%= hook :admin_trackers_index_headers do %>
+    <tr data-hook="admin_trackers_index_headers">
       <th><%= t(:google_analytics_id) %></th>
-      <th><%= t("environment") %></th>
-      <th><%= t("active") %></th>
-    <% end %>
-      <th><%= t("action") %></th>
+      <th><%= t(:environment) %></th>
+      <th><%= t(:active) %></th>
+      <th><%= t(:action) %></th>
     </tr>
   </thead>
   <tbody>
     <% @trackers.each do |tracker|%>
-      <tr id="<%= dom_id tracker %>">
-        <%- locals = {:tracker => tracker} %>
-        <%= hook :admin_trackers_index_rows, locals do %>
-          <td><%= tracker.analytics_id %></td>
-          <td><%= tracker.environment.to_s.titleize %></td>
-          <td><%= tracker.active ? t(:yes) : t(:no) %></td>
-        <% end %>
+      <tr id="<%= dom_id tracker %>" data-hook="admin_trackers_index_rows">
+        <td><%= tracker.analytics_id %></td>
+        <td><%= tracker.environment.to_s.titleize %></td>
+        <td><%= tracker.active ? t(:yes) : t(:no) %></td>
         <td>
-        	<%= link_to_edit tracker %> &nbsp;
-        	<%= link_to_delete tracker %>
+          <%= link_to_edit tracker %> &nbsp;
+          <%= link_to_delete tracker %>
         </td>
       </tr>
     <% end %>

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

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

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

@@ -1,13 +1,12 @@
-<%- locals = {:f => f} %>
-<%= hook :admin_user_form_fields, locals do %>
+<div data-hook="admin_user_form_fields">
   <%= f.field_container :email do %>
-    <%= f.label :email, t("email") %><br />
-    <%= f.text_field :email  %>
-    <%= error_message_on :user, :email%>
+    <%= f.label :email, t(:email) %><br />
+    <%= f.text_field :email %>
+    <%= error_message_on :user, :email %>
   <% end %>
 
   <%= f.field_container :password do %>
-    <%= f.label :password, t("password") %><br />
+    <%= f.label :password, t(:password) %><br />
     <%= f.password_field :password  %>
     <%= f.error_message_on :password %>
   <% end %>
@@ -17,19 +16,19 @@
     <%= f.password_field :password_confirmation  %>
     <%= f.error_message_on :password_confirmation %>
   <% end %>
-<% end %>
+</div>
 
 
 <% if @user.respond_to?(:roles) %>
-<%= hook :admin_user_form_roles, locals do %>
-  <p>
-    <label><%= t("roles") %></label><br />
-    <% for role in @roles %>
-      <label class="sub">
-        <%= check_box_tag "user[role][#{role.name}]", 1, @user.has_role?(role.name) %>
-        <%= role.name %>
-      </label> &nbsp;
-    <% end %>
-  </p>
-<% end %>
+  <div data-hook="admin_user_form_roles">
+    <p>
+      <%= label_tag nil, t(:roles) %><br />
+      <% @roles.each do |role| %>
+        <label class="sub">
+          <%= check_box_tag "user[role][#{role.name}]", 1, @user.has_role?(role.name) %>
+          <%= role.name %>
+        </label> &nbsp;
+      <% end %>
+    </p>
+  </div>
 <% end %>

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

@@ -1,14 +1,14 @@
-<%= hook :admin_user_edit_form_header do %>
+<div data-hook="admin_user_edit_form_header">
   <%= render 'shared/error_messages', :target => @user %>
-  <h1><%= t("editing_user") %></h1>
-<% end %>
+  <h1><%= t(:editing_user) %></h1>
+</div>
 
-<%= hook :admin_user_edit_form do %>
-  <%= form_for(:user, :url => object_url, :html => { :method => :put }) do |f| %>
-    <%= render :partial => "form", :locals => { :f => f } %>
+<div data-hook="admin_user_edit_form">
+  <%= form_for [:admin, @user] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <%= hook :admin_user_edit_form_buttons do %>
-      <%= render :partial => "admin/shared/edit_resource_links" %>
-    <% end %>
+    <div data-hook="admin_user_edit_form_button">
+      <%= render :partial => 'admin/shared/edit_resource_links' %>
+    </div>
   <% end %>
-<% end %>
+</div>

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

@@ -1,63 +1,49 @@
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
-      <p><%= button_link_to t("new_user"), new_object_url, :icon => 'add', :id => 'admin_new_user_link' %></p>
+      <p><%= button_link_to t(:new_user), new_object_url, :icon => 'add', :id => 'admin_new_user_link' %></p>
     </li>
   </ul>
-  <br class='clear' />
+  <br class="clear" />
 </div>
 
+<h1><%= t(:listing_users) %></h1>
 
-<h1><%= t("listing_users") %></h1>
-
-
-<table class="index" id='listing_users'>
+<table class="index" id="listing_users" data-hook>
   <thead>
-  <tr>
-    <%= hook :admin_users_index_headers do %>
-      <th><%= sort_link @search,:email,t("user"),{}, {:title => 'users_email_title'} %></th>
-      <th>
-        <%= hook :admin_users_index_header_actions %>
-      </th>
-    <% end %>
-  </tr>
+    <tr data-hook="admin_users_index_headers">
+      <th><%= sort_link @search,:email, t(:user), {}, {:title => 'users_email_title'} %></th>
+      <th data-hook="admin_users_index_header_actions"></th>
+    </tr>
   </thead>
   <tbody>
     <% @users.each do |user|%>
-      <tr id="<%= dom_id user %>">
-        <%- locals = {:user => user} %>
-        <%= hook :admin_users_index_rows, locals do %>
-          <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
-        <% end %>
-        <td>
-          <%= hook :admin_users_index_row_actions, locals do %>
-            <%= link_to_edit user, :class => "edit" %> &nbsp;
-            <%= link_to_delete user %>
-          <% end %>
+      <tr id="<%= dom_id user %>" data-hook="admin_users_index_rows">
+        <td width="350px" class='user_email'><%=link_to user.email, object_url(user) %></td>
+        <td data-hook="admin_users_index_row_actions">
+          <%= link_to_edit user, :class => 'edit' %> &nbsp;
+          <%= link_to_delete user %>
         </td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
-<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+<%= paginate @users %>
 
 
 <% content_for :sidebar do %>
-  <div class="box">
+  <div class="box" data-hook="admin_users_index_search">
     <h3><%= t(:search) %></h3>
     <% @search = User.search %>
     <%= form_for [:admin, @search] do |f| %>
-      <%- locals = {:f => f} %>
-      <%= hook :admin_users_index_search, locals do %>
-        <p>
-          <%= t("email") %><br />
-          <%= f.text_field :email_contains, :size=>18 %>
-        </p>
-      <% end %>
-      <%= hook :admin_users_index_search_buttons, locals do %>
-        <p><%= button t("search") %></p>
-      <% end %>
+      <p>
+        <%= t(:email) %><br />
+        <%= f.text_field :email_contains, :size =>18 %>
+      </p>
+      <div data-hook="admin_users_index_search_buttons">
+        <p><%= button t(:search) %></p>
+      </div>
     <% end %>
   </div>
 <% end %>

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

@@ -1,14 +1,14 @@
-<%= hook :admin_user_new_form_header do %>
+<div data-hook="admin_user_new_form_header">
   <%= render 'shared/error_messages', :target => @user %>
-  <h1><%= t("new_user") %></h1>
-<% end %>
+  <h1><%= t(:new_user) %></h1>
+</div>
 
-<%= hook :admin_user_new_form do %>
-  <%= form_for(:user, :url => collection_url) do |f| %>
-    <%= render :partial => "form", :locals => { :f => f } %>
+<div data-hook="admin_user_new_form">
+  <%= form_for [:admin, @user] do |f| %>
+    <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <%= hook :admin_user_new_form_buttons do %>
-      <%= render :partial => "admin/shared/new_resource_links" %>
-    <% end %>
+    <div data-hook="admin_user_new_form_buttons">
+      <%= render :partial => 'admin/shared/new_resource_links' %>
+    </div>
   <% end %>
-<% end %>
+</div>

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

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

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

@@ -1,8 +1,8 @@
-<div class="yui-gb">
-  <div class="yui-u first">
+<div class="clearfix">
+  <div class="left" data-hook="variants">
 
     <% @product.options.each do |option| %>
-      <p>
+      <p data-hook="presentation">
         <%= label :new_variant, option.option_type.presentation %><br />
         <% if @variant.new_record? %>
           <%= select(:new_variant, option.option_type.presentation,
@@ -16,24 +16,24 @@
       </p>
     <% end %>
 
-    <p><%= f.label :sku, t("sku") %><br />
+    <p data-hook="sku"><%= f.label :sku, t(:sku) %><br />
     <%= f.text_field :sku %></p>
 
-    <p><%= f.label :price, t("price") %>:<br />
+    <p data-hook="price"><%= f.label :price, t(:price) %>:<br />
     <%= f.text_field :price, :value => number_with_precision(@variant.price, :precision => 2) %></p>
 
-    <p><%= f.label :cost_price, t("cost_price") %>:<br />
+    <p data-hook="cost_price"><%= f.label :cost_price, t(:cost_price) %>:<br />
     <%= f.text_field :cost_price, :value => number_with_precision(@variant.cost_price, :precision => 2) %></p>
 
     <% if Spree::Config[:track_inventory_levels] %>
-      <p><%= f.label :on_hand, t("on_hand") %>: <br />
+      <p data-hook="on_hand"><%= f.label :on_hand, t(:on_hand) %>: <br />
       <%= f.text_field :on_hand %></p>
     <% end %>
   </div>
-  <div class="yui-u">
+  <div class="right">
 
     <% Variant.additional_fields.select{|af| af[:only].nil? || af[:only].include?(:variant) }.each do |field| %>
-      <%= render :partial => "admin/shared/additional_field", :locals => {:field => field, :f => f} %>
+      <%= render :partial => 'admin/shared/additional_field', :locals => {:field => field, :f => f} %>
     <% end %>
 
   </div>

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

@@ -2,12 +2,12 @@
 
 <%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"} %>
 
-<%= render "shared/error_messages", :target => @variant %>
+<%= render 'shared/error_messages', :target => @variant %>
 
-<%= form_for(@variant, :url => object_url, :html => { :method => :put }) do |f| %>
-  <%= hook :admin_variant_edit_form, {:f => f} do %>
-    <%= render :partial => "form", :locals => { :f => f } %>
-  <% end %>
+<%= form_for [:admin, @product, @variant] do |f| %>
+  <div data-hook="admin_variant_edit_form">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+  </div>
 
   <%= render :partial => 'admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,23 +1,23 @@
 <%= render :partial => 'admin/shared/product_sub_menu' %>
 
-<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => "Variants"} %>
+<%= render :partial => 'admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
 
 <table class="index sortable">
-  <tr>
-    <th><%= t("options") %></th>
-    <th><%= t("price") %></th>
-    <th><%= t("sku") %></th>
+  <tr data-hook="variants_header">
+    <th><%= t(:options) %></th>
+    <th><%= t(:price) %></th>
+    <th><%= t(:sku) %></th>
     <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
-      <th><%= t("activerecord.attributes.variant." + field[:name].downcase, :default => field[:name].titleize) %></th>
+      <th><%= t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
     <% end %>
-    <th><%= t("on_hand") %></th>
-    <th><%= t("action") %></th>
+    <th><%= t(:on_hand) %></th>
+    <th><%= t(:action) %></th>
   </tr>
   <% @variants.each do |variant| %>
     <!-- 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><span class="handle"></span> <%= variant_options variant %></td>
+    <tr id="<%= dom_id(variant) %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
+      <td><span class="handle"></span> <%= variant.options_text %></td>
       <td><%= variant.price %></td>
       <td><%= variant.sku %></td>
       <% Variant.additional_fields.select{|f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
@@ -32,35 +32,31 @@
     </tr>
   <% end %>
   <% unless @product.has_variants? %>
-    <tr><td colspan="9"><%= t("none") %></td></tr>
+    <tr><td colspan="9"><%= t(:none) %></td></tr>
   <% end %>
 </table>
 
 <% if @product.options.empty? %>
 
-  <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 class='first_add_option_types' data-hook="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>
+  <div id="new_variant" data-hook></div>
 
-  <br/>
+  <br />
 
-  <p id="new_var_link">
+  <p id="new_var_link" data-hook>
 
-    <%= link_to icon('add') + ' ' + t("new_variant"), new_admin_product_variant_url(@product),
-                                                      :remote => :true,
-                                                      'data-update' => 'new_variant',
-                                                      :class => 'iconlink new' %>
+    <%= 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") %>
+    <%= 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' %>
+  <%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 <% end %>

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

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