spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,7 +1,7 @@
-<div data-hook="admin_inside_taxonomy_form" class="field align-center">
-  <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-    <%= error_message_on :taxonomy, :name, :class => 'fullwidth title' %>
-    <%= text_field :taxonomy, :name %>
+<div data-hook="admin_inside_taxonomy_form" class="form-group">
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= error_message_on :taxonomy, :name, :class => 'error-message' %>
+    <%= text_field :taxonomy, :name, :class => 'form-control' %>
   <% end %>
 </div>

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

@@ -1,9 +1,4 @@
-<table class="index sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
-  <colgroup>
-    <col style="width: 10%">
-    <col style="width: 75%">
-    <col style="width: 15%">
-  </colgroup>
+<table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
   <thead>
     <tr data-hook="taxonomies_header">
       <th class="no-border"></th>
@@ -13,12 +8,14 @@
   </thead>
   <tbody>
     <% @taxonomies.each do |taxonomy| %>
-      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row" class="<%= cycle('odd', 'even')%>">
-        <td class="no-border"><span class="handle"></span></td>
-        <td class="align-center"><%= taxonomy.name %></td>
-        <td class="actions">
-          <%= link_to_edit taxonomy.id, :no_text => true %>
-          <%= link_to_delete taxonomy, :no_text => true %>
+      <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
+        <td class="move-handle">
+          <span class="icon icon-sort handle"></span>
+        </td>
+        <td><%= taxonomy.name %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit taxonomy.id, no_text: true %>
+          <%= link_to_delete taxonomy, no_text: true %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/taxonomies/edit.erb

@@ -1,24 +1,16 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<%= render :partial => 'js_head' %>
+<%= render partial: 'js_head' %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:taxonomy_edit) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
 <div id="ajax_error" class="errorExplanation" style="display:none;"></div>
 
 <%= form_for [:admin, @taxonomy] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <div>
-      <%= label_tag nil, Spree.t(:tree) %><br />
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <div class="form-group">
+      <%= label_tag nil, Spree.t(:tree) %>
       <script>
         Spree.routes.taxonomy_taxons_path = "<%= spree.api_taxonomy_taxons_path(@taxonomy) %>";
         Spree.routes.admin_taxonomy_taxons_path = "<%= spree.admin_taxonomy_taxons_path(@taxonomy) %>";
@@ -26,18 +18,15 @@
       </script>
       <div id="taxonomy_tree" class="tree"></div>
     </div>
-    <div id="progress" style="display:none;">
-      <%= image_tag 'select2-spinner.gif', :title => 'Spinner', :style => "vertical-align:bottom;" %> <%= Spree.t(:updating) %>..
-    </div>
-
-    <div class="info"><%= Spree.t(:taxonomy_tree_instruction) %></div>
 
-    <br>
+    <div class="alert alert-info">
+      <%= Spree.t(:taxonomy_tree_instruction) %>
+    </div>
 
-    <div class="filter-actions actions">
-      <%= button Spree.t('actions.update'), 'refresh' %>
+    <div class="form-actions">
+      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, icon: 'delete' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_taxonomies_path, :icon => 'remove' %>
+      <%= button Spree.t('actions.update'), 'ok', 'submit', { class: 'btn-success' } %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,24 +1,18 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:taxonomies) %>
+  <%= Spree::Taxonomy.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_taxonomy), spree.new_admin_taxonomy_url, :icon => 'plus', :id => 'admin_new_taxonomy_link' %>
-  </li>
+  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_taxonomy_link' %>
 <% end %>
 
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
 <% if @taxonomies.any? %>
-<div id="list-taxonomies" data-hook>
-  <%= render 'list' %>
-</div>
+  <div id="list-taxonomies" data-hook>
+    <%= render 'list' %>
+  </div>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/taxonomy')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_taxonomy_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Taxonomy.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
-<% end %>
+<% end %>

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

@@ -1,24 +1,12 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_taxonomy) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
 <%= form_for [:admin, @taxonomy] do |f| %>
-
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <fieldset class="no-border-top">
-    <br>
-    <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:create), 'ok' %>
+  <fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t(:create), 'save' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,46 +1,46 @@
-<div data-hook="admin_inside_taxon_form" class="row">
-  <div class="alpha five columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= text_field :taxon, :name, :class => 'fullwidth' %>
-      <%= error_message_on :taxon, :name, :class => 'fullwidth title' %>
-    <% end %>
+<div data-hook="admin_inside_taxon_form">
+  <div class="row">
+    <div class="col-md-5">
+      <%= f.field_container :name, class: ['form-group'] do %>
+        <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+        <%= text_field :taxon, :name, :class => 'form-control' %>
+        <%= error_message_on :taxon, :name, :class => 'error-message' %>
+      <% end %>
 
