spree_backend 2.4.10 → 3.0.0.rc1

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

@@ -1,110 +1,106 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_stock_transfer) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
 <script type='text/template' id='transfer_variant_template'>
   {{#each variants}}
     <tr>
       <td>{{name}}</td>
-      <td class='align-center'>{{quantity}}</td>
-      <td class='actions'>
-        <button class='icon_link fa fa-trash no-text transfer_remove_variant'
-                data-variant-id='{{id}}' data-action='remove'></button>
+      <td class='text-center'>{{quantity}}</td>
+      <td class='actions actions-1 text-center'>
+        <button class='icon_link btn btn-danger btn-sm transfer_remove_variant' data-variant-id='{{id}}'>
+          <span class='icon icon-delete' data-variant-id='{{id}}'></span>
+        </button>
+        <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
+        <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>
       </td>
-      <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
-      <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>
     </tr>
   {{/each}}
 </script>
 
 <%= form_tag admin_stock_transfers_path, :method => :post do %>
-  <fieldset class="twelve columns alpha">
-    <legend align="center"><%= Spree.t(:transfer_stock) %></legend>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:transfer_stock) %>
+      </h1>
+    </div>
 
-    <div class="row" data-hook="admin_stock_movements_form_fields">
-      <div class="alpha six columns">
-        <div class="field" id="stock_movement_reference_field">
+    <div class="panel-body">
+      <div data-hook="admin_stock_movements_form_fields">
+        <div class="form-group" id="stock_movement_reference_field">
           <%= label_tag 'reference', raw("#{Spree.t(:reference)} (#{Spree.t(:optional)})") %>
-          <%= text_field_tag :reference, '', class: 'fullwidth' %>
+          <%= text_field_tag :reference, '', class: 'form-control' %>
         </div>
-      </div>
-      <div class="six columns omega">
-        <div class="field checkbox" id="receive_stock_field">
-          <label for="receive_stock">
-            <%= check_box_tag :transfer_receive_stock %>
-            <%= Spree.t('receive_stock') %>
-          </label>
+        <div class="form-group" id="receive_stock_field">
+          <div class="checkbox">
+            <label for="receive_stock">
+              <%= check_box_tag :transfer_receive_stock %>
+              <%= Spree.t('receive_stock') %>
+            </label>
+          </div>
         </div>
-      </div>
-      <div class="alpha six columns">
-        <div class="field" id="transfer_source_location_id_field">
+        <div class="form-group" id="transfer_source_location_id_field">
           <%= label_tag :transfer_source_location_id, Spree.t(:source) %>
-          <%= select_tag :transfer_source_location_id, {}, class: 'select2 fullwidth' %>
+          <%= select_tag :transfer_source_location_id, {}, class: 'select2' %>
         </div>
-      </div>
-      <div class="six columns omega">
-        <div class="field" id="transfer_destination_location_id_field">
+        <div class="form-group" id="transfer_destination_location_id_field">
           <%= label_tag :transfer_destination_location_id, Spree.t(:destination) %>
-          <%= select_tag :transfer_destination_location_id, {}, class: 'select2 fullwidth' %>
+          <%= select_tag :transfer_destination_location_id, {}, class: 'select2' %>
         </div>
-      </div>
+      </div>  
     </div>
+  </div>
 
-    <fieldset class="no-border-bottom" id="add-variant-to-transfer">
-      <legend><%= Spree.t(:add_variant) %></legend>
+  <div class="panel panel-default" id="add-variant-to-transfer">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:add_variant) %>
+      </h1>
+    </div>
 
-      <div class="alpha eight columns">
-        <div class="field" id="stock_movement_variant_id_field">
-          <%= label_tag 'variant_id', Spree.t(:variant) %>
-          <%= hidden_field_tag 'transfer_variant', {}, class: 'fullwidth' %>
+    <div class="panel-body">
+      <div class="row">
+        <div class="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>
-      <div class="two columns">
-        <div class="field" id="stock_movement_quantity_field">
-          <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
-          <%= number_field_tag :transfer_variant_quantity, 1, class: 'fullwidth', min: 0 %>
-        </div>
-      </div>
-      <div class="two columns omega">
-        <div class="field" style="padding: 25px 0 0 0 !important">
-          <%= button Spree.t(:add), 'plus button transfer_add_variant' %>
+
+        <div class="col-md-4">
+          <div class="form-group" id="stock_movement_quantity_field">
+            <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
+            <div class="input-group">
+              <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 0 %>
+              <span class="input-group-btn">
+                <%= button Spree.t(:add), 'plus', 'submit', class: "transfer_add_variant" %>
+              </span>
+            </div>
+          </div>
         </div>
       </div>
-
-    </fieldset>
-
-    <div class="alpha twelve columns no-objects-found">
-      <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>.
     </div>
