spree_backend 2.4.10 → 3.0.0.rc1

data/app/views/spree/admin/promotions/rules/_user.html.erb

@@ -1,4 +1,6 @@
-<div class="field alpha omega eight columns">
-  <label><%= Spree.t('user_rule.choose_users') %></label><br>
-  <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker fullwidth' value='<%= promotion_rule.user_ids.join(",") %>'>
+<div class="panel-body">
+  <div class="form-group no-marginb">
+    <%= label_tag Spree.t('user_rule.choose_users') %>
+    <input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker' value='<%= promotion_rule.user_ids.join(",") %>'>
+  </div>
 </div>

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

@@ -1,15 +1,15 @@
-<div data-hook="admin_property_form" class="align-center row">
-  <div class="alpha eight columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+<div data-hook="admin_property_form" class="row">
+  <div class="col-md-6">
+    <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+      <%= f.text_field :name, :class => 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="eight columns omega">
-    <%= f.field_container :presentation do %>
-      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span><br />
-      <%= f.text_field :presentation, :class => 'fullwidth' %>
+  <div class="col-md-6">
+    <%= f.field_container :presentation, class: ['form-group'] do %>
+      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
+      <%= f.text_field :presentation, :class => 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>

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

@@ -1,17 +1,11 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_property) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_properties_list), admin_properties_url, :icon => 'arrow-left'%></li>
+  <%= Spree.t(:editing_resource, resource: Spree::Property.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @property } %>
 
 <%= form_for [:admin, @property] 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/properties/index.html.erb

@@ -1,77 +1,67 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:properties) %>
+  <%= Spree::Property.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li id="new_property_link">
-    <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'plus', 'data-update' => 'new_property', :id => 'new_property_link' } %>
-  </li>
-<% end %>
-
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
-<% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= button_link_to Spree.t(:new_property), new_object_url, { :class => "btn-success", :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link' } %>
 <% end %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_property_sidebar">
-
     <%= search_form_for [:admin, @search] do |f| %>
 
-        <%- locals = {:f => f} %>
+      <%- locals = {:f => f} %>
 
-        <div data-hook="admin_property_index_search">
-          <div class="alpha eight columns">
-            <div class="field">
-              <%= f.label :name_cont, Spree.t(:name) %>
-              <%= f.text_field :name_cont, :size => 15 %>
-            </div>
+      <div class="row">
+        <div class="col col-md-6">
+          <div data-hook="admin_property_index_search" class="form-group">
+            <%= f.label :name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, :class => "form-control js-quick-search-target" %>
           </div>
         </div>
 
-        <div class="clear"></div>
-
-        <div class="form-buttons actions filter-actions" data-hook="admin_pproperties_index_search_buttons">
-          <%= button Spree.t(:search), 'search' %>
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= f.label :presentation_cont, Spree.t(:presentation) %>
+            <%= f.text_field :presentation_cont, :class => "form-control" %>
+          </div>
         </div>
+      </div>
+
+      <div class="form-actions" data-hook="admin_pproperties_index_search_buttons">
+        <%= button Spree.t(:search), 'search' %>
+      </div>
+
     <% end %>
   </div>
 <% end %>
 
-<div id="new_property"></div>
-
 <% if @properties.any? %>
-<table class="index" id='listing_properties' data-hook>
-  <colgroup>
-    <col style="width: 40%">
-    <col style="width: 45%">
-    <col style="width: 15%">
-  </colgroup>
-  <thead>
-    <tr data-hook="listing_properties_header">
-      <th><%= Spree.t(:name) %></th>
-      <th><%= Spree.t(:presentation) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @properties.each do |property| %>
-      <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row" class="<%= cycle('odd', 'even')%>">
-        <td style="padding-left:1em"><%= property.name %></td>
-        <td style="padding-left:1em"><%= property.presentation %></td>
-        <td class="actions">
-          <%= link_to_edit(property, :no_text => true) %>
-          <%= link_to_delete(property, :no_text => true) %>
-        </td>
+  <table class="table" id='listing_properties' data-hook>
+    <thead>
+      <tr data-hook="listing_properties_header">
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:presentation) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @properties.each do |property| %>
+        <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
+          <td><%= property.name %></td>
+          <td><%= property.presentation %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(property, :no_text => true) %>
+            <%= link_to_delete(property, :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/property')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_property_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Property.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>
 

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

@@ -1,13 +1,14 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @property } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
+<% content_for :page_title do %>
+  <%= Spree.t(:new_property) %>
+<% end %>
 
 <%= form_for [:admin, @property] do |f| %>
