spree_core 0.60.6 → 0.70.RC1

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

@@ -1,25 +1,25 @@
-<table>
-  <tr>
+<table data-hook="payment_method">
+  <tr data-hook="name">
     <td><label><%=t("name")%></label></td>
     <td><%= text_field :payment_method, :name, {"style" => "width:200px"} %></td>
   </tr>
-  <tr>
+  <tr data-hook="description">
     <td><label><%=t("description")%></label></td>
     <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
   </tr>
-  <tr>
+  <tr data-hook="environment">
     <td><label><%=t("environment")%></label></td>
     <td>
       <%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => "gtwy-env"}) %>
     </td>
   </tr>
-  <tr>
+  <tr data-hook="display">
     <td><label><%=t("display")%></label></td>
     <td>
       <%= select(:payment_method, :display_on, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
     </td>
   </tr>
-  <tr>
+  <tr data-hook="active">
     <td><label><%= t("active") %></label></td>
     <td>
       <label class="sub">
@@ -36,7 +36,7 @@
 
 <h2><%= t('settings') %></h2>
 
-<div id="preference-settings">
+<div id="preference-settings" data-hook>
   <%= f.label(:type, t("provider")) %>
   <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => "gtwy-type"}) %>
 
@@ -47,4 +47,4 @@
       <div id="gateway-settings-warning" style="color:#FF0000"><%= t('provider_settings_warning')%></div>
     <% end %>
   <% end %>
-</div>
+</div>

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

@@ -4,7 +4,7 @@
 <%= render "shared/error_messages", :target => @payment_method %>
 <%= form_for(@payment_method, :url => admin_payment_method_path(@payment_method), :html => { :method => :put }) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
-  <p>
+  <p data-hook="buttons">
     <%=submit_tag t("update")%>
   </p>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= 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_payment_method"), new_object_url, :icon => 'add',
                                                                   :id => 'admin_new_payment_methods_link'  %>
@@ -13,35 +13,26 @@
 <h1><%= t("payment_methods") %></h1>
 
 <table class="index" id='listing_payment_methods'>
-  <tr>
-    <%= hook :admin_payment_methods_index_headers do %>
-      <th><%= t("name") %></th>
-      <th><%= t("provider") %></th>
-      <th><%= t("environment") %></th>
-      <th><%= t("display") %></th>
-      <th><%= t("active") %></th>
-    <% end %>
-    <th>
-      <%= hook :admin_payment_methods_index_header_actions %>
-    </th>
+  <tr data-hook="admin_payment_methods_index_headers">
+    <th><%= t("name") %></th>
+    <th><%= t("provider") %></th>
+    <th><%= t("environment") %></th>
+    <th><%= t("display") %></th>
+    <th><%= t("active") %></th>
+    <th data-hook="admin_payment_methods_index_header_actions"></th>
   </tr>
   <tbody>
     <% @payment_methods.each do |method|%>
-      <tr id="<%= dom_id method %>">
-        <%- locals = {:method => method} %>
-        <%= hook :admin_payment_methods_index_rows, locals do %>
-          <td width="120px"><%= method.name %></td>
-          <td width="140px"><%= method.type %></td>
-          <td width="100px"><%= method.environment.to_s.titleize %></td>
-          <td width="60px"><%= method.display_on.blank? ? t('both') : t(method.display_on) %></td>
-          <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
-        <% end %>
-        <td width="140px">
-          <%= hook :admin_payment_methods_index_row_actions, locals do %>
-            <%= link_to_edit method, :class => 'edit' %>
-            &nbsp;
-            <%= link_to_delete method %>
-          <% end %>
+      <tr id="<%= dom_id method %>" data-hook="admin_payment_methods_index_rows">
+        <td width="120px"><%= method.name %></td>
+        <td width="140px"><%= method.type %></td>
+        <td width="100px"><%= method.environment.to_s.titleize %></td>
+        <td width="60px"><%= method.display_on.blank? ? t('both') : t(method.display_on) %></td>
+        <td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
+        <td width="140px" data-hook="admin_payment_methods_index_row_actions">
+          <%= link_to_edit method, :class => 'edit' %>
+          &nbsp;
+          <%= link_to_delete method %>
         </td>
       </tr>
     <% end %>

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

