spree_core 1.2.5 → 1.3.0.rc1

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -1,48 +1,66 @@
-<div data-hook="admin_customer_detail_form_fields">
-  <h3><%= t(:customer_details) %></h3>
-  <table class="index" data-hook="customer_guest">
-    <thead>
-      <th colspan="8"><%= t(:account) %></th>
-    </thead>
-    <tbody>
-      <tr data-hook="customer_fields">
-        <td class="lbl-col"><%= f.label :email, t(:email) + ':' %></td>
-        <td class="val-col" colspan="3"><%= f.email_field :email, :class => 'fullwidth' %></td>
-        <td class="lbl-col"><%= label_tag nil, t(:guest_checkout) %>:</td>
-        <td class="val-col" colspan="3">
-          <% if @order.completed? %>
-            <%= @order.user.nil? ? t(:yes) : t(:no) %>
-          <% else %>
-            <% guest = @order.user.nil? || @order.user.anonymous? %>
-            <label class="sub">
-              <%= radio_button_tag :guest_checkout, true, guest %>
-              <%= t(:yes) %>
-            </label> &nbsp;
-            <label class="sub">
-              <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
-              <%= t(:no) %>
-            </label>
-            <%= hidden_field_tag :user_id, @order.user_id %>
-          <% end %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+<fieldset data-hook="admin_customer_detail_form_fields" class="no-border-top">
+  
+  <fieldset class="index no-border-bottom" data-hook="customer_guest">
+    <legend align="center"><%= t(:account) %></legend>
+      
+    <div data-hook="customer_fields" class="row">
+      <div class="alpha eight columns">
+        <div class="field">
+          <%= f.label :email, t(:email) + ':' %>
+          <%= f.email_field :email, :class => 'fullwidth' %>
+        </div>
+      </div>
+      <div class="omega four columns">
+        <div class="field">
+          <%= label_tag nil, t(:guest_checkout) %>:
+          <ul>
+            <% if @order.completed? %>
+              <li>
+                <%= @order.user.nil? ? t(:yes) : t(:no) %>
+              </li>
+            <% else %>
+              <% guest = @order.user.nil? || @order.user.anonymous? %>
+              <li>
+                <%= radio_button_tag :guest_checkout, true, guest %>
+                <%= t(:yes) %>
+              </li>
+              <li>
+                <%= radio_button_tag :guest_checkout, false, !guest, :disabled => @order.cart? %>
+                <%= t(:no) %>  
+              </li>              
+              <%= hidden_field_tag :user_id, @order.user_id %>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </fieldset>
 
-  <h3><%= Spree::Address.model_name.human(:count => 2) %></h3>
-  <%= f.fields_for :bill_address do |ba_form| %>
-    <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => t(:billing_address), :use_billing => false } %>
-  <% end %>
+  <div data-hook="bill_address_wrapper" class="alpha six columns">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= t(:billing_address) %></legend>
+      <%= f.fields_for :bill_address do |ba_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :name => t(:billing_address), :use_billing => false } %>
+      <% end %>
+    </fieldset>
+  </div>
+  
+  <div class="omega six columns" data-hook="ship_address_wrapper">
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= t(:shipping_address) %></legend>
+      <%= f.fields_for :ship_address do |sa_form| %>
+        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => t(:shipping_address), :use_billing => true } %>
+      <% end %>    
+    </fieldset>
+  </div>
 
-  <%= f.fields_for :ship_address do |sa_form| %>
-    <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :name => t(:shipping_address), :use_billing => true } %>
-  <% end %>
+  <div class="clear"></div>
 
-  <p class="form-buttons" data-hook="buttons">
-    <%= button @order.cart? ? t(:continue) : t(:update) %>
-  </p>
+  <div class="form-buttons filter-actions actions" data-hook="buttons">
+    <%= button @order.cart? ? t(:continue) : t(:update), @order.cart? ? 'icon-arrow-right' : 'icon-refresh' %>
+  </div>
 
   <% content_for :head do %>
     <%= javascript_include_tag states_path, 'admin/address_states.js' %>
   <% end %>
-</div>
+</fieldset>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -1,10 +1,19 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
+
 <%= csrf_meta_tags %>
 
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i> <%= t(:customer_details) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
 <% if @order.cart? %>
   <div id="add-line-item" data-hook>
