spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,113 +1,154 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_orders) %>
+  <%= Spree::Order.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => 'plus', :id => 'admin_new_order' %>
-  </li>
+  <%= button_link_to Spree.t(:new_order), new_admin_order_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_order' %>
 <% end if can? :edit, Spree::Order.new %>
 
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
-<% end %>
-
 <% 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 :q_created_at_gt, Spree.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 => Spree.t(:start) %>
+      <div class="row">
+        <div class="date-range-filter col-md-8">
+          <div class="form-group">
+            <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+            <div class="row no-padding-bottom">
+              <div class="col-md-6">
+                <div class="input-group">
+                  <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from form-control', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+                  <span class="input-group-addon">
+                    <i class="icon icon-calendar"></i>
+                  </span>
+                </div>
+
+              </div>
+              <div class="col-md-6">
+                <div class="input-group">
+                  <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to form-control', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+                  <span class="input-group-addon">
+                    <i class="icon icon-calendar"></i>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
 
-            <span class="range-divider">
-              <i class="fa fa-arrow-right"></i>
-            </span>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
+            <%= f.text_field :number_cont, class: 'form-control js-quick-search-target' %>
+          </div>
+        </div>
+
+      </div>
 
-            <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+      <div class="row">
+
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_state_eq, Spree.t(:status) %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
           </div>
         </div>
 
-        <div class="field">
-          <%= label_tag :q_state_eq, Spree.t(:status) %>
-          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
+            <%= f.text_field :payment_state_eq, class: 'form-control js-filterable' %>
+          </div>
         </div>
 
-        <div class="field">
-          <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
+            <%= f.text_field :shipment_state_eq, class: 'form-control js-filterable' %>
+          </div>
         </div>
+
       </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
-          <%= f.text_field :number_cont %>
+      <div class="row">
+
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+            <%= f.text_field :bill_address_firstname_start, class: 'form-control' %>
+          </div>
         </div>
 
-        <div class="field">
-          <%= label_tag :q_email_cont, Spree.t(:email) %>
-          <%= f.text_field :email_cont %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+            <%= f.text_field :bill_address_lastname_start, class: 'form-control' %>
+          </div>
         </div>
 
-        <div class="field">
-          <%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
-          <%= f.select :line_items_variant_id_in, Spree::Variant.having_orders.order(:sku).pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_email_cont, Spree.t(:email) %>
+            <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
+          </div>
         </div>
+
       </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-          <%= f.text_field :bill_address_firstname_start, :size => 25 %>
-        </div>
-        <div class="field">
-          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-          <%= f.text_field :bill_address_lastname_start, :size => 25%>
+      <div class="row">
+
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
+            <%= f.select :line_items_variant_id_in, Spree::Variant.pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
+          </div>
         </div>
-      </div>
 