-<fieldset data-hook="new_property">
-  <legend align="center"><%= Spree.t(:new_property) %></legend>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <div class="filter-actions">
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-  </div>
-</fieldset>
+  <fieldset data-hook="new_property">
+    <%= render partial: 'form', locals: { f: f } %>
+    <div class="form-actions">
+      <%= render partial: 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </fieldset>
 <% end %>

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

@@ -1,36 +1,33 @@
-<div data-hook="admin_prototype_form_fields" class="row">
-  <div class="alpha four columns">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, class: 'fullwidth' %>
-      <%= f.error_message_on :name %>
+<div data-hook="admin_prototype_form_fields">
+  <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+    <%= f.text_field :name, class: 'form-control' %>
+    <%= f.error_message_on :name %>
+  <% end %>
+
+  <div id='properties' data-hook>
+    <%= f.field_container :property_ids, class: ['form-group'] do %>
+      <%= f.label :property_ids, Spree.t(:properties) %><br>
+      <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
-  <div class="four columns">
-    <div id='properties' data-hook>
-      <%= f.field_container :property_ids do %>
-        <%= f.label :property_ids, Spree.t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
-      <% end %>
-    </div>
+  <div id="option_types" data-hook>
+    <%= f.field_container :option_type_ids, class: ['form-group'] do %>
+      <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2" } %>
+    <% end %>
   </div>
 
-  <div class="four columns">
-    <div id="option_types" data-hook>
-      <%= f.field_container :option_type_ids do %>
-        <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
-        <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
-      <% end %>
-    </div>
+  <div id='taxons' data-hook>
+    <%= f.field_container :taxon_ids, class: ['form-group'] do %>
+      <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
+      <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2" } %>
+    <% end %>
   </div>
 
-  <div class="four columns omega">
-    <div id='taxons' data-hook>
-      <%= f.field_container :taxon_ids do %>
-        <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
-        <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
-      <% end %>
-    </div>
-  </div>
+  <%= f.field_container :option_type_ids, class: ['form-group'] do %>
+    <%= f.label :option_type_ids, Spree.t(:option_types) %>
+    <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { multiple: true, class: "select2" } %>
+  <% end %>
 </div>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -1,8 +1,4 @@
-<table class="index">
-  <colgroup>
-    <col style="width: 80%" />
-    <col style="width: 20%" />
-  </colgroup>
+<table class="table table-condensed table-bordered">
   <thead>
     <tr data-hook="available_header">
       <th><%= Spree.t(:name) %></th>
@@ -11,10 +7,10 @@
   </thead>
   <tbody>
     <% @prototypes.each do |prototype| %>
-      <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
+      <tr id="row_<%= prototype.id %>" data-hook="available_row">
         <td><%= prototype.name %></td>
-        <td class="actions">
-          <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype fa fa-ok' %>
+        <td class="actions actions-1">
+          <%= link_to_with_icon 'save', Spree.t(:select), select_admin_prototype_url(prototype), :class => ' btn btn-default btn-sm ajax select_properties_from_prototype', :no_text => true %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/prototypes/available.js.erb

@@ -1,2 +1,2 @@
 $("#prototypes").html('<%= escape_javascript(render :partial => "spree/admin/prototypes/prototypes") %>');
-$("#new_ptype_link").hide();
+$(".js-new-ptype-link").hide();

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

@@ -1,19 +1,11 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_prototype) %>
-<% end %>
-
-<% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'arrow-left' %>
-  </li>
+  <%= Spree.t(:editing_resource, resource: Spree::Prototype.model_name.human) %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>
 
 <%= form_for [:admin, @prototype] 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/prototypes/index.html.erb