-    <fieldset>
-      <legend><%= t(:customer_search) %></legend>
+    <fieldset class="no-border-bottom">
+      <legend align="center"><%= t(:customer_search) %></legend>
       <%= label_tag :customer_search, t(:enter_at_least_five_letters) %>
       <%= text_field_tag :customer_search,  nil, :class => 'fullwidth title' %>
     </fieldset>

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

@@ -1,12 +1,9 @@
 <%= csrf_meta_tags %>
-<div class="order-links" data-hook="admin_order_edit_buttons">
-  <div class="toolbar">
-    <%= event_links %>
-  </div>
-  <div class="toolbar">
-    <%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'send-email' %>
-  </div>
-</div>
+<% content_for :page_actions do %>
+  <li><%= event_links %></li>
+  <li><%= button_link_to t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'icon-email' if @order.user %></li>
+  <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
 

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

@@ -1,12 +1,100 @@
-<div class='toolbar order-links'>
-  <%= button_link_to t(:new_order), new_admin_order_url, :icon => 'add', :id => 'admin_new_order' %>
-</div>
+<% content_for :page_title do %>
+  <%= t(:listing_orders) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:new_order), new_admin_order_url, :icon => 'icon-plus', :id => 'admin_new_order' %>
+  </li>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= t(:search) %>
+<% end %>
 
-<%= render :partial => 'spree/admin/shared/order_sub_menu' %>
+<% content_for :table_filter do %>
+  <div data-hook="admin_orders_index_search">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div class="field-block alpha four columns">          
+        <div class="date-range-filter field">
+          <%= label_tag nil, t(:date_range) %>
+          <div class="date-range-fields">
+            <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => t(:start) %>
+            
+            <span class="range-divider">
+              <i class="icon-arrow-right"></i>
+            </span>
+              
+            <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => t(:stop) %>
+          </div>
+        </div>
 
-<h1><%= t(:listing_orders) %></h1>
+        <div class="field">
+          <%= label_tag nil, t(:status) %>
+          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>  
+        </div>
+      </div>
+      
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, t(:order_number) %>
+          <%= f.text_field :number_cont %>
+        </div>
+        <div class="field">
+          <%= label_tag nil, t(:email) %>
+          <%= f.email_field :email_cont %>
+        </div>
+      </div>
+      
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, t(:first_name_begins_with) %>
+          <%= f.text_field :bill_address_firstname_start, :size => 25 %>
+        </div>
+        <div class="field">
+          <%= label_tag nil, t(:last_name_begins_with) %>
+          <%= f.text_field :bill_address_lastname_start, :size => 25%>
+        </div>
+      </div>
+      
+      <div class="omega four columns">
+        <div class="field checkbox">
+          <label>
+            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
+            <%= t(:show_only_complete_orders) %>
+          </label>
+        </div>
+
+        <div class="field checkbox">
+          <label>
+            <%= f.check_box :inventory_units_shipment_id_null, { }, '1', '0' %>
+            <%= t(:show_only_unfulfilled_orders) %>
+          </label>
+        </div>
+      </div>
 
-<table class="index" id="listing_orders" data-hook>
+      <div class="clearfix"></div>
+
+      <div class="actions filter-actions">
+        <div data-hook="admin_orders_index_search_buttons">
+          <%= button t(:filter_results), 'icon-search' %>
+        </div>
+      </div>
+    <% end %>    
+  </div>
+<% end %>
+
+<table class="index responsive" id="listing_orders" data-hook>
+  <colgroup>
+     <col style="width: 16%;">
+     <col style="width: 10%;">
+     <col style="width: 13%;">
+     <col style="width: 13%;">
+     <col style="width: 13%;">
+     <col style="width: 17%;">
+     <col style="width: 10%;">
+     <col style="width: 8%;">
+  </colgroup>
   <thead>
     <tr data-hook="admin_orders_index_headers">
       <% if @show_only_completed %>
@@ -20,75 +108,25 @@
       <th><%= sort_link @search, :shipment_state, t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
       <th><%= sort_link @search, :email,          t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
       <th><%= sort_link @search, :total,          t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
-      <th data-hook="admin_orders_index_header_actions"></th>
+      <th data-hook="admin_orders_index_header_actions" class="actions"></th>
     </tr>
   </thead>
   <tbody>
   <% @orders.each do |order| %>
-    <tr data-hook="admin_orders_index_rows">
-      <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+    <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+      <td class="align-center"><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
       <td><%= link_to order.number, admin_order_path(order) %></td>