-    <%= f.field_container :permalink_part do %>
-      <%= f.label :permalink_part, Spree.t(:permalink) %> <span class="required">*</span><br />
-      <%= text_field_tag :permalink_part, @permalink_part, :class => 'fullwidth' %><br />
-      <span class="info" id="permalink_part_display">
-        <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
-      </span>
-    <% end %>
+      <%= f.field_container :permalink_part, class: ['form-group'] do %>
+        <%= f.label :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
+        <%= text_field_tag :permalink_part, @permalink_part, :class => 'form-control' %>
+        <p class="help-block" id="permalink_part_display">
+          <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
+        </span>
+      <% end %>
 
-    <%= f.field_container :icon do %>
-      <%= f.label :icon, Spree.t(:icon) %><br />
-      <%= f.file_field :icon %>
-    <% end %>
-  </div>
+      <%= f.field_container :icon, class: ['form-group'] do %>
+        <%= f.label :icon, Spree.t(:icon) %>
+        <%= f.file_field :icon %>
+      <% end %>
+    </div>
 
-  <div class="omega seven columns">
-    <%= f.field_container :description do %>
-      <%= f.label :description, Spree.t(:description) %><br />
-      <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
-    <% end %>
+    <div class="col-md-7">
+      <%= f.field_container :description, class: ['form-group'] do %>
+        <%= f.label :description, Spree.t(:description) %>
+        <%= f.text_area :description, :class => 'form-control', :rows => 6 %>
+      <% end %>
+    </div>
   </div>
 
-  <div class="twelve columns alpha omega">
-    <%= f.field_container :meta_title do %>
-      <%= f.label :meta_title, Spree.t(:meta_title) %><br />
-      <%= f.text_field :meta_title, :class => 'fullwidth', :rows => 6 %>
-    <% end %>
+  <%= f.field_container :meta_title, class: ['form-group'] do %>
+    <%= f.label :meta_title, Spree.t(:meta_title) %>
+    <%= f.text_field :meta_title, :class => 'form-control', :rows => 6 %>
+  <% end %>
 
-    <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description, Spree.t(:meta_description) %><br />
-      <%= f.text_field :meta_description, :class => 'fullwidth', :rows => 6 %>
-    <% end %>
+  <%= f.field_container :meta_description, class: ['form-group'] do %>
+    <%= f.label :meta_description, Spree.t(:meta_description) %>
+    <%= f.text_field :meta_description, :class => 'form-control', :rows => 6 %>
+  <% end %>
 
-    <%= f.field_container :meta_description do %>
-      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %><br />
-      <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
-    <% end %>
-  </div>
+  <%= f.field_container :meta_description, class: ['form-group'] do %>
+    <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+    <%= f.text_field :meta_keywords, :class => 'form-control', :rows => 6 %>
+  <% end %>
 </div>

data/app/views/spree/admin/taxons/_taxon_table.html.erb

@@ -1,4 +1,4 @@
-<table class="index">
+<table class="table table-condensed table-bordered">
   <thead>
     <tr data-hook="taxons_header">
       <th><%= Spree.t(:name) %></th>
@@ -8,7 +8,7 @@
   </thead>
   <tbody>
     <% taxons.each do |taxon| %>
-      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= spree_dom_id(taxon) %>" data-hook="taxons_row">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
         <td class="actions">

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

@@ -1,24 +1,16 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:taxon_edit) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_taxonomies_list), spree.admin_taxonomies_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
 <%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
-<%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
-  <%= render 'form', :f => f %>
+<%= form_for [:admin, @taxonomy, @taxon], method: :put, url: form_url, html: { multipart: true } do |f| %>
+  <%= render 'form', f: f %>
 
-  <div class="form-buttons" data-hook="buttons">
-    <%= button Spree.t('actions.update'), 'refresh' %>
+  <div class="form-actions" data-hook="buttons">
+    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), icon: "remove" %>
     <%= Spree.t(:or) %>
-    <%= button_link_to Spree.t('actions.cancel'), edit_admin_taxonomy_url(@taxonomy), :icon => "remove" %>
+    <%= button Spree.t('actions.update'), 'save' %>
   </div>
 <% end %>
 

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