@@ -1,47 +1,34 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:prototypes) %>
+  <%= Spree::Prototype.model_name.human(count: :many) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li id="new_prototype_link">
-    <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
-  </li>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { :class => "btn-success", :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
 <% end %>
 
-<%= render 'spree/admin/shared/product_sub_menu' %>
-
-<%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
-
-<%# Placeholder for new prototype form %>
-<div id="new_prototype"></div>
-
 <% if @prototypes.any? %>
-<table class="index" id='listing_prototypes' data-hook>
-  <colgroup>
-    <col style="width: 90%">
-    <col style="width: 10%">
-  </colgroup>
-  <thead>
-    <tr data-hook="prototypes_header">
-      <th><%= Spree.t(:name) %></th>
-      <th class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @prototypes.each do |prototype| %>
-      <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row" class="<%= cycle('odd', 'even')%>">
-        <td style="padding-left:1em"><%= prototype.name %></td>
-        <td class="actions">
-          <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
-          <%= link_to_delete(prototype, :no_text => true) %>
-        </td>
+  <table class="table" id='listing_prototypes' data-hook>
+    <thead>
+      <tr data-hook="prototypes_header">
+        <th><%= Spree.t(:name) %></th>
+        <th class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @prototypes.each do |prototype| %>
+        <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
+          <td><%= prototype.name %></td>
+          <td class="actions actions-2 text-right">
+            <%= link_to_edit(prototype, :no_text => true, :class => 'admin_edit_prototype') %>
+            <%= link_to_delete(prototype, :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/prototype')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_prototype_path %>!
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: Spree::Prototype.model_name.human(count: :many)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
 <% end %>

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

@@ -1,11 +1,12 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
+<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @prototype } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
+<% content_for :page_title do %>
+  <%= Spree.t(:new_prototype) %>
+<% end %>
 
 <%= form_for [:admin, @prototype] do |f| %>
-<fieldset data-hook="new_prototype">
-  <legend align="center"><%= Spree.t(:new_prototype) %></legend>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-</fieldset>
+  <fieldset data-hook="new_prototype">
+    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -7,14 +7,14 @@
         <b>
           <%= check_box_tag "option_types[]", ot.id, (params[:option_types] || []).include?(ot.id.to_s), :id => "option_type_#{ot.id}", :class => "option-type" %>
           <%= label_tag "option_type_#{ot.id}", ot.presentation %>
-        </b>      
+        </b>
         <ul class="option-type-values">
-        <% ot.option_values.each do |ov| %>
+          <% ot.option_values.each do |ov| %>
           <li>
-            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), :id => "option_value_#{ov.id}", :class => "option-value" %>
+            <%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
             <%= label_tag "option_value_#{ov.id}", ov.presentation %>
           </li>
-        <% end %>
+          <% end %>
         </ul>
       </li>
     <% end %>
@@ -22,21 +22,18 @@
 
   <script type="text/javascript">
   //<![CDATA[
