spree_core 1.2.5 → 1.3.0.rc1

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

@@ -1,10 +1,23 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:editing_payment_method) %></h1>
+<% content_for :page_title do %>
+  <%= t(:editing_payment_method) %> <i class="icon-arrow-right"></i> <%= @payment_method.name %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_payment_methods_list), spree.admin_payment_methods_path, :icon => 'icon-arrow-left' %>
+  </li>  
+<% end %>
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
-<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method), :method => :put do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <p data-hook="buttons">
-    <%= submit_tag t(:update) %>
-  </p>
+
+<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method) do |f| %>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div data-hook="buttons" class="filter-actions actions">
+      <%= button t(:update), 'icon-refresh' %>
+    </div>
+  </fieldset>
+
 <% end %>

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

@@ -1,37 +1,43 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<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' %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
+<% content_for :page_title do %>
+  <%= t(:payment_methods) %>
+<% end %>
 
-<h1><%= t(:payment_methods) %></h1>
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_payment_method), new_object_url, :icon => 'icon-plus', :id => 'admin_new_payment_methods_link' %>
+  </li>
+<% end %>
 
 <table class="index" id='listing_payment_methods'>
-  <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>
+  <colgroup>
+    <col style="width: 15%">
+    <col style="width: 35%">
+    <col style="width: 15%">
+    <col style="width: 10%">
+    <col style="width: 10%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <tr data-hook="admin_payment_methods_index_headers">
+      <th><%= t(:name) %></th>
+      <th><%= t(:provider) %></th>
+      <th><%= t(:environment) %></th>
+      <th><%= t(:active) %></th>
+      <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
+    </tr>  
+  </thead>
   <tbody>
     <% @payment_methods.each do |method|%>
-      <tr id="<%= spree_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 %>
+      <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows" class="<%= cycle('odd', 'even')%>">
+        <td class="align-center"><%= method.name %></td>
+        <td><%= method.type %></td>
+        <td class="align-center"><%= method.environment.to_s.titleize %></td>
+        <td class="align-center"><%= method.active ? t(:yes) : t(:no) %></td>
+        <td data-hook="admin_payment_methods_index_row_actions" class="actions">
+          <%= link_to_edit method, :no_text => true %>
+          <%= link_to_delete method, :no_text => true  %>
         </td>
       </tr>
     <% end %>

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

@@ -1,11 +1,22 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
-<h1><%= t(:new_payment_method) %></h1>
+<% content_for :page_title do %>
+  <%= t(:new_payment_method) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:back_to_payment_methods_list), admin_payment_methods_path, :icon => 'icon-arrow-left' %>
+  </li>  
+<% end %>
+
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment_method } %>
 
 <%= form_for @payment_method, :url => collection_url do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <p data-hook="buttons">
-    <%= submit_tag t(:create) %>
-  </p>
+  <fieldset class="no-border-top">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div data-hook="buttons" class="filter-actions actions">
+      <%= button t(:create), 'icon-ok' %>
+    </div>
+  </fieldset>
 <% end %>

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

@@ -1,17 +1,28 @@
-<div data-hook="admin_payment_form_fields">
-  <p>
-    <%= f.label :amount, t(:amount) %>
-    <%= f.text_field :amount, :size => 8, :value => @order.outstanding_balance %>
-  </p>
-
-  <% @payment_methods.each do |method| %>
-
-    <label data-hook="payment_method_field">
-      <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
-      <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
-    </label>
-
-    <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
-
-  <% end %>
+<div data-hook="admin_payment_form_fields" class="row">
+  <div class="alpha three columns">
+    <div class="field">
+      <%= f.label :amount, t(:amount) %>
+      <%= f.text_field :amount, :value => @order.outstanding_balance, :class => 'fullwidth' %>
+    </div>
+  </div>
+  <div class="omega nine columns">
+    <div class="field">
+      <label><%= t(:payment_method) %></label>
+      <ul>
+        <% @payment_methods.each do |method| %>
+          <li>
+            <label data-hook="payment_method_field">
+              <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
+              <%= t(method.name, :scope => :payment_methods, :default => method.name) %>
+            </label>
+          </li>
+        <% end %>
+      </ul>
+      <div class="payment-method-settings">
+        <% @payment_methods.each do |method| %>
+          <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}", :locals => { :payment_method => method } %>
+        <% end %>
+      </div>
+    </div>
+  </div>
 </div>

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