-      <div class="omega four columns">
-        <div class="field checkbox">
-          <label>
-            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
-            <%= Spree.t(:show_only_complete_orders) %>
-          </label>
-          <label>
-            <%= f.check_box :considered_risky_eq, {:checked => (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
-            <%= Spree.t(:show_only_considered_risky) %>
-          </label>
+        <div class="col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {:include_blank => true}, :class => 'select2' %>
+          </div>
         </div>
-      </div>
 
-      <div class="clearfix"></div>
+        <div class="col-md-4">
+
+          <div class="form-group">
+
+            <div class="checkbox">
+              <%= label_tag 'q_completed_at_not_null' do %>
+                <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
+                <%= Spree.t(:show_only_complete_orders) %>
+              <% end %>
+            </div>
+
+            <div class="checkbox">
+              <%= label_tag 'q_considered_risky_eq' do %>
+                <%= f.check_box :considered_risky_eq, {:checked => (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
+                <%= Spree.t(:show_only_considered_risky) %>
+              <% end %>
+            </div>
+
+          </div>
 
-      <div class="actions filter-actions">
-        <div data-hook="admin_orders_index_search_buttons">
-          <%= button Spree.t(:filter_results), 'search' %>
         </div>
+
       </div>
+
+      <div data-hook="admin_orders_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+
     <% end %>
+
   </div>
+
 <% end %>
 
-<%= paginate @orders %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @orders } %>
 
 <% if @orders.any? %>
-  <table class="index responsive" id="listing_orders" data-hook>
-    <colgroup>
-       <col style="width: 13%;">
-       <col style="width: 10%;">
-       <col style="width: 10%;">
-       <col style="width: 12%;">
-       <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-         <col style="width: 12%;">
-       <% end %>
-       <col style="width: 25%;">
-       <col style="width: 10%;">
-       <col style="width: 8%;">
-    </colgroup>
+  <table class="table" id="listing_orders" data-hook>
     <thead>
       <tr data-hook="admin_orders_index_headers">
         <% if @show_only_completed %>
@@ -130,23 +171,43 @@
     <tbody>
     <% @orders.each do |order| %>
       <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 class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
-        <td class="align-center"><span class="state <%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>"></span></td>
-        <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
-        <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
-          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
-            <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+        <td><%= l (@show_only_completed ? order.completed_at : order.created_at).to_date %></td>
+        <td><%= link_to order.number, edit_admin_order_path(order) %></td>
+        <td>
+          <span class="label label-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
+            <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
+          </span>
+        </td>
+        <td>
+          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
+        </td>
+        <td>
+          <% if order.payment_state %>
+            <span class="label label-<%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></span>
+            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_payment_state_eq" data-ransack-value="<%= order.payment_state %>"></span>
           <% end %>
+        </td>
+        <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <td>
+            <% if order.shipment_state %>
+              <span class="label label-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+              <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>"></span>
+            <% end %>
+          </td>
+        <% end %>
         <td>
           <% if order.user %>
             <%= link_to order.email, edit_admin_user_path(order.user) %>
           <% else %>
             <%= mail_to order.email %>
           <% end %>
+          <% if order.user || order.email %>
+            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_email_cont" data-ransack-value="<%= order.email %>"></span>
+          <% end %>
         </td>
-        <td class="align-center"><%= order.display_total.to_html %></td>
-        <td class='actions align-center' data-hook="admin_orders_index_row_actions">
+        <td><%= order.display_total.to_html %></td>
+        <td class='actions actions-1' 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>
@@ -154,10 +215,10 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/order')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_admin_order_url %>!
   </div>
 <% end %>
 
-<%= paginate @orders %>
+<%= render :partial => 'spree/admin/shared/index_table_options', :locals => { :collection => @orders, :simple => true } %>

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

@@ -1,11 +1,11 @@
 <div data-hook="admin_payment_method_form_fields">
 
-  <div data-hook="payment_method">
+  <div data-hook="payment_method" class="row">
 
-    <div class="alpha four columns">
-      <div id="preference-settings" data-hook class="field">
+    <div class="col-md-4">
+      <div id="preference-settings" data-hook class="form-group">
         <%= f.label :type, Spree.t(:provider) %>
-        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth'}) %>
+        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2'}) %>
 
         <% unless @object.new_record? %>
           <%= preference_fields(@object, f) %>
@@ -15,45 +15,41 @@
           <% end %>
         <% end %>
       </div>
-      <div data-hook="environment" class="field">
-        <%= label_tag :payment_method_environment, Spree.t(:environment) %>
-        <%= collection_select(:payment_method, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'}) %>
-      </div>
-      <div data-hook="display" class="field">
+      <div data-hook="display" class="form-group">
         <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
+        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2'}) %>
       </div>
-      <div data-hook="auto_capture" class="field">
+      <div data-hook="auto_capture" class="form-group">
         <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
+        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2'}) %>
       </div>
-      <div data-hook="active" class="field">
-        <%= label_tag nil, Spree.t(:active) %>
-        <ul>
-          <li>
+      <div data-hook="active" class="form-group">
+        <strong><%= Spree.t(:active) %></strong>
+        <div class="radio">
+          <%= label_tag :payment_method_active_true do %>
             <%= radio_button :payment_method, :active, true %>
-            <%= label_tag :payment_method_active_true, Spree.t(:say_yes) %>
-          </li>
-          <li>
+            <%= Spree.t(:say_yes) %>
+          <% end %>
+        </div>
+
+        <div class="radio">
+          <%= label_tag :payment_method_active_false do %>
             <%= radio_button :payment_method, :active, false %>
-            <%= label_tag :payment_method_active_false, Spree.t(:say_no) %>
-          </li>
-        </ul>
+            <%= Spree.t(:say_no) %>
+          <% end %>
+        </div>
       </div>
     </div>
 
-    <div class="omega eight columns">
-      <div data-hook="name" class="field">
+    <div class="col-md-8">
+      <div data-hook="name" class="form-group">
         <%= label_tag :payment_method_name, Spree.t(:name) %>
-        <%= text_field :payment_method, :name, :class => 'fullwidth' %>
+        <%= text_field :payment_method, :name, :class => 'form-control' %>
       </div>
-      <div data-hook="description" class="field">
+      <div data-hook="description" class="form-group">
         <%= label_tag :payment_method_description, Spree.t(:description) %>
-        <%= text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+        <%= text_area :payment_method, :description, { :cols => 60, :rows => 6, :class => 'form-control' } %>
       </div>
     </div>
-
   </div>
 </div>
-
-<div class="clear"></div>

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

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

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

@@ -1,44 +1,30 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:payment_methods) %>
+  <%= Spree::PaymentMethod.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_payment_method), new_object_url, :icon => 'plus', :id => 'admin_new_payment_methods_link' %>
-  </li>
+  <%= button_link_to Spree.t(:new_payment_method), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_payment_methods_link' %>
 <% end %>
 
 <% if @payment_methods.any? %>
-  <table class="index" id='listing_payment_methods'>
-    <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>
+  <table class="table" id='listing_payment_methods'>
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:provider) %></th>
-        <th><%= Spree.t(:environment) %></th>
-        <th><%= Spree.t(:display) %></th>
-        <th><%= Spree.t(:active) %></th>
+        <th class="text-center"><%= Spree.t(:display) %></th>
+        <th class="text-center"><%= Spree.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" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= method.name %></td>
-          <td class="align-center"><%= method.type %></td>
-          <td class="align-center"><%= method.environment.to_s.titleize %></td>
-          <td class="align-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
-          <td class="align-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td data-hook="admin_payment_methods_index_row_actions" class="actions">
+        <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
+          <td><%= method.name %></td>
+          <td><%= method.type %></td>
+          <td class="text-center"><%= method.display_on.blank? ? Spree.t(:both) : Spree.t(method.display_on) %></td>
+          <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit method, :no_text => true %>
             <%= link_to_delete method, :no_text => true  %>
           </td>
@@ -47,9 +33,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/payment_method')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_payment_method_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::PaymentMethod.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>
-

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

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

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

@@ -1,6 +1,6 @@
 <% if @payment.capture_events.exists? %>
   <h3><%= Spree.t(:capture_events) %></h3>
-  <table class="index" id="capture_events">
+  <table class="table table-condensed table-bordered" id="capture_events">
     <thead>
       <tr data-hook="payments_header">
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
@@ -9,7 +9,7 @@
     </thead>
     <tbody>
       <% @payment.capture_events.each do |capture_event| %>
-        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row" class="<%= cycle('odd', 'even')%>">
+        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
           <td><%= pretty_time(capture_event.created_at) %></td>
           <td><%= capture_event.display_amount %></td>
         </tr>

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

@@ -1,36 +1,33 @@
-<div data-hook="admin_payment_form_fields" class="row">
-  <div class="alpha three columns">
-    <div class="field">
-      <%= f.label :amount, Spree.t(:amount) %>
-      <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'fullwidth' %>
-    </div>
+<div data-hook="admin_payment_form_fields">
+  <div class="form-group">
+    <%= f.label :amount, Spree.t(:amount) %>
+    <%= f.text_field :amount, :value => @order.display_outstanding_balance.money, :class => 'form-control' %>
   </div>
-  <div class="omega nine columns">
-    <div class="field">
-      <label><%= Spree.t(:payment_method) %></label>
-      <ul>
-        <% @payment_methods.each do |method| %>
-          <li data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
-            <label data-hook="payment_method_field">
-              <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method, { class: "payment_methods_radios" } %>
-              <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
-            </label>
-          </li>
-        <% end %>
-      </ul>
+  <div class="form-group">
+    <strong><%= Spree.t(:payment_method) %></strong>
+    <% @payment_methods.each do |method| %>
+      <div class="radio" data-id="<%= Spree.t(method.name, :scope => :payment_methods, :default => method.name).parameterize %>">
+        <label data-hook="payment_method_field">
+          <%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method, { class: "payment_methods_radios" } %>
+          <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+        </label>
+      </div>
+    <% end %>
 
-      <div class="payment-method-settings">
-        <% @payment_methods.each do |method| %>
+    <div class="payment-method-settings">
+      <% @payment_methods.each do |method| %>
 
-          <div class="payment-methods" id="payment_method_<%= method.id %>">
-            <% if method.source_required? %>
-              <br />
-              <%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}",
-                         :locals => { :payment_method => method, previous_cards: method.reusable_sources(@order) } %>
-            <% end %>
-          </div>
-        <% end %>
-      </div>
+        <div class="payment-methods" id="payment_method_<%= method.id %>">
+          <% if method.source_required? %>
+            <%=render :partial => "spree/admin/payments/source_forms/#{method.method_type}",
+                       :locals => {
+                         :payment_method => method,
+                         previous_cards: method.reusable_sources(@order)
+                       }
+            %>
+          <% end %>
+        </div>
+      <% end %>
     </div>
   </div>
 </div>