spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,94 +1,115 @@
-<div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
-      <%= error_message_on :shipping_method, :name %>
-    <% end %>
-  </div>
+<div data-hook="admin_shipping_method_form_fields">
+  <div class="row">
+    <div data-hook="admin_shipping_method_form_name_field" class="col-md-6">
+      <%= f.field_container :name, :class => ['form-group'] do %>
+        <%= f.label :name, Spree.t(:name) %>
+        <%= f.text_field :name, :class => 'form-control' %>
+        <%= error_message_on :shipping_method, :name %>
+      <% end %>
+    </div>
 
-  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
-    <%= f.field_container :display_on do %>
-      <%= f.label :display_on, Spree.t(:display) %><br />
-      <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
-      <%= error_message_on :shipping_method, :display_on %>
-    <% end %>
+    <div data-hook="admin_shipping_method_form_display_field" class="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'}) %>
+        <%= error_message_on :shipping_method, :display_on %>
+      <% end %>
+    </div>
   </div>
 
-  <div class="alpha omega twelve columns">
-    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
-      <%= f.field_container :admin_name do %>
-        <%= f.label :admin_name, Spree.t(:internal_name) %><br />
-        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
+  <div class="row">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="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  %>
         <%= error_message_on :shipping_method, :admin_name %>
       <% end %>
     </div>
 
-    <div data-hook="admin_shipping_method_form_code" class="omega six columns">
-      <%= f.field_container :code do %>
-        <%= f.label :code, Spree.t(:code) %><br />
-        <%= f.text_field :code, :class => 'fullwidth', :label => false  %>
+    <div data-hook="admin_shipping_method_form_code" class="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  %>
         <%= error_message_on :shipping_method, :code %>
       <% end %>
     </div>
-  </div>
 
-  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
-    <%= f.field_container :tracking_url do %>
-      <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />
-      <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
-      <%= error_message_on :shipping_method, :tracking_url %>
-    <% end %>
+    <div data-hook="admin_shipping_method_form_tracking_url_field" class="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) %>
+        <%= error_message_on :shipping_method, :tracking_url %>
+      <% end %>
+    </div>
   </div>
 </div>
 
-<div class="alpha six columns">
-  <div data-hook="admin_shipping_method_form_availability_fields" class="alpha six columns">
-    <fieldset class="categories no-border-bottom">
-      <legend align="center"><%= Spree.t(:shipping_categories) %></legend>
-          <%= f.field_container :categories do %>
-        <% Spree::ShippingCategory.all.each do |category| %>
-          <%= label_tag do %>
-            <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
-            <%= category.name %><br>
+<div class="row">
+  <div data-hook="admin_shipping_method_form_availability_fields" class="col-md-6">
+    <div class="panel panel-default categories">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:shipping_categories) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.field_container :categories, :class => ['form-group'] do %>
+          <% Spree::ShippingCategory.all.each do |category| %>
+            <%= label_tag do %>
+              <%= check_box_tag('shipping_method[shipping_categories][]', category.id, @shipping_method.shipping_categories.include?(category)) %>
+              <%= category.name %>
+            <% end %>
           <% end %>
+          <%= error_message_on :shipping_method, :shipping_category_id %>
         <% end %>
-        <%= error_message_on :shipping_method, :shipping_category_id %>
-      <% end %>
-    </fieldset>
+      </div>
+    </div>
   </div>
 
-  <div class="alpha six columns">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:zones) %></legend>
-      <%= f.field_container :zones do %>
-        <% shipping_method_zones = @shipping_method.zones.to_a %>
-        <% Spree::Zone.all.each do |zone| %>
-          <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
-            <%= zone.name %>
+  <div class="col-md-6">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:zones) %>
+        </h1>
+      </div>
+
+      <div class="panel-body">
+        <%= f.field_container :zones, :class => ['form-group'] do %>
+          <% shipping_method_zones = @shipping_method.zones.to_a %>
+          <% Spree::Zone.all.each do |zone| %>
+            <%= label_tag do %>
+              <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
+              <%= zone.name %>
+            <% end %>
           <% end %>
-          <br>
-        <% end %>
-        <%= error_message_on :shipping_method, :zone_id %>
-      <% end %>
-    </fieldset>
+          <%= error_message_on :shipping_method, :zone_id %>
+        <% end %>  
+      </div>
+    </div>
   </div>
 </div>
 