@@ -1,22 +1,26 @@
 <table class="index">
-  <tr data-hook="payments_header">
-    <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-    <th><%= t(:amount, :scope => 'activerecord.attributes.spree/payment') %></th>
-    <th><%= t(:payment_method) %></th>
-    <th><%= t(:payment_state) %></th>
-    <th><%= t(:payment_actions) %></th>
-  </tr>
-  <% payments.each do |payment| %>
-    <tr data-hook="payments_row">
-      <td><%= payment.created_at.to_s(:date_time24) %></td>
-      <td><%= money(payment.amount) %></td>
-      <td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
-      <td><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></td>
-      <td>
-        <% payment.actions.each do |action| %>
-          <%= button_to t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put %>
-        <% end %>
-      </td>
+  <thead>
+    <tr data-hook="payments_header">
+      <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
+      <th><%= t(:amount, :scope => 'activerecord.attributes.spree/payment') %></th>
+      <th><%= t(:payment_method) %></th>
+      <th><%= t(:payment_state) %></th>
+      <th class="actions"></th>
     </tr>
-  <% end %>
+  </thead>
+  <tbody>
+    <% payments.each do |payment| %>
+      <tr data-hook="payments_row" class="<%= cycle('odd', 'even')%>">
+        <td><%= pretty_time(payment.created_at) %></td>
+        <td class='align-center'><%= payment.display_amount %></td>
+        <td class="align-center"><%= link_to payment_method_name(payment), spree.admin_order_payment_path(@order, payment) %></td>
+        <td class="align-center"> <span class="state <%= payment.state %>"><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
+        <td class="actions">
+          <% payment.actions.each do |action| %>
+            <%= link_to_with_icon "icon-#{action}", t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>

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

@@ -1,5 +1,9 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
 
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= t(:refund) %>
+<% end %>
+
 <%= form_tag do %>
   <h3><%= t(:refund) %></h3>
   <fieldset data-hook="credit">

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

@@ -1,22 +1,23 @@
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-<% if @order.outstanding_balance? %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+
+<% content_for :page_actions do %>  
+  <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
-      <%= button_link_to t(:new_payment), new_admin_order_payment_url(@order), :icon => 'add' %>
+      <%= button_link_to t(:new_payment), new_admin_order_payment_url(@order), :icon => 'icon-plus' %>
     </li>
+  <% end %>  
+  <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
-  </ul>
-  <br class="clear" />
-</div>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= t(:payments) %>
+<% end %>
 
 <% if @order.outstanding_balance? %>
-  <p><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %> <strong><%= money(@order.outstanding_balance) %></strong></p>
+  <h5 class="outstanding-balance"><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong></h5>
 <% end %>
 
-<h2><%= t(:payments) %></h2>
 <%= render :partial => 'list', :locals => { :payments => @payments } %>
 
 
-<%= button_link_to t(:continue), admin_orders_url %>
+<%= button_link_to t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>

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

@@ -1,18 +1,24 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
 
-<h2><%= t(:new) %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= t(:new) %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %>  
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'icon-arrow-left' %></li>
+<% end %>
 
 <% if @payment_methods.any? %>
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment } %>
 
   <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
+    <fieldset class="no-border-top">
+      <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <%= render :partial => 'form', :locals => { :f => f } %>
-
-    <p class="form-buttons" data-hook="buttons">
-      <%= button @order.cart? ? t(:continue) : t(:update) %>
-    </p>
-
+      <div class="filter-actions actions" data-hook="buttons">
+        <%= button @order.cart? ? t(:continue) : t(:update), @order.cart? ? 'icon-arrow-right' : 'icon-refresh' %>
+      </div>
+    </fieldset>
   <% end %>
 <% else %>
   <%= t(:cannot_create_payment_without_payment_methods) %>

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

@@ -1,10 +1,18 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
 
-<h2><%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> 
+  <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %> 
+  <i class="icon-arrow-right"></i>
+  <%= payment_method_name(@payment) %>
+<% end %>
 
