spree_backend 3.2.9 → 3.3.0.rc1

data/app/views/spree/admin/shared/_header.html.erb

@@ -3,7 +3,7 @@
   <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
     <div class="container-fluid">
       <div class="row">
-        <div class="navbar-header col-sm-3 col-md-2">
+        <div class="navbar-header col-xs-3 col-md-2">
           <%= link_to(
             image_tag(Spree::Config[:admin_interface_logo], id: 'logo'),
             spree.admin_path,
@@ -15,7 +15,7 @@
               <span class="icon-bar"></span>
             </span>
         </div>
-        <div class="col-sm-9 col-md-10">
+        <div class="col-xs-9 col-md-10">
           <div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
         </div>
       </div>

data/app/views/spree/admin/shared/_index_table_options.html.erb

@@ -5,10 +5,10 @@
 <% end %>
 
 <div class="row index-pagination-row">
-  <div class="col-sm-6">
+  <div class="col-xs-6">
     <%= paginate collection %>
   </div>
-  <div class="col-sm-6">
+  <div class="col-xs-6">
     <div class="pagination-wrap">
       <%= form_tag(per_page_dropdown_params(args), { method: :get, class: 'js-per-page-form form-inline' }) do %>
         <%= per_page_dropdown %>

data/app/views/spree/admin/shared/_order_summary.html.erb

@@ -11,7 +11,7 @@
         </td>
         <td>
           <span class="state label label-<%= @order.state %>">
-            <%= Spree.t(@order.state, scope: :order_state) %>
+            <%= Spree.t(@order.state, scope: :order_states) %>
           </span>
         </td>
       </tr>

data/app/views/spree/admin/shared/_table_filter.html.erb

@@ -1,6 +1,6 @@
 <% if content_for?(:table_filter) %>
   <div class="filter-wrap row">
-    <div class="col-sm-12">
+    <div class="col-xs-12">
       <div class="input-group index-filter-button">
         <span class="input-group-btn">
           <button class="btn btn-default js-show-index-filters" type="button">

data/app/views/spree/admin/shared/_translations.html.erb

@@ -2,7 +2,6 @@
   Spree.translations = <%==
   { abbr_day_names:           I18n.t(:abbr_day_names, scope: :date),
     add:                      Spree.t(:add),
-    are_you_sure:             Spree.t(:are_you_sure),
     are_you_sure_delete:      Spree.t(:are_you_sure_delete),
     bill_address:             Spree.t(:bill_address),
     cancel:                   Spree.t(:cancel,  scope: :actions),

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -1,4 +1,4 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
+$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_states) %>');
 $('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
-    <div data-hook="admin_shipping_method_form_name_field" class="col-md-6">
+    <div data-hook="admin_shipping_method_form_name_field" class="col-xs-12 col-md-6">
       <%= f.field_container :name, class: ['form-group'] do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, class: 'form-control' %>
@@ -8,17 +8,17 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_display_field" class="col-md-6">
+    <div data-hook="admin_shipping_method_form_display_field" class="col-xs-12 col-md-6">
       <%= f.field_container :display_on, class: ['form-group'] do %>
         <%= f.label :display_on, Spree.t(:display) %>
-        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, { class: 'select2' }) %>
+        <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, { class: 'select2' }) %>
         <%= f.error_message_on :display_on %>
       <% end %>
     </div>
   </div>
 
   <div class="row">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="col-md-4">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="col-xs-12 col-md-4">
       <%= f.field_container :admin_name, class: ['form-group'] do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
@@ -26,7 +26,7 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_code" class="col-md-4">
+    <div data-hook="admin_shipping_method_form_code" class="col-xs-12 col-md-4">
       <%= f.field_container :code, class: ['form-group'] do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, class: 'form-control', label: false %>
@@ -34,7 +34,7 @@
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-md-4">
+    <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-xs-12 col-md-4">
       <%= f.field_container :tracking_url, class: ['form-group'] do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
@@ -45,7 +45,7 @@
 </div>
 
 <div class="row">
-  <div data-hook="admin_shipping_method_form_availability_fields" class="col-md-6">
+  <div data-hook="admin_shipping_method_form_availability_fields" class="col-xs-12 col-md-6">
     <div class="panel panel-default categories">
       <div class="panel-heading">
         <h1 class="panel-title">
@@ -69,7 +69,7 @@
     </div>
   </div>
 
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h1 class="panel-title">
@@ -96,11 +96,11 @@
 </div>
 
 <div class="row">