-<div data-hook="admin_shipping_method_form_calculator_fields" class="omega six columns">
-  <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
-</div>
+<div class="row">
+  <div data-hook="admin_shipping_method_form_calculator_fields" class="col-md-6">
+    <%= render :partial => 'spree/admin/shared/calculator_fields', :locals => { :f => f } %>
+  </div>
+
+  <div class="col-md-6">
+    <div class="panel panel-default tax_categories">
+      <div class="panel-heading">
+        <h1 class="panel-title">
+          <%= Spree.t(:tax_category) %>
+        </h1>
+      </div>
 
-<div class="alpha six columns">
-  <div class="alpha six columns">
-    <fieldset class="tax_categories no-border-bottom">
-      <legend align="center"><%= Spree.t(:tax_category) %></legend>
-        <%= f.field_container :categories do %>
-          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2 fullwidth" %>
+      <div class="panel-body">
+        <%= f.field_container :categories, :class => ['form-group'] do %>
+          <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, {include_blank: true}, class: "select2" %>
           <%= error_message_on :shipping_method, :tax_category_id %>
         <% end %>
-    </fieldset>
+      </div>
+    </div>
   </div>
 </div>
-

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

@@ -1,29 +1,16 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_shipping_method) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::ShippingMethod.model_name.human) %>
 <% end %>
 
 <div data-hook="admin_shipping_method_edit_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_edit_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
-    <fieldset class="no-border-top">
-      <%= render :partial => 'form', :locals => { :f => f } %>
-
-      <div class="clear"></div>
-
-      <div data-hook="admin_shipping_method_edit_form_buttons">
-        <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
-      </div>
-    </fieldset>
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <div data-hook="admin_shipping_method_edit_form_buttons">
+      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    </div>
   <% end %>
 </div>

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

@@ -1,41 +1,30 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:shipping_methods) %>
+  <%= Spree::ShippingMethod.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :icon => 'plus', :id => 'admin_new_shipping_method_link' %>
-  </li>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :class => "btn-success", :icon => 'add', :id => 'admin_new_shipping_method_link' %>
 <% end %>
 
 <% if @shipping_methods.any? %>
-  <table class="index" id='listing_shipping_methods'>
-    <colgroup>
-      <col style="width: 20%">
-      <col style="width: 15%">
-      <col style="width: 40%">
-      <col style="width: 10%">
-      <col style="width: 15%">
-    </colgroup>
+  <table class="table" id='listing_shipping_methods'>
     <thead>
       <tr data-hook="admin_shipping_methods_index_headers">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:zone) %></th>
         <th><%= Spree.t(:calculator) %></th>
-        <th><%= Spree.t(:display) %></th>
+        <th class="text-center"><%= Spree.t(:display) %></th>
         <th data-hook="admin_shipping_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
       <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
-        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
-          <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
-          <td class="align-center"><%= shipping_method.calculator.description %></td>
-          <td class="align-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
-          <td data-hook="admin_shipping_methods_index_row_actions" class="actions">
+        <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
+          <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
+          <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
+          <td><%= shipping_method.calculator.description %></td>
+          <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:both) : Spree.t(shipping_method.display_on) %></td>
+          <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit shipping_method, :no_text => true %>
             <%= link_to_delete shipping_method, :no_text => true %>
           </td>
@@ -44,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/shipping_method')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_shipping_method_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::ShippingMethod.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>
-

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

@@ -1,26 +1,16 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_shipping_method) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
 <div data-hook="admin_shipping_method_new_form_header">
-  <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } %>
+  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @shipping_method } %>
 </div>
 
 <div data-hook="admin_shipping_method_new_form">
   <%= form_for [:admin, @shipping_method] do |f| %>
-    <fieldset class="no-border-top">
+    <fieldset>
       <%= render :partial => 'form', :locals => { :f => f } %>
 
-      <div class="clear"></div>
-
       <div data-hook="admin_shipping_method_new_form_buttons">
         <%= render :partial => 'spree/admin/shared/new_resource_links' %>
       </div>

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