+  </div>
 
-    <div id="transfer-variants-table" class="twelve columns alpha" style="display:none">
-      <table class="index sortable">
-        <colgroup>
-          <col style="width: 70%" />
-          <col style="width: 20%" />
-          <col style="width: 10%" />
-        </colgroup>
-        <thead data-hook="transfer_variants_header">
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:quantity) %></th>
-          <th class="actions"></th>
-        </thead>
-        <tbody id="transfer_variants_tbody">
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/variant')) %>.
+  </div>
 
-        </tbody>
-      </table>
-    </div>
+  <div id="transfer-variants-table" style="display:none">
+    <table class="table table-bordered sortable">
+      <thead data-hook="transfer_variants_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="text-center"><%= Spree.t(:quantity) %></th>
+        <th class="actions"></th>
+      </thead>
+      <tbody id="transfer_variants_tbody">
 
-    <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'plus transfer_transfer' %>
-    </div>
-  </fieldset>
+      </tbody>
+    </table>
+  </div>
+
+  <div class="form-actions" data-hook="buttons">
+    <%= button Spree.t(:transfer_stock), 'plus transfer_transfer' %>
+  </div>
 <% end %>

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

@@ -1,48 +1,40 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t('stock_transfer') %> (<%= @stock_transfer.number %>)
+  <%= Spree::StockTransfer.model_name.human(count: :many) %> (<%= @stock_transfer.number %>)
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_stock_transfers_list), admin_stock_transfers_path, :icon => 'arrow-left' %>
-  </li>
-  <li>
-    <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'forward' } %>
-  </li>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { :icon => 'add', :class => 'btn-success' } %>
 <% end %>
 
-<fieldset class="no-border-bottom">
-  <legend align="center"><%= Spree.t(:stock_transfer) %></legend>
-
-  <div class="alpha six columns">
-    <div class="field">
-      <label><%= Spree.t(:reference) %></label>
-      <div class="value"><%= @stock_transfer.reference %></div>
-    </div>
-  </div>
-
-  <div class="omega six columns">
-    <div class="field">
-      <label><%= Spree.t(:created_at) %></label>
-      <div class="value"><%= @stock_transfer.created_at %></div>
-    </div>
-  </div>
+<fieldset>
+  <legend><%= Spree.t(:stock_transfer) %></legend>
+
+  <table class="table table-bordered">
+    <tr>
+      <td width="30%"><strong><%= Spree.t(:created_at) %></strong></td>
+      <td><%= @stock_transfer.created_at %></td>
+    </tr>
+    <% if @stock_transfer.reference.present? %>
+      <tr>
+        <td><strong><%= Spree.t(:reference) %></strong></td>
+        <td><%= @stock_transfer.reference %></td>
+      </tr>
+    <% end %>
+  </table>
 
   <% if @stock_transfer.source_movements.present? %>
-    <fieldset class="no-border-bottom">
+    <fieldset>
       <legend id="stock-location-source">
-        <%= Spree.t(:source) %> <i class="fa fa-arrow-right"></i> <%= @stock_transfer.source_location.name %>
+        <%= Spree.t(:source) %> / <%= @stock_transfer.source_location.name %>
       </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.source_movements %>
     </fieldset>
   <% end %>
 
   <% if @stock_transfer.destination_movements.present? %>
-    <fieldset class="no-border-bottom">
+    <fieldset>
       <legend id="stock-location-destination">
-        <%= Spree.t(:destination) %> <i class="fa fa-arrow-right"></i> <%= @stock_transfer.destination_location.name %>
+        <%= Spree.t(:destination) %> / <%= @stock_transfer.destination_location.name %>
       </legend>
       <%= render :partial => 'stock_movements', :object => @stock_transfer.destination_movements %>
     </fieldset>

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

@@ -1,31 +1,23 @@
-<div data-hook="admin_tax_category_form_fields" class="row">
-  <div class="alpha four columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
-    <% end %>
-  </div>
+<div data-hook="admin_tax_category_form_fields">
+  <%= f.field_container :name, :class => ['form-group'] do %>
+    <%= f.label :name, Spree.t(:name) %>
+    <%= f.text_field :name, :class => 'form-control' %>
+  <% end %>
 
-  <div class="two columns">
-    <%= f.field_container :tax_code do %>
-      <%= f.label :tax_code, Spree.t(:tax_code) %>
-      <%= f.text_field :tax_code, :class => 'fullwidth' %>
-    <% end %>
-  </div>
-  
-  <div class="five columns">
-    <%= f.field_container :description do %>
-      <%= f.label :description, Spree.t(:description) %><br>
-      <%= f.text_field :description, :class => 'fullwidth' %>
-    <% end %>
-  </div>
+  <%= f.field_container :tax_code, :class => ['form-group'] do %>
+    <%= f.label :tax_code, Spree.t(:tax_code) %>
+    <%= f.text_field :tax_code, :class => 'form-control' %>
+  <% end %>
+
+  <%= f.field_container :description, :class => ['form-group'] do %>
+    <%= f.label :description, Spree.t(:description) %><br>
+    <%= f.text_field :description, :class => 'form-control' %>
+  <% end %>
 