-      <td><%= t("order_state.#{order.state.downcase}") %></td>
-      <td><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></td>
-      <td><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></td>
-      <td><%= order.email %></td>
-      <td><%= order.display_total %></td>
-      <td class='actions' data-hook="admin_orders_index_row_actions">
-        <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}" %>
+      <td class="align-center"><span class="state <%= order.state.downcase %>"><%= t("order_state.#{order.state.downcase}") %></span></td>
+      <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
+      <td class="align-center"><span class="state <%= order.shipment_state %>"><%= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state %></span></td>
+      <td><%= mail_to order.email %></td>
+      <td class="align-center"><%= order.display_total %></td>
+      <td class='actions align-center' data-hook="admin_orders_index_row_actions">
+        <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>
       </td>
     </tr>
   <% end %>
   </tbody>
 </table>
-<%= paginate @orders %>
-
-
-<% content_for :sidebar do %>
-  <div class="box" data-hook="admin_orders_index_search">
-    <h3><%= t(:search) %></h3>
-    <%= search_form_for [:admin, @search] do |f| %>
-      <%= label_tag nil, t(:date_range) %><br />
-      <div class="date-range-filter">
-        <div class="left sub-field">
-          <%= f.text_field :created_at_gt, :class => 'datepicker', :value => params[:q][:created_at_gt] %><br />
-          <%= label_tag nil, t(:start), :class => 'sub' %>
-        </div>
-        <div class="right sub-field">
-          <%= f.text_field :created_at_lt, :class => 'datepicker', :value => params[:q][:created_at_lt] %><br />
-          <%= label_tag nil, t(:stop), :class => 'sub' %>
-        </div>
-      </div>
-
-      <p><%= label_tag nil, t(:status) %><br />
-      <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t("order_state.#{s.name}"), s.value]}, {:include_blank => true} %></p>
 
-      <p>
-        <%= label_tag nil, t(:order_number) %><br />
-        <%= f.text_field :number_cont, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:email) %><br />
-        <%= f.text_field :email_cont, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:first_name_begins_with) %><br />
-        <%= f.text_field :bill_address_firstname_start, :size => 25 %>
-      </p>
-      <p>
-        <%= label_tag nil, t(:last_name_begins_with) %><br />
-        <%= f.text_field :bill_address_lastname_start, :size => 25 %>
-      </p>
-      <p>
-        <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
-        <%= label_tag nil, t(:show_only_complete_orders) %>
-      </p>
-      <p>
-        <%= f.check_box :inventory_units_shipment_id_null, { }, '1', '0' %>
-        <%= label_tag nil, t(:show_only_unfulfilled_orders) %>
-      </p>
-      <div data-hook="admin_orders_index_search_buttons">
-        <p><%= button t(:search) %></p>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+<%= paginate @orders %>

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

@@ -1,18 +1,29 @@
+<% content_for :page_title do %>
+  <%= t(:new) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
+
 <%= csrf_meta_tags %>
 
 <div data-hook="admin_order_new_header">
-  <h2><%= t(:new_order) %></h2>
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @order } %>
 </div>
 
 <%= render :partial => 'add_product' %>
 
-<div data-hook="admin_order_new_form">
-  <div id="order-form-wrapper">
-    <%= render :partial => 'form' %>
+<% unless @order.line_items.any? %>
+  <div data-hook="admin_order_new_form">
+    <div id="order-form-wrapper">
+      <%= render :partial => 'form' %>
+    </div>
   </div>
-</div>
+<% else %>
+<% end %>
 
 <% content_for :head do %>
   <%= javascript_tag 'var expand_variants = true;' %>

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

@@ -1,24 +1,33 @@
-<div class="toolbar order-links" data-hook="admin_order_show_buttons">
-  <%= button_link_to t(:cancel), fire_admin_order_url(@order.number, { :e => 'cancel' }), :icon => 'delete', :data => { :confirm => t(:are_you_sure) } if @order.can_cancel? %>
-  <%= button_link_to t(:edit), edit_admin_order_url(@order.number), :icon => 'edit' %>
-</div>
+<% content_for :page_actions do %>
+  <li>
+    <%= button_link_to t(:cancel), fire_admin_order_url(@order.number, { :e => 'cancel' }), :icon => 'icon-trash', :data => { :confirm => t(:are_you_sure) } if @order.can_cancel? %>  
+  </li>
+  <li>
+    <%= button_link_to t(:edit), edit_admin_order_url(@order.number), :icon => 'icon-edit' %>
+  </li>
+  <li><%= button_link_to t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
+<% end %>
+
 
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Order Details' } %>
 
