spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -1,53 +1,48 @@
 <script type='text/template' id='variant_autocomplete_stock_template'>
-  <fieldset>
-    <legend align="center"><%= Spree.t(:select_stock) %></legend>
-      <table class="stock-levels" data-hook="stock-levels">
-        <colgroup>
-          <col style="width: 30%;" />
-          <col style="width: 40%;" />
-          <col style="width: 20%;" />
-          <col style="width: 10%;" />
-        </colgroup>
-        <thead>
-          <th><%= Spree.t(:location) %></th>
-          <th><%= Spree.t(:count_on_hand) %></th>
-          <th><%= Spree.t(:quantity) %></th>
-          <th class="actions"></th>
-        </thead>
-        <tbody>
-          {{#each variant.stock_items}}
-            <tr>
-              <td>{{this.stock_location_name}}</td>
-              {{#unless ../variant.track_inventory}}
-                <td>
-                  It doesn't track inventory
-                </td>
-                <td>
-                  <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                </td>
-                <td class="actions">
-                  <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
-                </td>
-              {{else}}
-                {{#if this.available}}
-                  <td>
-                    {{this.count_on_hand}}
-                    {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
-                  </td>
-                  <td>
-                    <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
-                  </td>
-                  <td class="actions">
-                    <button class="add_variant no-text fa fa-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
-                  </td>
-                {{else}}
-                  <td><%= Spree.t(:out_of_stock) %></td>
-                  <td>0</td>
-                {{/if}}
-              {{/unless}}
-            </tr>
-          {{/each}}
-        </tbody>
-      </table>
-  </fieldset>
+  
+  <label><%= Spree.t(:select_stock) %></label>
+  <table class="table table-condensed table-bordered stock-levels no-marginb" data-hook="stock-levels">
+    <thead>
+      <th><%= Spree.t(:location) %></th>
+      <th><%= Spree.t(:count_on_hand) %></th>
+      <th width="15%"><%= Spree.t(:quantity) %></th>
+      <th class="actions"></th>
+    </thead>
+    <tbody>
+      {{#each variant.stock_items}}
+        <tr>
+          <td>{{this.stock_location_name}}</td>
+          {{#unless ../variant.track_inventory}}
+            <td>It doesn't track inventory</td>
+            <td>
+              <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+            </td>
+            <td class="actions actions-1">
+              <button class="btn btn-sm btn-default add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <span class="icon icon-add"></span>
+              </button>
+            </td>
+          {{else}}
+            {{#if this.available}}
+              <td>
+                {{this.count_on_hand}}
+                {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
+              </td>
+              <td>
+                <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+              </td>
+              <td class="actions actions-1">
+                <button class="btn btn-sm btn-default add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <span class="icon icon-add"></span>
+                </button>
+              </td>
+            {{else}}
+              <td><%= Spree.t(:out_of_stock) %></td>
+              <td>0</td>
+            {{/if}}
+          {{/unless}}
+        </tr>
+      {{/each}}
+    </tbody>
+  </table>  
 </script>

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

@@ -1,42 +1,42 @@
-<div data-hook="admin_variant_form_fields" class="label-block left six columns alpha">
-  <div data-hook="variants">
-    <% @product.option_types.each do |option_type| %>
-      <div class="field" data-hook="presentation">
-        <%= label :new_variant, option_type.presentation %>
-        <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-          { :prompt => true }, { :name => 'variant[option_value_ids][]', :class => 'select2 fullwidth' } %>
-      </div>
-    <% end %>
+<div class="row">
+  <div data-hook="admin_variant_form_fields" class="col-md-6">
+    <div data-hook="variants">
+      <% @product.option_types.each do |option_type| %>
+        <div class="form-group" data-hook="presentation">
+          <%= label :new_variant, option_type.presentation %>
+          <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
+            { :prompt => true }, { :name => 'variant[option_value_ids][]', :class => 'select2' } %>
+        </div>
+      <% end %>
 
-    <div class="field" data-hook="sku">
-      <%= f.label :sku, Spree.t(:sku) %>
-      <%= f.text_field :sku, :class => 'fullwidth' %>
-    </div>
+      <div class="form-group" data-hook="sku">
+        <%= f.label :sku, Spree.t(:sku) %>
+        <%= f.text_field :sku, :class => 'form-control' %>
+      </div>
 
-    <div class="field" data-hook="price">
-      <%= f.label :price, Spree.t(:price) %>
-      <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'fullwidth' %>
-    </div>
+      <div class="form-group" data-hook="price">
+        <%= f.label :price, Spree.t(:price) %>
+        <%= f.text_field :price, :value => number_to_currency(@variant.price, :unit => ''), :class => 'form-control' %>
+      </div>
 
-    <div class="field" data-hook="cost_price">
-      <%= f.label :cost_price, Spree.t(:cost_price) %>
-      <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'fullwidth' %>
-    </div>
+      <div class="form-group" data-hook="cost_price">
+        <%= f.label :cost_price, Spree.t(:cost_price) %>
+        <%= f.text_field :cost_price, :value => number_to_currency(@variant.cost_price, :unit => ''), :class => 'form-control' %>
+      </div>
 
-    <div class="field" data-hook="tax_category">
-      <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-      <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
+      <div class="form-group" data-hook="tax_category">
+        <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
+      </div>
     </div>
   </div>
-</div>
 
-<div class="right six columns omega label-block" data-hook="admin_variant_form_additional_fields">
-  <% [:weight, :height, :width, :depth].each do |field| %>
-    <div class="field" data-hook="<%= field %>"><%= f.label field, Spree.t(field) %>
-      <% value = number_with_precision(@variant.send(field), :precision => 2) %>
-      <%= f.text_field field, :value => value, :class => 'fullwidth' %>
-    </div>
-  <% end %>
+  <div class="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) %>
+        <%= f.text_field field, :value => value, :class => 'form-control' %>
+      </div>
+    <% end %>
+  </div>
 </div>
-
-<div class="clear"></div>

data/app/views/spree/admin/variants/_split.js.erb

@@ -1,7 +1,7 @@
 <script type='text/template' id='variant_split_template'>
   <tr class='stock-item-split' data-variant-id='{{variant.id}}'>
     <td colspan='2'>
-      <%=Spree.t("move_variant_to", default: "Move {{variant.name}} to")%>
+      <%= Spree.t("move_variant_to", default: "Move {{variant.name}} to") %>
     </td>
     <td colspan='2'>
     <select name="item_stock_location" id='item_stock_location' style='width:100%;'>
@@ -19,11 +19,15 @@
       </select>
     </td>
     <td>
-      <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
+      <input class="quantity form-control" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
     </td>
     <td class='actions'>
-      <a href='#' class='save-split icon_link fa fa-ok no-text with-tip' title='Save'></a>
-      <a href='#' class='cancel-split icon_link fa fa-cancel no-text with-tip' title='Cancel'></a>
+      <a href='#' class='save-split with-tip btn btn-sm btn-default' title='Save'>
+        <span class="icon icon-save"></span>
+      </a>
+      <a href='#' class='cancel-split with-tip btn btn-sm btn-default' title='Cancel'>
+        <span class="icon icon-delete"></span>
+      </a>
     </td>
   </tr>
 </script>

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

@@ -1,11 +1,9 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Variants' } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <fieldset class="no-border-top">
+  <fieldset>
     <div data-hook="admin_variant_edit_form">
       <%= render :partial => 'form', :locals => { :f => f } %>
     </div>

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

@@ -1,20 +1,10 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/product_tabs', :locals => {:current => 'Variants'} %>
 
 <%# Place for new variant form %>
 <div id="new_variant" data-hook></div>
 
 <% if @variants.any? %>
-  <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
-    <colgroup>
-      <col style="width: 5%" />
-      <col style="width: 25%" />
-      <col style="width: 20%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
-      <col style="width: 15%" />
-    </colgroup>
+  <table class="table sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
     <thead data-hook="variants_header">
       <tr>
         <th colspan="2"><%= Spree.t(:options) %></th>
@@ -25,28 +15,29 @@
     </thead>
     <tbody>
     <% @variants.each do |variant| %>
-      <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row" class="<%= cycle('odd', 'even')%>">
-        <td class="no-border">
-          <span class="handle"></span>
+      <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
+        <td class="move-handle">
+          <span class="icon icon-move handle"></span>
         </td>
         <td><%= variant.options_text %></td>
-        <td class="align-center"><%= variant.display_price.to_html %></td>
-        <td class="align-center"><%= variant.sku %></td>
-        <td class="actions">
+        <td><%= variant.display_price.to_html %></td>
+        <td><%= variant.sku %></td>
+        <td class="actions actions-2 text-right">
           <%= link_to_edit(variant, :no_text => true) unless variant.deleted? %>
-          &nbsp;
           <%= link_to_delete(variant, :no_text => true) unless variant.deleted? %>
         </td>
       </tr>
       <% end %>
       <% unless @product.has_variants? %>
-        <tr><td colspan="5"><%= Spree.t(:none) %></td></tr>
+        <tr>
+          <td colspan="5"><%= Spree.t(:none) %></td>
+        </tr>
       <% end %>
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>,
+  <div class="no-objects-found alert alert-info">
+    <%= Spree.t(:no_resource_found, resource: Spree::Variant.model_name.human(count: :many)) %>,
     <%= link_to Spree.t(:add_one), spree.new_admin_product_variant_path(@product) %>!
   </div>
 <% end %>
@@ -60,17 +51,7 @@
   </p>
 <% else %>
   <% content_for :page_actions do %>
-    <ul class="inline-menu" data-hook="toolbar">
-      <li id="new_var_link" data-hook>
-        <%= link_to_with_icon('plus',
-                              Spree.t(:new_variant),
-                              new_admin_product_variant_url(@product),
-                              :remote => :true,
-                              :'data-update' => 'new_variant',
-                              :class => 'button'
-                             ) %>
-      </li>
-      <li><%= link_to_with_icon('filter', @deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active), admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), :class => 'button') %></li>
-    </ul>
+    <%= button_link_to Spree.t(:new_variant), new_admin_product_variant_url(@product), { :remote => :true, :icon => 'add', :'data-update' => 'new_variant', :class => 'btn-success', id: 'new_var_link' } %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), admin_product_variants_url(@product, :deleted => @deleted.blank? ? "on" : "off"), { :class => 'btn-default', :icon => 'filter' } %>
   <% end %>
 <% end %>

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

@@ -1,9 +1,11 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @variant } %>
 
 <%= form_for [:admin, @product, @variant] do |f| %>
-  <fieldset data-hook="admin_variant_new_form">
-    <legend align="center"><%= Spree.t(:new_variant) %></legend>
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-  </fieldset>
+  <div class="well">
+    <fieldset data-hook="admin_variant_new_form">
+      <legend><%= Spree.t(:new_variant) %></legend>
+      <%= render :partial => 'form', :locals => { :f => f } %>
+      <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    </fieldset>
+  </div>
 <% end %>

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

@@ -1,3 +1,3 @@
-$("#new_variant").html('<%= escape_javascript(render :template => 'spree/admin/variants/new', :formats => [:html], :handlers => [:erb]) %>');
+$("#new_variant").html('<%= escape_javascript(render template: 'spree/admin/variants/new', formats: [:html], handlers: [:erb]) %>');
 $(".select2").select2();
 $("#new_var_link").hide();

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

@@ -1,10 +1,16 @@
-<div id="country_members" data-hook="member" class="omega six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:countries) %></legend>
+<div id="country_members" data-hook="member">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:countries) %>
+      </h1>
+    </div>
 
-    <%= zone_form.field_container :country_ids do %>
-      <%= zone_form.label :country_ids, Spree.t(:countries) %><br>
-      <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
-    <% end %>
-  </fieldset>
+    <div class="panel-body">
+      <%= zone_form.field_container :country_ids, class: ['form-group'] do %>
+        <%= zone_form.label :country_ids, Spree.t(:countries) %>
+        <%= zone_form.collection_select :country_ids, @countries, :id, :name, {}, { :multiple => true, :class => "select2" } %>
+      <% end %>
+    </div>
+  </div>  
 </div>

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

@@ -1,37 +1,48 @@
-<div class="alpha six columns" data-hook="admin_zone_form_fields">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:general_settings)%></legend>
+<div class="row">
+  <div class="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>
+      </div>
 
-    <%= zone_form.field_container :name do %>
-      <%= zone_form.label :name, Spree.t(:name) %><br />
-      <%= zone_form.text_field :name, :class => 'fullwidth' %>
-    <% end %>
+      <div class="panel-body">
+        <%= zone_form.field_container :name, class: ['form-group'] do %>
+          <%= zone_form.label :name, Spree.t(:name) %>
+          <%= zone_form.text_field :name, :class => 'form-control' %>
+        <% end %>
 
-    <%= zone_form.field_container :description do %>
-      <%= zone_form.label :description, Spree.t(:description) %><br />
-      <%= zone_form.text_field :description, :class => 'fullwidth' %>
-    <% end %>
+        <%= zone_form.field_container :description, class: ['form-group'] do %>
+          <%= zone_form.label :description, Spree.t(:description) %>
+          <%= zone_form.text_field :description, :class => 'form-control' %>
+        <% end %>
 
-    <div data-hook="default" class="field">
-      <%= zone_form.check_box :default_tax %>
-      <%= label_tag :zone_default_tax, Spree.t(:default_tax_zone) %>
-    </div>
+        <div data-hook="default" class="checkbox">
+          <%= label_tag "zone[#{:default_tax}" do %>
+            <%= zone_form.check_box :default_tax %>
+            <%= Spree.t(:default_tax_zone) %>
+          <% end %>
+        </div>
 
-    <div data-hook="type" class="field">
-      <%= label_tag Spree.t(:type) %>
-      <ul>
-        <li>
-          <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
-          <%= label_tag :country_based, Spree.t(:country_based) %>
-        </li>
-        <li>
-          <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
-          <%= label_tag :state_based, Spree.t(:state_based) %>
-        </li>
-      </ul>
+        <div data-hook="type" class="form-group">
+          <strong><%= Spree.t(:type) %></strong>
+          <div class="radio">
+            <%= label_tag :country_based do %>
+              <%= zone_form.radio_button('kind', 'country', { :id => 'country_based' }) %>
+              <%= Spree.t(:country_based) %>
+            <% end %>
+          </div>
+          <div class="radio">
+            <%= label_tag :state_based do %>
+              <%= zone_form.radio_button('kind', 'state', { :id => 'state_based' }) %>
+              <%= Spree.t(:state_based) %>
+            <% end %>
+          </div>
+        </div>
+      </div>
     </div>
-  </fieldset>
+  </div>
+  <div class="col-md-6">
+    <%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
+    <%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>
+  </div>
 </div>
-
-<%= render :partial => 'state_members', :locals => { :zone_form => zone_form }%>
-<%= render :partial => 'country_members', :locals => { :zone_form => zone_form } %>

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

@@ -1,10 +1,16 @@
-<div id="state_members" data-hook="member" class="omega six columns">
-  <fieldset class="no-border-bottom">
-    <legend align="center"><%= Spree.t(:states) %></legend>
+<div id="state_members" data-hook="member">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:states) %>
+      </h1>
+    </div>
 
-    <%= zone_form.field_container :state_ids do %>
-      <%= zone_form.label :state_ids, Spree.t(:states) %><br>
-      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2 fullwidth" } %>
-    <% end %>
-  </fieldset>
+    <div class="panel-body">
+      <%= zone_form.field_container :state_ids, class: ['form-group'] do %>
+        <%= zone_form.label :state_ids, Spree.t(:states) %>
+        <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { :multiple => true, :class => "select2" } %>
+      <% end %>
+    </div>
+  </div>
 </div>

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

@@ -1,19 +1,11 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_zone) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_zones_list), admin_zones_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::Zone.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
   <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
-  <div class="clear"></div>
+
   <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
 <% end %>

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

@@ -1,25 +1,15 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:zones) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_zone), new_object_url, :icon => 'plus', :id => 'admin_new_zone_link' %>
-  </li>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_zone_link' %>
 <% end %>
 
 <%= paginate @zones %>
 
 <% if @zones.any? %>
-  <table class="index" id='listing_zones' data-hook>
-    <colgroup>
-      <col style="width: 30%" />
-      <col style="width: 40%" />
-      <col style="width: 15%" />
-      <col style="width: 15%" />
-    </colgroup>
+  <table class="table" id='listing_zones' data-hook>
     <thead>
       <tr data-hook="zones_header">
         <th><%= sort_link @search,:name, Spree.t(:name), :title => 'zones_order_by_name_title' %></th>
@@ -32,11 +22,11 @@
     </thead>
     <tbody>
       <% @zones.each do |zone| %>
-        <tr id="<%= spree_dom_id zone %>" data-hook="zones_row" class="<%= cycle('odd', 'even')%>">
-          <td class="align-center"><%= zone.name %></td>
+        <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
+          <td><%= zone.name %></td>
           <td><%= zone.description %></td>
-          <td class="align-center"><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="actions">
+          <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="actions actions-2 text-right">
             <%=link_to_edit zone, :no_text => true %>
             <%=link_to_delete zone, :no_text => true %>
           </td>
@@ -45,9 +35,9 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/zone')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_zone_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Zone.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>
 

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

@@ -1,21 +1,10 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_zone) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_zones_list), spree.admin_zones_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @zone } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @zone } %>
 
 <%= form_for [:admin, @zone] do |zone_form| %>
-  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>
-
-  <div class="clear"></div>
-  
+  <%= render :partial => 'form', :locals => { :zone_form => zone_form } %>  
   <%= render :partial => 'spree/admin/shared/new_resource_links' %>
 <% end %>