-  <div class="three columns omega">
-    <%= f.field_container :is_default, :class => ['checkbox'] do %>
-      <label>
-        <%= f.check_box :is_default %>
-        <%= Spree.t(:default) %>
-      </label>
+  <%= f.field_container :is_default, :class => ['checkbox'] do %>
+    <%= f.label :is_default do %>
+      <%= f.check_box :is_default %>
+      <%= Spree.t(:default) %>
     <% end %>
-  </div>
+  <% end %>
 </div>

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

@@ -1,17 +1,15 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_tax_category) %>
+  <%= Spree.t(:editing_resource, resource: Spree::TaxCategory.model_name.human) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::TaxCategory.model_name.human), admin_tax_categories_path, class: 'btn btn-primary' %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>
 
 <%= form_for [:admin, @tax_category] 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/tax_categories/index.html.erb

@@ -1,33 +1,20 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_tax_categories) %>
+  <%= Spree::TaxCategory.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <ul class="actions inline-menu">
-    <li>
-      <%= button_link_to Spree.t(:new_tax_category), new_object_url, :icon => 'plus', :id => 'admin_new_tax_categories_link' %>
-    </li>
-  </ul>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_tax_categories_link' %>
 <% end %>
 
 <% if @tax_categories.any? %>
-<table class="index" id='listing_tax_categories' data-hook>
-  <colgroup>
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-    <col style="width: 40%" />
-    <col style="width: 15%" />
-    <col style="width: 15%" />
-  </colgroup>
+<table class="table" id='listing_tax_categories' data-hook>
   <thead>
     <tr data-hook="tax_header">
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:tax_code) %></th>
       <th><%= Spree.t(:description) %></th>
       <th><%= Spree.t(:default) %></th>
-      <th class="actions"></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>
@@ -35,12 +22,12 @@
          @edit_url = edit_admin_tax_category_path(tax_category)
          @delete_url = admin_tax_category_path(tax_category)
     %>
-      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%= tax_category.name %></td>
-        <td class="align-center"><%= tax_category.tax_code %></td>
-        <td class="align-center"><%= tax_category.description %></td>
-        <td class="align-center"><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="actions">
+      <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
+        <td><%= tax_category.name %></td>
+        <td><%= tax_category.tax_code %></td>
+        <td><%= tax_category.description %></td>
+        <td><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td class="actions actions-2 text-right">
           <%= link_to_edit tax_category, :no_text => true %>
           <%= link_to_delete tax_category, :no_text => true %>
       </tr>
@@ -48,8 +35,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/tax_category')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_tax_category_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::TaxCategory.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,18 +1,15 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_tax_category) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_tax_categories_list), admin_tax_categories_path, :class => 'button' %></li>
+  <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_resource_list, resource: Spree::TaxCategory.model_name.human), admin_tax_categories_path, class: 'btn btn-default' %>
 <% end %>
 
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_category } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_category } %>
 
 <%= form_for [:admin, @tax_category] 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/tax_categories/show.html.erb

@@ -1 +1 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+

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

@@ -1,42 +1,51 @@
 <div data-hook="admin_tax_rate_form_fields">
-  <div class="alpha twelve columns">
-    <fieldset data-hook="tax_rates" class=" no-border-bottom">
-      <legend align="center"><%= Spree.t(:general_settings) %></legend>
+  <div class="panel panel-default" data-hook="tax_rates">
+    <div class="panel-heading">
+      <h1 class="panel-title">
+        <%= Spree.t(:general_settings) %>
+      </h1>
+    </div>
 
-      <div class="alpha six columns">
-        <div data-hook="name" class="field">
+    <div class="panel-body">
+      <div class="col-md-6">
+        <div data-hook="name" class="form-group">
           <%= f.label :name, Spree.t(:name) %>
-          <%= f.text_field :name, :class => 'fullwidth' %>
+          <%= f.text_field :name, :class => 'form-control' %>
         </div>
-        <div data-hook="rate" class="field">
+        <div data-hook="rate" class="form-group">
           <%= f.label :amount, Spree.t(:rate) %>
-          <%= f.text_field :amount, :class => 'fullwidth' %>
-          <br/><span class="info"><%= Spree.t(:tax_rate_amount_explanation) %></span>
+          <%= f.text_field :amount, :class => 'form-control' %>
+          <p class="help-block">
+            <%= Spree.t(:tax_rate_amount_explanation) %>
+          </p>
         </div>