-  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-md-6">
+  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-xs-12 col-md-6">
     <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f } %>
   </div>
 
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <div class="panel panel-default tax_categories">
       <div class="panel-heading">
         <h1 class="panel-title">

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

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :state_changes } %>
 
-<% content_for :page_title do %>  
+<% content_for :page_title do %>
   / <%= plural_resource_name(Spree::StateChange) %>
   / <%= Spree::StateChange.human_attribute_name(:state_changes) %>
 <% end %>
@@ -21,8 +21,8 @@
       <% @state_changes.each do |state_change| %>
         <tr>
           <td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
-          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state) : Spree.t(:previous_state_missing) %></td>
-          <td><%= Spree.t(state_change.next_state) %></td>
+          <td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_states") : Spree.t(:previous_state_missing) %></td>
+          <td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name}_states") %></td>
           <td>
             <% if state_change.user %>
               <% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_state_form_fields" class="row">
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :abbr, class: ['form-group'] do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
       <%= f.text_field :abbr, class: 'form-control' %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_stock_locations_form_fields">
   <div class="row">
-    <div class="col-md-9" data-hook="stock_location_names">
+    <div class="col-xs-12 col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
         <%= f.field_container :name, class: ['form-group']  do %>
           <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
@@ -16,7 +16,7 @@
       </div>
     </div>
 
-    <div class="col-md-3" data-hook="stock_location_status">
+    <div class="col-xs-12 col-md-3" data-hook="stock_location_status">
       <strong><%= Spree.t(:status) %></strong>
       <div class="checkbox" data-hook="stock_location_active">
         <%= label_tag :active do %>

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -2,27 +2,27 @@
   <fieldset>
     <legend><%= Spree.t(:move_stock_between_locations)%></legend>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_from_field">
           <%= label_tag :stock_location_from_id, Spree.t(:transfer_from_location) %>
           <%= select_tag :stock_location_from_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group" id="stock_movement_transfer_to_field">
           <%= label_tag :stock_location_to_id, Spree.t(:transfer_to_location) %>
           <%= select_tag :stock_location_to_id, options_from_collection_for_select(@stock_locations, :id, :name), class: 'select2' %>
         </div>
       </div>
 
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group" id="stock_movement_variant_id_field">
           <%= label_tag 'variant_id', Spree.t(:variant) %>
           <%= select_tag :variant_id, options_from_collection_for_select(@variants, :id, :name_and_sku), class: 'select2' %>
         </div>
       </div>
 
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group" id="stock_movement_quantity_field">
           <%= label_tag 'quantity', Spree.t(:quantity) %>
           <%= number_field_tag :quantity, 1, class: 'form-control' %>

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

@@ -12,14 +12,14 @@
     <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
 
       <div class="row no-marginb">
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= f.label :reference_cont, Spree.t(:reference_contains) %>
             <%= f.text_field :reference_cont, class: 'form-control' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= f.label :source_location, Spree.t(:source) %>
             <%= f.select :source_location_id_eq,
@@ -28,7 +28,7 @@
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= f.label :destination_location, Spree.t(:destination) %>
             <%= f.select :destination_location_id_eq,

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

@@ -62,14 +62,14 @@
 
     <div class="panel-body">
       <div class="row">
-        <div class="col-md-8">
+        <div class="col-xs-12 col-md-8">
           <div class="form-group" id="stock_movement_variant_id_field">
             <%= label_tag 'variant_id', Spree.t(:variant) %>
             <%= hidden_field_tag 'transfer_variant', {}, {class: 'fullwidth-input'} %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group" id="stock_movement_quantity_field">
             <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
             <div class="input-group">

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

@@ -6,7 +6,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::StoreCredit) %>
 <% end %>
 
 <% if @store_credits.any? %>

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

@@ -7,7 +7,7 @@
     </div>
 
     <div class="panel-body">
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <div data-hook="name" class="form-group">
           <%= f.label :name, Spree.t(:name) %>
           <%= f.text_field :name, class: 'form-control' %>
@@ -30,7 +30,7 @@
         </div>
       </div>
 
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <div data-hook="zone" class="form-group">
           <%= f.label :zone, Spree.t(:zone) %>
           <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {class: 'select2'}) %>

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

@@ -14,8 +14,8 @@
         </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 %>