-<div data-hook="admin_order_show_addresses">
+<div data-hook="admin_order_show_addresses" class="row">
   <% if @order.bill_address %>
-    <div class="adr">
-      <h4><%= t(:bill_address) %></h4>
-      <%= render :partial => 'spree/admin/shared/address', :locals => { :address => @order.bill_address } %>
-    </div>
+    <fieldset class="alpha six columns no-border-bottom">
+      <legend align="center"><%= t(:bill_address) %></legend>
+      <div class="align-center">
+        <%= render :partial => 'spree/admin/shared/address', :locals => { :address => @order.bill_address } %>  
+      </div>
+    </fieldset>
   <% end %>
   <% if @order.ship_address %>
-    <div class='adr'>
-      <h4><%= t(:ship_address) %></h4>
-      <%= render :partial => 'spree/admin/shared/address', :locals => { :address => @order.ship_address } %>
-    </div>
+    <fieldset class="omega six columns no-border-bottom">
+      <legend align="center"><%= t(:ship_address) %></legend>
+      <div class="align-center">
+        <%= render :partial => 'spree/admin/shared/address', :locals => { :address => @order.ship_address } %>
+      </div>
+    </fieldset>
     <% end %>
-  <hr />
 </div>
 
 <div data-hook="admin_order_show_details">

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

@@ -1,52 +1,53 @@
+<% # Usage of old-style form helpers in this file is INTENTIONAL
+   # For reasons, see commit 3e981c7. %>
 <div data-hook="admin_payment_method_form_fields">
-  <table data-hook="payment_method">
-    <tr data-hook="name">
-      <td><%= label_tag nil, t(:name) %></td>
-      <td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
-    </tr>
-    <tr data-hook="description">
-      <td><%= label_tag nil, t(:description) %></td>
-      <td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
-    </tr>
-    <tr data-hook="environment">
-      <td><%= label_tag nil, t(:environment) %></td>
-      <td>
-        <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
-      </td>
-    </tr>
-    <tr data-hook="display">
-      <td><%= label_tag nil, t(:display) %></td>
-      <td>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }) %>
-      </td>
-    </tr>
-    <tr data-hook="active">
-      <td><%= label_tag nil, t(:active) %></td>
-      <td>
-        <label class="sub">
-          <%= radio_button :payment_method, :active, true %>
-          <%= t(:yes) %>
-        </label> &nbsp;
-        <label class="sub">
-          <%= radio_button :payment_method, :active, false %>
-          <%= t(:no) %>
-        </label>
-      </td>
-    </tr>
-  </table>
 
-  <h2><%= t(:settings) %></h2>
+  <div data-hook="payment_method">
 
-  <div id="preference-settings" data-hook>
-    <%= f.label :type, t(:provider) %>
-    <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
+    <div class="alpha four columns">
+      <div id="preference-settings" data-hook class="field">
+        <%= f.label :type, t(:provider) %>
+        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth'}) %>
 
-    <% unless @object.new_record? %>
-      <%= preference_fields(@object, f) %>
+        <% unless @object.new_record? %>
+          <%= preference_fields(@object, f) %>
 
-      <% if @object.respond_to?(:preferences) %>
-        <div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
-      <% end %>
-    <% end %>
+          <% if @object.respond_to?(:preferences) %>
+            <div id="gateway-settings-warning" class="info warning"><%= t(:provider_settings_warning) %></div>
+          <% end %>
+        <% end %>
+      </div>      
+      <div data-hook="environment" class="field">
+        <%= label_tag nil, t(:environment) %>
+        <%= collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>        
+      </div>
+      <div data-hook="active" class="field">
+        <%= label_tag nil, t(:active) %>
+        <ul>
+          <li>
+            <%= radio_button :payment_method, :active, true %>
+            <%= label_tag nil, t(:yes) %>
+          </li>        
+          <li>
+            <%= radio_button :payment_method, :active, false %>
+            <%= label_tag nil, t(:no) %>
+          </li>
+        </ul>
+      </div>
+    </div>
+    
+    <div class="omega eight columns">
+      <div data-hook="name" class="field">
+        <%= label_tag nil, t(:name) %>
+        <%= text_field :payment_method, :name, :class => 'fullwidth' %>
+      </div>
+      <div data-hook="description" class="field">
+        <%= label_tag nil, t(:description) %>
+        <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+      </div>  
+    </div>
+    
   </div>
 </div>
+
+<div class="clear"></div>