@@ -0,0 +1,42 @@
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'State Changes' } %>
+
+<% content_for :page_title do %>
+  <%= Spree::StateChange.model_name.human(count: :many) %>
+<% end %>
+
+<% if @state_changes.any? %>
+  <table class="table" id="listing_order_state_changes" data-hook>
+    <thead>
+      <tr data-hook="admin_orders_state_changes_headers">
+        <th><%= Spree::StateChange.human_attribute_name(:type) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:state_from) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:state_to) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:user) %></th>
+        <th><%= Spree::StateChange.human_attribute_name(:timestamp) %></th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @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>
+            <%= link_to state_change.user.login, spree.admin_user_path(state_change.user) if state_change.user %>
+          </td>
+          <td>
+            <%= l(state_change.created_at) %>
+            <% if state_change.created_at != state_change.updated_at %>
+              <small><%= Spree::StateChange.human_attribute_name(:updated)%>: <%= l(state_change.updated_at) %></small>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_state_changes) %>
+  </div>
+<% end %>

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

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

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

@@ -1,25 +1,20 @@
 <div id="new_state" data-hook></div>
 
-<table class="index" id='listing_states' data-hook>
-  <colgroup>
-    <col style="width: 70%" />
-    <col style="width: 15%" />
-    <col style="width: 15%" />
-  </colgroup>
+<table class="table" id='listing_states' data-hook>
   <thead>
     <tr data-hook="states_header">
       <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:abbreviation) %></th>
+      <th class="text-center"><%= Spree.t(:abbreviation) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
     <% @states.each do |state| %>
-      <tr id="<%= spree_dom_id state %>" data-hook="states_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="<%= spree_dom_id state %>" data-hook="states_row">
         <td><%= state.name %></td>
-        <td class="align-center"><%= state.abbr %></td>
-        <td class="actions">
-          <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_country_state_url(@country, state), :no_text => true %>
+        <td class="text-center"><%= state.abbr %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit state, :no_text => true %>
           <%= link_to_delete state, :no_text => true %>
         </td>
       </tr>

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

@@ -1,19 +1,11 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_state) %> <i class="fa fa-arrow-right"></i> <%= @state.name %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_states_list), spree.admin_country_states_url(@country), :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::State.model_name.human) %> / <%= @state.name %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
 
 <%= form_for [:admin, @country, @state] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
   </fieldset>

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

@@ -1,19 +1,15 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:states) %>
+  <%= Spree::State.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li id="new_state_link">
-    <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'plus', :id => 'new_state_link' } %>
-  </li>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :class => "btn-success", :icon => 'add', :id => 'new_state_link' } %>
 <% end %>
 
-<div data-hook="country" class="field row">
+<div data-hook="country" class="form-group">
   <%= label_tag :country, Spree.t(:country) %>
-  <select id="country" class='observe_field select2 fullwidth' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
-  <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
+  <select id="country" class='observe_field select2' data-base-url="<%=admin_states_path(:format => :js) %>?country_id=" data-update="#state-list">
+    <%= options_from_collection_for_select(@countries, :id, :name, @country.id) %>
   </select>
 </div>
 

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

@@ -1,6 +1,4 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @state } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @state } %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_state) %>
@@ -8,7 +6,6 @@
 
 <%= form_for [:admin, @country, @state] do |f| %>
   <fieldset>
-    <legend><%= Spree.t(:new_state) %></legend>
     <%= render :partial => 'form', :locals => { :f => f } %>
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/app/views/spree/admin/states/new.js.erb

@@ -1,2 +1,2 @@
-$("#new_state").html("<%= escape_javascript(render :template => 'spree/admin/states/new', :formats => [:html], :handlers => [:erb]) %>");
-$("#new_state_link").parent().hide();
+$("#new_state").html("<%= escape_javascript(render template: 'spree/admin/states/new', formats: [:html], handlers: [:erb]) %>");
+$("#new_state_link").hide();

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