-        <div data-hook="included" class="field">
-          <%= f.check_box :included_in_price %>
-          <%= f.label :included_in_price, Spree.t(:included_in_price) %>
+        <div data-hook="included" class="form-group">
+          <%= f.label :included_in_price do %>
+            <%= f.check_box :included_in_price %>
+            <%= Spree.t(:included_in_price) %>
+          <% end %>
         </div>
       </div>
 
-      <div class="omega six columns">
-        <div data-hook="zone" class="field">
+      <div class="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 fullwidth'}) %>
+          <%= f.collection_select(:zone_id, @available_zones, :id, :name, {}, {:class => 'select2'}) %>
         </div>
-        <div data-hook="category" class="field">
+        <div data-hook="category" class="form-group">
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
-          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2 fullwidth'}) %>
+          <%= f.collection_select(:tax_category_id, @available_categories,:id, :name, {}, {:class => 'select2'}) %>
         </div>
-        <div data-hook="show_rate" class="field">
-          <%= f.check_box :show_rate_in_label %>
-          <%= f.label :show_rate_in_label, Spree.t(:show_rate_in_label) %>
+        <div data-hook="show_rate" class="form-group">
+          <%= f.label :show_rate_in_label do %>
+            <%= f.check_box :show_rate_in_label %>
+            <%= Spree.t(:show_rate_in_label) %>
+          <% end %>
         </div>
       </div>
-    </fieldset>
-  </div>
-
-  <div class="clear"></div>
+    </div>
 
-  <%= render 'spree/admin/shared/calculator_fields', :f => f %>
+  </div>
 </div>
+
+<%= render 'spree/admin/shared/calculator_fields', :f => f %>

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

@@ -1,21 +1,10 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_tax_rate) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::TaxRate.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <div class="clear"></div>
-    <%= 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/tax_rates/index.html.erb

@@ -1,27 +1,13 @@
-<%= render 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:tax_rates) %>
+  <%= Spree::TaxRate.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_tax_rate), new_object_url, :icon => 'plus' %>
-  </li>
+  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add' %>
 <% end %>
 
 <% if @tax_rates.any? %>
-  <table class="index">
-    <colgroup>
-      <col style="width: 15%">
-      <col style="width: 15%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 10%">
-      <col style="width: 15%">
-      <col style="width: 15%">
-    </colgroup>
+  <table class="table">
     <thead>
       <tr data-hook="rate_header">
         <th><%= Spree.t(:zone) %></th>
@@ -31,30 +17,30 @@
         <th><%= Spree.t(:included_in_price) %></th>
         <th><%= Spree.t(:show_rate_in_label) %></th>
         <th><%= Spree.t(:calculator) %></th>
-        <th class="actions"></th>
+        <th></th>
       </tr>
     </thead>
     <tbody>
       <% @tax_rates.each do |tax_rate|%>
-      <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
-        <td class="align-center"><%=tax_rate.name %></td>
-        <td class="align-center"><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
-        <td class="align-center"><%=tax_rate.amount %></td>
-        <td class="align-center"><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="align-center"><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-        <td class="align-center"><%=tax_rate.calculator.to_s %></td>
-        <td class="actions">
-          <%= link_to_edit tax_rate, :no_text => true %>
-          <%= link_to_delete tax_rate, :no_text => true %>
+      <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
+        <td><%=tax_rate.zone.try(:name) || Spree.t(:not_available) %></td>
+        <td><%=tax_rate.name %></td>
+        <td><%=tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>
+        <td><%=tax_rate.amount %></td>
+        <td><%=tax_rate.included_in_price? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td><%=tax_rate.show_rate_in_label? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+        <td><%=tax_rate.calculator.to_s %></td>
+        <td class="actions actions-2 text-right">
+          <%= link_to_edit tax_rate, no_text: true %>
+          <%= link_to_delete tax_rate, no_text: true %>
         </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/tax_rate')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_tax_rate_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::TaxRate.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,25 +1,13 @@
-<%= render :partial => 'spree/admin/shared/configuration_menu' %>
-
 <% content_for :page_title do %>
   <%= Spree.t(:new_tax_rate) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_tax_rates_list), spree.admin_tax_rates_path, :icon => 'arrow-left' %>
-  </li>
-<% end %>
-
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @tax_rate } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @tax_rate } %>
 
 <%= form_for [:admin, @tax_rate] do |f| %>
-  <fieldset class="no-border-top">
-    
+  <fieldset>
     <%= render :partial => 'form', :locals => { :f => f } %>
 
-    <div class="clear"></div>
-
     <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-
   </fieldset>
 <% end %>