@@ -3,9 +3,9 @@
 <h1><%= t("new_payment_method") %></h1>
 <%= render 'shared/error_messages', :target => @payment_method %>
 
-<%= form_for(:payment_method, :url => collection_url) do |f| %>
+<%= form_for(@payment_method, :url => collection_url) do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
-  <p>
+  <p data-hook="buttons">
     <%= submit_tag t("create") %>
   </p>
 <% end %>

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

@@ -5,7 +5,7 @@
 
 <% @payment_methods.each do |method| %>
 
-  <label>
+  <label data-hook="payment_method">
     <%= radio_button_tag "payment[payment_method_id]", method.id, method == @payment_method %> 
     <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
   </label>

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

@@ -1,5 +1,5 @@
 <table class="index">
-  <tr>
+  <tr data-hook="payments_header">
     <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
     <th><%= t("amount") %></th>
     <th><%= t("payment_method") %></th>
@@ -7,7 +7,7 @@
     <th><%= t("payment_actions") %></th>
   </tr>
   <% payments.each do |payment| %>
-    <tr>
+    <tr data-hook="payments_row">
       <td><%= payment.created_at.to_s(:date_time24) %></td>
       <td><%= number_to_currency(payment.amount) %></td>
       <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>

data/app/views/admin/payments/_transaction_list.html.erb

@@ -3,14 +3,14 @@
   <legend><%= t('transactions') %></legend>
 
   <table class="index">
-    <tr>
+    <tr data-hook="transactions_header">
       <th><%= t('type') %></th>
       <th><%= 'date' %></th>
       <th><%= t('amount') %></th>
       <th><%= t('response_code') %></th>
     </tr>
     <% for txn in txns %>
-    <tr>
+    <tr data-hook="transaction_row">
       <td>
         <%= txn.txn_type_name %>
       </td>
@@ -21,4 +21,4 @@
     <% end %>
   </table>
 
-</fieldset>
+</fieldset>

data/app/views/admin/payments/credit.html.erb

@@ -2,7 +2,7 @@
 
 <%= form_tag do %>
   <h3><%= t('refund') %></h3>
-  <fieldset>
+  <fieldset data-hook="credit">
     <p>
       <label for="amount"><%= t("amount") %></label>
       <%= text_field_tag :amount, @payment.amount %>

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

@@ -1,4 +1,4 @@
-<div class='toolbar'>
+<div class="toolbar" data-hook="toolbar">
   <ul class='actions'>
 <% if @order.outstanding_balance? %>
     <li id='new_payment_section'>

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

@@ -8,12 +8,12 @@
 
   <%= render "form", :f => f %>
 
-  <p class="form-buttons">
+  <p class="form-buttons" data-hook="buttons">
     <%= button @order.cart? ? t('continue') : t('update') %>
   </p>
 
 <% end %>
 
 <% content_for :head do %>
-<%= javascript_include_tag 'admin/payments/new' %>
+<%= javascript_include_tag '/admin/javascripts/payments/new.js' %>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <h2><%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
 
-<p>
+<p data-hook="amount">
   <label><%= t("amount") %>:</label>
   <%= @payment.amount %>
 </p>

data/app/views/admin/payments/source_forms/_gateway.html.erb

@@ -1,18 +1,18 @@
 <fieldset>
   
-  <p class="field">
+  <p class="field" data-hook="previous_cards">
     <% for card in @previous_cards %>
       <label><%= radio_button_tag :card, card.id, card == @previous_cards.first %> <%= card.display_number %><br /></label>
     <% end %>
     <label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= t(:use_new_cc) %></label>
   </p>
   
-  <div id="card_form">
+  <div id="card_form" data-hook>
 