+          <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
+          <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
         </td>
       </tr>
     <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_taxonomy_link' %>
-<% end %>
+<% end if can?(:create, Spree::Taxonomy) %>
 
 <% if @taxonomies.any? %>
   <div id="list-taxonomies" data-hook>
@@ -13,6 +13,6 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Taxonomy)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Taxonomy) %>!
   </div>
 <% end %>

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

@@ -1,15 +1,15 @@
 <div data-hook="admin_inside_taxon_form">
   <div class="row">
-    <div class="col-md-5">
+    <div class="col-xs-12 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' %>
         <%= f.error_message_on :name, class: 'error-message' %>
       <% 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' %>
+      <%= f.field_container :permalink, class: ['form-group'] do %>
+        <%= label_tag :permalink_part, Spree.t(:permalink) %> <span class="required">*</span>
+        <%= text_field_tag :permalink_part, @permalink_part, class: 'form-control', required: true %>
         <p class="help-block" id="permalink_part_display">
           <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
         </p>
@@ -21,7 +21,7 @@
       <% end %>
     </div>
 
-    <div class="col-md-7">
+    <div class="col-xs-12 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 %>

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

@@ -6,6 +6,9 @@
 
 <%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxon } %>
+
 <%= form_for [:admin, @taxonomy, @taxon], method: :put, url: form_url, html: { multipart: true } do |f| %>
   <%= render 'form', f: f %>
 

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_tracker_form_fields" class="row">
-  <div class="col-md-4" data-hook="analytics_id">
+  <div class="col-xs-12 col-md-4" data-hook="analytics_id">
     <%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
       <%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
       <%= f.text_field :analytics_id, class: 'form-control' %>
       <%= f.error_message_on :analytics_id %>
     <% end %>
   </div>
-  <div class="col-md-4">
+  <div class="col-xs-12 col-md-4">
     <div data-hook="active" class="form-group">
       <%= label_tag nil, Spree.t(:active) %>
       <div class="radio">

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div data-hook="bill_address_wrapper" class="col-md-6">
+  <div data-hook="bill_address_wrapper" class="col-xs-12 col-md-6">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h1 class="panel-title">
@@ -16,7 +16,7 @@
     </div>
   </div>
 
-  <div data-hook="ship_address_wrapper" class="col-md-6">
+  <div data-hook="ship_address_wrapper" class="col-xs-12 col-md-6">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h1 class="panel-title">

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_user_form_fields" class="row">
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :email, class: ['form-group'] do %>
       <%= f.label :email, Spree.t(:email) %>
       <%= f.email_field :email, class: 'form-control' %>
@@ -20,7 +20,7 @@
 
   </div>
 
-  <div data-hook="admin_user_form_password_fields" class="col-md-6">
+  <div data-hook="admin_user_form_password_fields" class="col-xs-12 col-md-6">
     <%= f.field_container :password, class: ['form-group'] do %>
       <%= f.label :password, Spree.t(:password) %>
       <%= f.password_field :password, class: 'form-control' %>

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

@@ -1,3 +1,3 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' %>
+  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' if can?(:create, Spree::Order) %>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add', id: 'admin_new_user_link' %>
-<% end %>
+<% end if can? :create, Spree::user_class %>
 
 <% content_for :table_filter_title do %>
   <%= Spree.t(:search) %>
@@ -18,13 +18,13 @@
         <%= f.text_field :email_cont, class: "form-control js-quick-search-target" %>
       </div>
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label Spree.t(:first_name) %>
             <%= f.text_field :bill_address_firstname_cont, class: 'form-control' %>
           </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label Spree.t(:last_name) %>
             <%= f.text_field :bill_address_lastname_cont, class: 'form-control' %>
@@ -57,8 +57,8 @@
         <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
           <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
           <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit user, no_text: true %>
-            <%= link_to_delete user, no_text: true %>
+            <%= link_to_edit user, no_text: true if can?(:edit, user) %>
+            <%= link_to_delete user, no_text: true if can?(:delete, user) %>
           </td>
         </tr>
       <% end %>

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

@@ -39,7 +39,7 @@
               <td class="item-quantity"><%= item.quantity %></td>
               <td class="item-total"><%= item.money.to_html %></td>
               <td class="order-state">
-                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+                <div class="state <%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></div>
                 <% if order.payment_state %>
                   <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
                 <% end %>

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

@@ -26,7 +26,7 @@
           <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
           <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
           <td class="order-state">