@@ -2,19 +2,12 @@
   <%= Spree.t(:taxons) %>
 <% end %>
 
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:choose_a_taxon_to_sort_products_for) %>
-<% end %>
-
-<% content_for :table_filter do %>
-  <div data-hook="admin_orders_index_search" class="columns six">
-    <input type='text' id='taxon_id' />
+<div class="taxon-products-view">
+  <div class="form-group">
+    <%= text_field_tag :taxon_id %>
   </div>
-<% end %>
-
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<span id='sorting_explanation' style='display:none'><%= Spree.t(:click_and_drag_on_the_products_to_sort_them) %></span>
-<ul id='taxon_products'></ul>
 
-<%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>
+  <ul id="taxon_products" class="taxon"></ul>
 
+  <%= render :partial => "spree/admin/products/autocomplete", :formats => :js %>
+</div>

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

@@ -1,34 +1,28 @@
 <div data-hook="admin_tracker_form_fields" class="row">
-  <div class="alpha four columns">
-    <div data-hook="analytics_id" class="field">
-      <%= label_tag :tracker_analytics_id, Spree.t(:google_analytics_id) %>
-      <%= text_field :tracker, :analytics_id, :class => 'fullwidth' %>
+  <div class="col-md-4">
+    <div data-hook="analytics_id" class="form-group">
+      <%= label_tag nil, Spree.t(:google_analytics_id) %>
+      <%= text_field :tracker, :analytics_id, :class => 'form-control' %>
     </div>
   </div>
-  <div class="four columns">
-    <div data-hook="environment" class="field">
-      <%= label_tag :tracker_environment, Spree.t(:environment) %>
-      <%= collection_select(:tracker, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'tracker-env', :class => 'select2 fullwidth'}) %>
-    </div>
-  </div>
-  <div class="omega four columns">
-    <div data-hook="active" class="field">
+  <div class="col-md-4">
+    <div data-hook="active" class="form-group">
       <%= label_tag nil, Spree.t(:active) %>
-      <ul>
-        <li>
+      <div class="radio">
+        <%= label_tag :tracker_active_true do %>
           <%= radio_button(:tracker, :active, true) %>
-          <%= label_tag :tracker_active_true, Spree.t(:say_yes) %>
-        </li>
-        <li>
+          <%= Spree.t(:say_yes) %>
+        <% end %>
+      </div>
+      <div class="radio">
+        <%= label_tag :tracker_active_false do %>
           <%= radio_button(:tracker, :active, false) %>
-          <%= label_tag :tracker_active_false, Spree.t(:say_no) %>
-        </li>
-      </ul>
+          <%= Spree.t(:say_no) %>
+        <% end %>        
+      </div>
     </div>
   </div>
-
-  <div class="clear"></div>
-
+  
   <div data-hook="additional_tracker_fields"></div>
 
 </div>

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

@@ -1,20 +1,10 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_tracker) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::Tracker.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tracker } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tracker } %>
 
 <%= form_for [:admin, @tracker] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-  </fieldset>
+  <%= render :partial => 'form', :locals => { :f => f } %>
+  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>  
 <% end %>

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

@@ -1,17 +1,13 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:analytics_trackers) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_tracker), new_object_url, :icon => 'plus', :id => 'admin_new_tracker_link' %>
-  </li>
+  <%= button_link_to Spree.t(:new_tracker), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_tracker_link' %>
 <% end %>
 
 <% if @trackers.any? %>
-  <table class="index">
+  <table class="table">
     <colgroup>
       <col style="width: 30%">
       <col style="width: 40%">
@@ -21,18 +17,16 @@
     <thead>
       <tr data-hook="admin_trackers_index_headers">
         <th><%= Spree.t(:google_analytics_id) %></th>
-        <th><%= Spree.t(:environment) %></th>
-        <th><%= Spree.t(:active) %></th>
+        <th class="text-center"><%= Spree.t(:active) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @trackers.each do |tracker|%>
-        <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= tracker.analytics_id %></td>
-          <td class="align-center"><%= tracker.environment.to_s.titleize %></td>
-          <td class="align-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="actions">
+        <tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows">
+          <td><%= tracker.analytics_id %></td>
+          <td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="actions text-right">
             <%= link_to_edit tracker, :no_text => true %>
             <%= link_to_delete tracker, :no_text => true %>
           </td>