-    <%= image_tag "creditcard.gif", :id => 'creditcard-image' %>
+    <%= image_tag "creditcards/creditcard.gif", :id => 'creditcard-image' %>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-    <div>
+    <div data-hook="card_number">
       <label for=""><%= t("card_number") %></label><br />
       <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required', :size => 19, :maxlength => 19 %>
       <span class="req">*</span>
@@ -23,13 +23,13 @@
         )
       </span>
     </div>
-    <div>
+    <div data-hook="card_expiration">
       <label for=""><%= t("expiration") %></label><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>
     </div>
-    <div>           
+    <div data-hook="card_code">
       <label for=""><%= t("card_code") %></label><br />
       <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required', :size => 5 %>
       <span class="req">*</span>

data/app/views/admin/payments/source_views/_gateway.html.erb

@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset data-hook="creditcard">
   <legend><%= t('creditcard') %></legend>
 
   <table class="index">

data/app/views/admin/product_groups/_preview.html.erb

@@ -3,23 +3,23 @@
 <h2><%= ProductGroup.human_attribute_name(:products) %> (<%= count %>)</h2>
 
 <% if count == 0 %>
-  <p><%= t('no_match_found') %></p>
+  <p data-hook="preview_empty"><%= t('no_match_found') %></p>
 <% else %>
 
   <% if count > Spree::Config[:admin_pgroup_preview_size] %>