-<p data-hook="amount">
-  <%= label_tag nil, t(:amount) %>
-  <%= @payment.amount %>
-</p>
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'icon-arrow-left' %></li>
+<% end %>
 
 <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
+
+<div data-hook="amount" class="align-center">
+  <h5><%= label_tag nil, t(:amount) %>: <span class="green"><%= @payment.amount %></span> </h5>  
+</div>

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

@@ -1,40 +1,50 @@
-<fieldset>
-  <p class="field" data-hook="previous_cards">
+<fieldset class="no-border-bottom">
+  <div class="field" data-hook="previous_cards">
     <% @previous_cards.each do |card| %>
       <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>
   <div id="card_form" data-hook>
-    <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
+    <div class="nine columns">
+      <%= image_tag 'credit_cards/credit_card.gif', :id => 'credit-card-image' %>
+    </div>
+    
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-    <div data-hook="card_number">
-      <%= label_tag nil, t(:card_number) %><br />
-      <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required', :size => 19, :maxlength => 19 %>
-      <span class="required">*</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>
+    <div class="clear"></div>
+
+    <div class="alpha four columns">
+      <div data-hook="card_number">
+        <div class="field">
+          <%= label_tag nil, raw(t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
+          <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth', :maxlength => 19 %>
+          <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>
+        </div>
+      </div>
     </div>
-    <div data-hook="card_expiration">
-      <%= 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="required">*</span>
+    <div class="three columns">
+      <div data-hook="card_expiration" class="field">
+        <%= label_tag nil, raw(t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
+        <%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required select2') %>
+        <%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required select2') %>
+      </div>
     </div>
-    <div data-hook="card_code">
-      <%= label_tag nil, t(:card_code) %><br />
-      <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required', :size => 5 %>
-      <span class="required">*</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">
-        (<%= t(:whats_this) %>)
-      </a>
+    <div class="omega two columns">
+      <div data-hook="card_code" class="field">
+        <%= label_tag nil, raw(t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
+        <%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required fullwidth', :size => 5 %>
+        <a href="/content/cvv" class="info" 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">
+          (<%= t(:whats_this) %>)
+        </a>
+      </div>
     </div>
 
+    <div class="clear"></div>
   </div>
 
 </fieldset>

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

@@ -1,34 +1,29 @@
 <fieldset data-hook="credit_card">
-  <legend><%= t(:credit_card) %></legend>
+  <legend align="center"><%= t(:credit_card) %></legend>
 
-  <table class="index">
-    <tr>
-      <th colspan="6"><%= t(:card_details) %></th>
-    </tr>
-    <tr>
-      <td><%= label_tag nil, t(:card_number) %>:</td>
-      <td>
-        <%= payment.source.display_number %>
-      </td>
-      <td><%= label_tag nil, t(:expiration) %>:</td>
-      <td>
-        <%= payment.source.month %>/<%= payment.source.year %>
-      </td>
-      <td><%= label_tag nil, t(:card_code) %>:</td>
-      <td>
-        <%= payment.source.verification_value %>
-      </td>
-    </tr>
-    <tr>
-      <td><%= label_tag nil, t(:maestro_or_solo_cards) %>:</td>
-      <td>
-        <%= payment.source.issue_number %>
-      </td>
-      <td><%= label_tag nil, t(:start_date) %>:</td>
-      <td colspan="3">
-        <%= payment.source.start_month %>/<%= payment.source.start_year %>
-      </td>
-    </tr>
-  </table>
-</fieldset>
+  <div class="row">
+    <div class="alpha six columns">      
+      <dl>
+        <dt><%= t(:card_number) %>:</dt>
+        <dd><%= payment.source.display_number %></dd>
 
+        <dt><%= t(:expiration) %>:</dt>
+        <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
+
+        <dt><%= t(:card_code) %>:</dt>
+        <dd><%= payment.source.verification_value %></dd>
+      </dl>
+    </div>
+
+    <div class="omega six columns">
+      <dl>
+        <dt><%= t(:maestro_or_solo_cards) %>:</dt>
+        <dd><%= payment.source.issue_number %></dd>
+
+        <dt><%= t(:start_date) %>:</dt>
+        <dd><%= payment.source.start_month %>/<%= payment.source.start_year %></dd>
+      </dl>
+    </div>    
+  </div>
+
+</fieldset>