@@ -41,8 +35,8 @@
     </tbody>
   </table>
 <% else %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/tracker')) %>,
+  <div class="alert alert-warning">
+    <%= Spree.t(:no_resource_found, resource: Spree::Tracker.model_name.human(count: :many)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,19 +1,11 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_tracker) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_trackers_list), spree.admin_trackers_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tracker } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tracker } %>
 
 <%= form_for [:admin, @tracker] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/users/_addresses_form.html.erb

@@ -1,19 +1,35 @@
-<div data-hook="bill_address_wrapper" class="alpha six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:billing_address) %></legend>
-    <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>
-      <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
-      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
-    <% end %>
-  </fieldset>
-</div>
+<div class="row">
+  <div data-hook="bill_address_wrapper" class="col-md-6">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:billing_address) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>
+          <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div data-hook="ship_address_wrapper" class="col-md-6">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:shipping_address) %>
+        </h1>
+      </div>
 
-<div data-hook="ship_address_wrapper" class="alpha six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-    <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
-      <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
-      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
-    <% end %>
-  </fieldset>
+      <div class="panel-body">
+        <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
+          <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => "shipping" } %>
+        <% end %>
+      </div>
+    </div>
+  </div>
 </div>

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

@@ -1,36 +1,36 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="alpha six columns">
-    <%= f.field_container :email do %>
+  <div class="col-md-6">
+    <%= f.field_container :email, class: ['form-group'] do %>
       <%= f.label :email, Spree.t(:email) %>
-      <%= f.email_field :email, :class => 'fullwidth' %>
+      <%= f.email_field :email, :class => 'form-control' %>
       <%= error_message_on :user, :email %>
     <% end %>
 
-    <div data-hook="admin_user_form_roles" class="field">
-      <%= label_tag nil, Spree.t(:roles) %>
-      <ul>
-        <% @roles.each do |role| %>
-          <li>
+    <div data-hook="admin_user_form_roles" class="form-group">
+      <strong><%= Spree.t(:roles) %></strong>
+      <% @roles.each do |role| %>
+        <div class="checkbox">
+          <%= label_tag "user_spree_role_#{role.name}" do %>
             <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
-            <%= label_tag "user_spree_role_#{role.name}", role.name %>
-          </li>
-        <% end %>
-      </ul>
+            <%= role.name %>
+          <% end %>
+        </div>
+      <% end %>
       <%= hidden_field_tag 'user[spree_role_ids][]', '' %>
     </div>
 
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="omega six columns">
-    <%= f.field_container :password do %>
+  <div data-hook="admin_user_form_password_fields" class="col-md-6">
+    <%= f.field_container :password, class: ['form-group'] do %>
       <%= f.label :password, Spree.t(:password) %>
-      <%= f.password_field :password, :class => 'fullwidth' %>
+      <%= f.password_field :password, :class => 'form-control' %>
       <%= f.error_message_on :password %>
     <% end %>
 
-    <%= f.field_container :password do %>
+    <%= f.field_container :password, class: ['form-group'] do %>
       <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-      <%= f.password_field :password_confirmation, :class => 'fullwidth' %>
+      <%= f.password_field :password_confirmation, :class => 'form-control' %>
       <%= f.error_message_on :password_confirmation %>
     <% end %>
   </div>

data/app/views/spree/admin/users/_lifetime_stats.html.erb

@@ -0,0 +1,26 @@
+<div data-hook="admin_user_lifetime_stats" class="panel panel-default">
+  <div class="panel-heading">
+    <h1 class="panel-title">
+      <%= Spree.t(:lifetime_stats) %>
+    </h1>
+  </div>
+  
+  <table class="table" id="user-lifetime-stats" data-hook>
+    <tr>
+      <td width="30%"><%= Spree.t(:total_sales) %>:</td>
+      <td><%= @user.display_lifetime_value.to_html %></td>
+    </tr>
+    <tr>
+      <td><%= Spree.t(:num_orders) %>:</td>
+      <td><%= @user.order_count.to_i %></td>
+    </tr>
+    <tr>
+      <td><%= Spree.t(:average_order_value) %>:</td>
+      <td><%= @user.display_average_order_value.to_html %></td>
+    </tr>
+    <tr>
+      <td><%= Spree.t(:member_since) %>:</td>
+      <td><%= l @user.created_at.to_date %></td>
+    </tr>
+  </table>
+</div>