-    <p><%= t('showing_first_n', :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
+    <p data-hook="preview_showing"><%= t('showing_first_n', :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
   <% end %>
 
-  <table class="index">
+  <table class="index" data-hook="preview">
     <thead>
-    <tr>
-      <th><%= Product.human_attribute_name(:name) %></th>
-      <th><%= t(:action) %></th>
-    </tr>
+      <tr data-hook="preview_header">
+        <th><%= Product.human_attribute_name(:name) %></th>
+        <th><%= t(:action) %></th>
+      </tr>
     </thead>
     <tbody>
     <% preview.each do |product| %>
-      <tr>
+      <tr data-hook="preview_row">
         <td>
           <%= link_to product.name, product_url(product) %>
         </td>

data/app/views/admin/product_groups/_product_scope.html.erb

@@ -1,11 +1,11 @@
-<tr id="<%= dom_id product_scope %>">
-  <td>
+<tr id="<%= dom_id product_scope %>" data-hook="product_scope">
+  <td data-hook="description">
     <label><%= t(:name, :scope => [:product_scopes, :scopes, product_scope.name]) %></label>
     <% if description = t(:description, :scope => [:product_scopes, :scopes, product_scope.name], :default => "") and description.present? %>
       <br /><%= description %>
     <% end %>
   </td>
-  <td>
+  <td data-hook="arguments">
     <% if arguments = Scopes::Product.arguments_for_scope_name(product_scope.name.strip) %>
       <table><tr>
       <% arguments.each_with_index do |argument, i| %>
@@ -18,7 +18,7 @@
       </tr></table>
     <% end %>
   </td>
-  <td class="actions">
-    <%= link_to_with_icon 'cross', '', admin_product_group_product_scope_path(@product_group, product_scope), 'data-remote' => true, 'data-method' => 'delete' %>
+  <td class="actions" data-hook="actions">
+    <%= link_to_with_icon 'cross', '', admin_product_group_product_scope_path(@product_group, product_scope), :remote => true, :method => 'delete' %>
   </td>
 </tr>

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

@@ -2,9 +2,9 @@
 
 <h1><%= t('editing_product_group') %></h1>
 
-<fieldset id="product_group_forms_container">
+<fieldset id="product_group_forms_container" data-hook>
 
-  <%= form_for(@product_group, :url => object_url, :html => { :id => 'product-group-form', :method => :put, 'data-remote' => true }) do |f| %>
+  <%= form_for([:admin, @product_group], :html => { :id => 'product-group-form', :method => :put, :remote => true }) do |f| %>
 
       <%= f.field_container :name do %>
         <%= f.label :name, t("name") %><br />
@@ -17,16 +17,15 @@
         <%= f.select(:order_scope, Scopes::Product::ORDERING.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
       <% end %>
 
-      <table id="product_scopes">
+      <table id="product_scopes" data-hook>
         <%= render :partial => 'product_scope', :collection => @product_group.product_scopes.reject {|s| s.is_ordering? } %>
       </table>
 
-    <%=  button t("update") %>
+    <%= button t("update") %>
 
   <% end %>
 
-
-  <%= form_tag(admin_product_group_product_scopes_path(@product_group), 'data-remote' => true, :id => 'new_product_group_form') do %>
+  <%= form_tag(admin_product_group_product_scopes_path(@product_group), :remote => true, :id => 'new_product_group_form') do %>
     <%
     options =
     grouped_options_for_select(
@@ -47,10 +46,8 @@
     </p>
   <% end %>
 
-
 </fieldset>
 
-
-<fieldset id="preview_container">
+<fieldset id="preview_container" data-hook>
   <%= render 'preview' %>
 </fieldset>

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

@@ -1,6 +1,6 @@
 <% render 'admin/shared/product_sub_menu' %>
-<div class='toolbar'>
-  <ul class='actions'>
+<div class="toolbar" data-hook="toolbar">
+  <ul class="actions">
     <li>
       <%= button_link_to t("new_product_group"), new_object_url, :icon => 'add', :id => 'new_product_group_link' %>
     </li>
@@ -10,9 +10,9 @@
 
 <h1><%= t("listing_product_groups") %></h1>
 
-<table class="index" id='listing_product_groups'>
+<table class="index" id='listing_product_groups' data-hook>
   <thead>
-    <tr>
+    <tr data-hook="product_group_header">
       <th><%= ProductGroup.human_attribute_name("name") %></th>
       <th><%= ProductGroup.human_attribute_name("url") %></th>
       <th><%= ProductGroup.human_attribute_name("product_scopes")  %></th>
@@ -22,7 +22,7 @@
   </thead>
   <tbody>
     <% @product_groups.each do |pg| %>
-      <tr id="<%= dom_id pg %>">
+      <tr id="<%= dom_id pg %>" data-hook="product_group_row">
         <td><%= link_to pg.name, [:admin, pg] %></td>
         <td><%= link_to pg_search_path(:product_group_name => pg.permalink), pg_search_path(:product_group_name => pg.permalink) %></td>
         <td><%== pg.product_scopes.map(&:to_sentence).join("<br />") %></td>
@@ -34,4 +34,4 @@
     <% end %>
   </tbody>
 </table>
-<%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
+<%= paginate @product_groups %>

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

@@ -1,6 +1,6 @@
 <%= render 'admin/shared/product_sub_menu' %>
-<%= form_for(:product_group,  :url => collection_url, :html => { :id => 'product-group-form', :multipart => true }) do |f| %>
-  <fieldset>
+<%= form_for([:admin, @product_group], :html => { :id => 'product-group-form', :multipart => true }) do |f| %>
+  <fieldset data-hook="name">
     <legend><%= t(:product_group) %></legend>
     <%= f.field_container :name do %>
       <%= f.label :name, t("name") %>

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

@@ -8,16 +8,16 @@
 </p>
 
 <h2><%= ProductGroup.human_attribute_name(:product_scopes) %>(<%= @product_group.product_scopes.count %>)</h2>
-<table class="product-scopes">
+<table class="product-scopes" data-hook="product_scopes">
   <thead>
-    <tr>
+    <tr data-hook="product_scopes_header">
       <th><%= ProductScope.human_attribute_name(:description) %></th>
       <th><%= ProductScope.human_attribute_name(:arguments) %></th>
     </tr>
   </thead>
   <tbody>
     <% @product_group.product_scopes.each do |product_scope| %>
-      <tr <%= !product_scope.valid? ? "class='invalid'":'' %>>
+      <tr <%= !product_scope.valid? ? "class='invalid'":'' %> data-hook="product_scopes_row">
         <td>
           <%= product_scope.to_sentence %>
         </td>
@@ -29,4 +29,4 @@
   </tbody>
 </table>
 
-<%= render :partial => 'preview.html' %>
+<%= render :partial => 'preview.html' %>