-            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></div>
             <% if order.payment_state %>
               <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
             <% end %>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div data-hook="admin_variant_form_fields" class="col-md-6">
+  <div data-hook="admin_variant_form_fields" class="col-xs-12 col-md-6">
     <div data-hook="variants">
       <% @product.option_types.each do |option_type| %>
         <div class="form-group" data-hook="presentation">
@@ -38,7 +38,7 @@
     </div>
   </div>
 
-  <div class="col-md-6" data-hook="admin_variant_form_additional_fields">
+  <div class="col-xs-12 col-md-6" data-hook="admin_variant_form_additional_fields">
     <% [:weight, :height, :width, :depth].each do |field| %>
       <div class="form-group" data-hook="<%= field %>"><%= f.label field, Spree.t(field) %>
         <% value = number_with_precision(@variant.send(field), precision: 2) %>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-6" data-hook="admin_zone_form_fields">
+  <div class="col-xs-12 col-md-6" data-hook="admin_zone_form_fields">
     <div class="panel panel-default">
       <div class="panel-heading">
         <h1 class="panel-title"><%= Spree.t(:general_settings)%></h1>
@@ -42,7 +42,7 @@
       </div>
     </div>
   </div>
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>

data/app/views/spree/layouts/admin.html.erb

@@ -30,7 +30,7 @@
         <%#-------------------------------------------------%>
         <%# Sidebar                                         %>
         <%#-------------------------------------------------%>
-        <div class="col-sm-3 col-md-2 hidden-xs sidebar" id="main-sidebar" data-hook="admin_tabs">
+        <div class="<%= main_sidebar_classes %>" id="main-sidebar" data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
         </div>
 
@@ -53,7 +53,7 @@
             <%#-------------------------------------------------%>
             <%# Main content                                    %>
             <%#-------------------------------------------------%>
-            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-md-9 col-sm-8' : 'col-sm-12'  %>" id="content" data-hook>
+            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-xs-8 col-md-9' : 'col-xs-12'  %>" id="content" data-hook>
               <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
               <%= yield %>
             </div>
@@ -62,7 +62,7 @@
             <%# Inner aside                                     %>
             <%#-------------------------------------------------%>
             <% if content_for?(:sidebar) %>
-              <div class="col-md-3 col-sm-4">
+              <div class="col-xs-4 col-md-3">
                 <%= render partial: 'spree/admin/shared/sidebar' %>
               </div>
             <% end %>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( jquery-ui/* admin/* credit_cards/credit_card.gif )
+Rails.application.config.assets.precompile += %w( admin/* credit_cards/credit_card.gif )

data/lib/spree/backend/engine.rb

@@ -21,7 +21,6 @@ module Spree
           spree/backend/all*
           spree/backend/address_states.js
           jquery.jstree/themes/spree/*
-          fontawesome-webfont*
           select2_locale*
         ]
       end

data/spec/controllers/spree/admin/base_controller_spec.rb

@@ -0,0 +1,46 @@
+# Spree's rpsec controller tests get the Spree::ControllerHacks
+# we don't need those for the anonymous controller here, so
+# we call process directly instead of get
+require 'spec_helper'
+
+describe Spree::Admin::BaseController, type: :controller do
+  controller(Spree::Admin::BaseController) do
+    def index
+      authorize! :update, Spree::Order
+      render plain: 'test'
+    end
+  end
+
+  context "unauthorized request" do
+    before do
+      allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
+    end
+
+    it "redirects to root" do
+      allow(controller).to receive_message_chain(:spree, :root_path).and_return('/root')
+      get :index
+      expect(response).to redirect_to '/root'
+    end
+  end
+
+  context "#generate_api_key" do
+    let(:user) { mock_model(Spree.user_class, has_spree_role?: true) }
+
+    before do
+      allow(controller).to receive(:authorize_admin) { true }
+      allow(controller).to receive(:try_spree_current_user) { user }
+    end
+
+    it "generates the API key for a user when they visit" do
+      expect(user).to receive(:spree_api_key).and_return(nil)
+      expect(user).to receive(:generate_spree_api_key!)
+      get :index
+    end
+
+    it "does not attempt to regenerate the API key if the key is already set" do
+      expect(user).to receive(:spree_api_key).and_return('fake')
+      expect(user).not_to receive(:generate_spree_api_key!)
+      get :index
+    end
+  end
+end