-    (function($){
-
-      $("input.option-type").change(function() {
-        $(this).parents("li").find("input.option-value").prop("checked", this.checked);
-      });
-
-      $("input.option-value").change(function() {
-        var any_checked = false;
-        $(this).parents(".option-type-values").find("input.option-value").each(function(i, el) {
-          any_checked = any_checked || el.checked;
-        });
-        $(this).parents(".option-type-field").find("input.option-type").prop("checked", any_checked);
+  (function($){
+    $("input.option-type").change(function() {
+      $(this).parents("li").find("input.option-value").prop("checked", this.checked);
+    });
+    $("input.option-value").change(function() {
+      var any_checked = false;
+      $(this).parents(".option-type-values").find("input.option-value").each(function(i, el) {
+        any_checked = any_checked || el.checked;
       });
-
-    })(jQuery);
+      $(this).parents(".option-type-field").find("input.option-type").prop("checked", any_checked);
+    });
+  })(jQuery);
   //]]>
   </script>
 <% end %>

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

@@ -1,4 +1,4 @@
 <%= render partial: 'spree/admin/shared/named_types/edit', locals: {
-  page_title: Spree.t(:editing_refund_reason),
-  back_button_text: Spree.t(:back_to_refund_reason_list)
+  page_title: Spree.t(:editing_resource, resource: Spree::RefundReason.model_name.human),
+  back_button_text: Spree.t(:back_to_resource_list, resource: Spree::RefundReason.model_name.human)
 } %>

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

@@ -1,5 +1,5 @@
 <%= render partial: 'spree/admin/shared/named_types/index', locals: {
-  page_title: Spree.t(:refund_reasons),
+  page_title: Spree::RefundReason.model_name.human(count: :many),
   new_button_text: Spree.t(:new_refund_reason),
-  resource_name: I18n.t(:other, scope: 'activerecord.models.spree/refund_reason')
+  resource_name: Spree::RefundReason.model_name.human(count: :many)
 } %>

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

@@ -1,4 +1,4 @@
 <%= render partial: 'spree/admin/shared/named_types/new', locals: {
   page_title: Spree.t(:new_refund_reason),
-  back_button_text: Spree.t(:back_to_refund_reason_list)
+  back_button_text: Spree.t(:back_to_resource_list, resource: Spree::RefundReason.model_name.human)
 } %>

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

@@ -1,31 +1,27 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: "Payments" } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:editing_refund) %> <%= @refund.id %>
+  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
+  / <%= Spree.t(:editing_resource, resource: Spree::Refund.model_name.human) %> <%= @refund.id %>
 <% end %>
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
-  <fieldset class="no-border-top">
-    <div data-hook="admin_refund_form_fields" class="row">
-      <div class="alpha three columns">
-        <div class="field">
-          <%= Spree.t(:amount) %><br/>
-          <%= @refund.amount %>
-        </div>
+  <fieldset>
+    <div data-hook="admin_refund_form_fields">
+      <div class="form-group">
+        <%= f.label :amount, Spree.t(:amount) %><br/>
+        <%= @refund.amount %>
       </div>
-      <div class="alpha three columns">
-        <div class="field">
-          <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2 fullwidth'}) %>
-        </div>
+      <div class="form-group">
+        <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
+        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2'}) %>
       </div>
     </div>
 
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.save'), 'ok' %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.save'), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,43 +1,35 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_refund) %>
+  / <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
+  / <%= Spree.t(:new_refund) %>
 <% end %>
 
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
-  <fieldset class="no-border-top">
-    <div data-hook="admin_refund_form_fields" class="row">
-      <div class="alpha three columns">
-        <div class="field">
-          <%= Spree.t(:payment_amount) %><br/>
-          <%= @refund.payment.amount %>
-        </div>
+  <fieldset>
+    <div data-hook="admin_refund_form_fields">
+      <div class="form-group">
+        <%= f.label :payment_amount, Spree.t(:payment_amount) %><br/>
+        <%= @refund.payment.amount %>
       </div>
-      <div class="alpha three columns">
-        <div class="field">
-          <%= Spree.t(:credit_allowed) %><br/>
-          <%= @refund.payment.credit_allowed %>
-        </div>
+      <div class="form-group">
+        <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>
+        <%= @refund.payment.credit_allowed %>
       </div>
-      <div class="alpha three columns">
-        <div class="field">
-          <%= f.label :amount, Spree.t(:amount) %><br/>
-          <%= f.text_field :amount, class: 'fullwidth' %>
-        </div>
+      <div class="form-group">
+        <%= f.label :amount, Spree.t(:amount) %>
+        <%= f.text_field :amount, class: 'form-control' %>
       </div>
-      <div class="alpha three columns">
-        <div class="field">
-          <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2 fullwidth'}) %>
-        </div>
+      <div class="form-group">
+        <%= f.label :refund_reason_id, Spree.t(:reason) %>
+        <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2'}) %>
       </div>
     </div>
 
-    <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:refund), 'ok' %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t(:refund), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), :icon => "delete" %>
     </div>
   </fieldset>
 <% end %>