@@ -1,79 +1,85 @@
-<div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="alpha nine columns" data-hook="stock_location_names">
-    <div data-hook="stock_location_name">
-      <%= f.field_container :name do %>
+<div data-hook="admin_stock_locations_form_fields">
+  <div class="row">
+    <div class="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 />
-        <%= f.text_field :name, class: 'fullwidth', required: true %>
-      <% end %>
-    </div>
-    <div data-hook="stock_location_admin_name">
-      <%= f.field_container :admin_name do %>
+        <%= f.text_field :name, class: 'form-control', required: true %>
+        <% end %>
+      </div>
+      <div data-hook="stock_location_admin_name">
+        <%= f.field_container :admin_name, class: ['form-group']  do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
-        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
-      <% end %>
+        <%= f.text_field :admin_name, class: 'form-control', label: false %>
+        <% end %>
+      </div>
     </div>
-  </div>
 
-  <div class="omega three columns" data-hook="stock_location_status">
-    <%= f.field_container :active do %>
-      <label for="active"><%= Spree.t(:status) %></label>
-      <ul>
-        <li class="fullwidth" data-hook="stock_location_active">
+    <div class="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 %>
           <%= f.check_box :active %>
-          <%= f.label :active, Spree.t(:active) %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_default">
+          <%= Spree.t(:active) %>
+        <% end %>
+      </div>
+      <div class="checkbox" data-hook="stock_location_default">
+        <%= label_tag :default do %>
           <%= f.check_box :default %>
-          <%= f.label :default, Spree.t(:default) %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_backorderable_default">
+          <%= Spree.t(:default) %>
+        <% end %>
+      </div>
+      <div class="checkbox" data-hook="stock_location_backorderable_default">
+        <%= label_tag :backorderable_default do %>
           <%= f.check_box :backorderable_default %>
-          <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_propagate_all_variants">
+          <%= Spree.t(:backorderable_default) %>
+        <% end %>
+      </div>
+      <div class="checkbox" data-hook="stock_location_propagate_all_variants">
+        <%= label_tag :propagate_all_variants do %>
           <%= f.check_box :propagate_all_variants %>
-          <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
-        </li>
-      </ul>
-    <% end %>
+          <%= Spree.t(:propagate_all_variants) %>
+        <% end %>
+      </div>
+    </div>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_address1">
+  <div class="form-group" data-hook="stock_location_address1">
     <%= f.label :address1, Spree.t(:street_address) %>
-    <%= f.text_field :address1, class: 'fullwidth' %>
+    <%= f.text_field :address1, class: 'form-control' %>
   </div>
 
-  <div class="omega six columns field" data-hook="stock_location_city">
+  <div class="form-group" data-hook="stock_location_city">
     <%= f.label :city, Spree.t(:city) %>
-    <%= f.text_field :city, class: 'fullwidth' %>
+    <%= f.text_field :city, class: 'form-control' %>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_address2">
+  <div class="form-group" data-hook="stock_location_address2">
     <%= f.label :address2, Spree.t(:street_address_2) %>
-    <%= f.text_field :address2, class: 'fullwidth' %>
+    <%= f.text_field :address2, class: 'form-control' %>
   </div>
 
-  <div class="three columns field" data-hook="stock_location_zipcode">
+  <div class="form-group" data-hook="stock_location_zipcode">
     <%= f.label :zipcode, Spree.t(:zip) %>
-    <%= f.text_field :zipcode, class: 'fullwidth' %>
+    <%= f.text_field :zipcode, class: 'form-control' %>
   </div>
 
-  <div class="omega three columns field" data-hook="stock_location_phone">
+  <div class="form-group" data-hook="stock_location_phone">
     <%= f.label :phone, Spree.t(:phone) %>
-    <%= f.phone_field :phone, class: 'fullwidth' %>
+    <%= f.phone_field :phone, class: 'form-control' %>
   </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_country">
+  <div class="form-group" data-hook="stock_location_country">
     <%= f.label :country_id, Spree.t(:country) %>
-    <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
+    <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2' } %></span>
   </div>
 
-  <div class="omega six columns field" data-hook="stock_location_state">
+  <div class="form-group" data-hook="stock_location_state">
     <% if f.object.country %>
       <%= f.label :state_id, Spree.t(:state) %>
       <span id="state" class="region">
-        <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+        <%= f.text_field :state_name, style: "#{f.object.country.states.empty? ? '' : 'display: none;'}", disabled: !f.object.country.states.empty?, class: 'state_name form-control' %>
+        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2', style: "#{f.object.country.states.empty? ? 'display: none;' : '' };", disabled: f.object.country.states.empty?} %>
       </span>
     <% end %>
   </div>