spree_backend 2.4.10 → 3.0.0.rc1

data/app/helpers/spree/admin/base_helper.rb

@@ -1,13 +1,24 @@
 module Spree
   module Admin
     module BaseHelper
+      def flash_alert flash
+        if flash.present?
+          message = flash[:error] || flash[:notice] || flash[:success]
+          flash_class = "danger" if flash[:error]
+          flash_class = "info" if flash[:notice]
+          flash_class = "success" if flash[:success]
+          flash_div = content_tag(:div, message, class: "alert alert-#{flash_class} alert-auto-dissapear")
+          content_tag(:div, flash_div, class: 'col-md-12')          
+        end
+      end
+
       def field_container(model, method, options = {}, &block)
         css_classes = options[:class].to_a
         css_classes << 'field'
         if error_message_on(model, method).present?
           css_classes << 'withError'
         end
-        content_tag(:div, capture(&block), :class => css_classes.join(' '), :id => "#{model}_#{method}_field")
+        content_tag(:div, capture(&block), class: css_classes.join(' '), id: "#{model}_#{method}_field")
       end
 
       def error_message_on(object, method, options = {})
@@ -16,7 +27,7 @@ module Spree
 
         if obj && obj.errors[method].present?
           errors = obj.errors[method].map { |err| h(err) }.join('<br />').html_safe
-          content_tag(:span, errors, :class => 'formError')
+          content_tag(:span, errors, class: 'formError')
         else
           ''
         end
@@ -24,48 +35,12 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, :format => Spree.t('date_picker.format', default: '%Y/%m/%d'))
+          l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
         else
           nil
         end
       end
 
-      # This method demonstrates the use of the :child_index option to render a
-      # form partial for, for instance, client side addition of new nested
-      # records.
-      #
-      # This specific example creates a link which uses javascript to add a new
-      # form partial to the DOM.
-      #
-      #   <%= form_for @project do |project_form| %>
-      #     <div id="tasks">
-      #       <%= project_form.fields_for :tasks do |task_form| %>
-      #         <%= render :partial => 'task', :locals => { :f => task_form } %>
-      #       <% end %>
-      #     </div>
-      #   <% end %>
-      def generate_html(form_builder, method, options = {})
-        options[:object] ||= form_builder.object.class.reflect_on_association(method).klass.new
-        options[:partial] ||= method.to_s.singularize
-        options[:form_builder_local] ||= :f
-
-        form_builder.fields_for(method, options[:object], :child_index => 'NEW_RECORD') do |f|
-          render(:partial => options[:partial], :locals => { options[:form_builder_local] => f })
-        end
-
-      end
-
-      def generate_template(form_builder, method, options = {})
-        escape_javascript generate_html(form_builder, method, options)
-      end
-
-      def remove_nested(fields)
-        out = ''
-        out << fields.hidden_field(:_destroy) unless fields.object.new_record?
-        out << (link_to icon('remove'), "#", :class => 'remove')
-        out.html_safe
-      end
-
       def preference_field_tag(name, value, options)
         case options[:type]
         when :integer
@@ -104,29 +79,39 @@ module Spree
       def preference_field_options(options)
         field_options = case options[:type]
         when :integer
-          { :size => 10,
-            :class => 'input_integer' }
+          {
+            size: 10,
+            class: 'input_integer form-control'
+          }
         when :boolean
           {}
         when :string
-          { :size => 10,
-            :class => 'input_string fullwidth' }
+          {
+            size: 10,
+            class: 'input_string form-control'
+          }
         when :password
-          { :size => 10,
-            :class => 'password_string fullwidth' }
+          {
+            size: 10,
+            class: 'password_string form-control'
+          }
         when :text
-          { :rows => 15,
-            :cols => 85,
-            :class => 'fullwidth' }
+          {
+            rows: 15,
+            cols: 85,
+            class: 'form-control'
+          }
         else
-          { :size => 10,
-            :class => 'input_string fullwidth' }
+          {
+            size: 10,
+            class: 'input_string form-control'
+          }
         end
 
         field_options.merge!({
-          :readonly => options[:readonly],
-          :disabled => options[:disabled],
-          :size     => options[:size]
+          readonly: options[:readonly],
+          disabled: options[:disabled],
+          size:     options[:size]
         })
       end
 
@@ -135,36 +120,21 @@ module Spree
         object.preferences.keys.map{ |key|
 
           form.label("preferred_#{key}", Spree.t(key) + ": ") +
-            preference_field_for(form, "preferred_#{key}", :type => object.preference_type(key))
+            preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
 
         }.join("<br />").html_safe
       end
 
-      def link_to_add_fields(name, target, options = {})
-        name = '' if options[:no_text]
-        css_classes = options[:class] ? options[:class] + " spree_add_fields" : "spree_add_fields"
-        link_to_with_icon('plus', name, 'javascript:', :data => { :target => target }, :class => css_classes)
-      end
-
       # renders hidden field and link to remove record using nested_attributes
-      def link_to_remove_fields(name, f, options = {})
-        name = '' if options[:no_text]
-        options[:class] = '' unless options[:class]
-        options[:class] += 'no-text with-tip' if options[:no_text]
+      def link_to_icon_remove_fields(f)
         url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('trash', name, url, :class => "spree_remove_fields #{options[:class]}", :data => {:action => 'remove'}, :title => Spree.t(:remove)) + f.hidden_field(:_destroy)
+        link_to_with_icon('delete', '', url, class: "spree_remove_fields btn btn-sm btn-danger", data: {action: 'remove'}, title: Spree.t(:remove)) + f.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)
         dom_id(record, 'spree')
       end
 
-      def rails_environments
-        @@rails_environments ||= Dir.glob("#{Rails.root}/config/environments/*.rb")
-                                    .map { |f| File.basename(f, ".rb") }
-                                    .sort
-      end
-
       private
         def attribute_name_for(field_name)
           field_name.gsub(' ', '_').downcase

data/app/helpers/spree/admin/navigation_helper.rb

@@ -7,7 +7,7 @@ module Spree
       #   * :route to override automatically determining the default route
       #   * :match_path as an alternative way to control when the tab is active, /products would match /admin/products, /admin/products/5/variants etc.
       def tab(*args)
-        options = {:label => args.first.to_s}
+        options = { label: args.first.to_s }
 
         # Return if resource is found and user is not allowed to :admin
         return '' if klass = klass_for(options[:label]) and cannot?(:admin, klass)
@@ -18,13 +18,12 @@ module Spree
         options[:route] ||=  "admin_#{args.first}"
 
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
-        titleized_label = Spree.t(options[:label], :default => options[:label], :scope => [:admin, :tab]).titleize
+        titleized_label = Spree.t(options[:label], default: options[:label], scope: [:admin, :tab]).titleize
 
-        css_classes = []
+        css_classes = ['sidebar-menu-item']
 
         if options[:icon]
           link = link_to_with_icon(options[:icon], titleized_label, destination_url)
-          css_classes << 'tab-with-icon'
         else
           link = link_to(titleized_label, destination_url)
         end
@@ -41,7 +40,54 @@ module Spree
         if options[:css_class]
           css_classes << options[:css_class]
         end
-        content_tag('li', link, :class => css_classes.join(' '))
+        content_tag('li', link, class: css_classes.join(' '))
+      end
+
+      # Single main menu item
+      def main_menu_item text, url: nil, icon: nil
+        link_to url, :'data-toggle' => "collapse", :'data-parent' => '#sidebar' do
+          content_tag(:span, nil, class: "icon icon-#{icon}") +
+          content_tag(:span, " #{text}", class: 'text') +
+          content_tag(:span, nil, class: "icon icon-chevron-left pull-right")
+        end
+      end
+
+      # Main menu tree menu
+      def main_menu_tree text, icon: nil, sub_menu: nil, url: '#'
+        content_tag :li, class: 'sidebar-menu-item' do
+          main_menu_item(text, url: url, icon: icon) +
+          render(partial: "spree/admin/shared/sub_menu/#{sub_menu}")
+        end
+      end
+
+      # sidebar are used on order edit, product edit, user overview etc.
+      # this link is shown so a user can collapse the sidebar
+      def collapse_sidebar_link
+        content_tag :div, class: "collapse-sidebar" do
+          link_to "javascript:;", class: "js-collapse-sidebar" do
+            content_tag(:span, nil, class: "icon icon-chevron-right") +
+            content_tag(:span, "Collapse sidebar", class: "text")
+          end
+        end
+      end
+
+      # the per_page_dropdown is used on index pages like orders, products, promotions etc.
+      # this method generates the select_tag
+      def per_page_dropdown
+        # there is a config setting for admin_products_per_page, only for the orders page
+        if @products && per_page_default = Spree::Config.admin_products_per_page
+          per_page_options = []
+          5.times do |amount|
+            per_page_options << (amount + 1) * Spree::Config.admin_products_per_page
+          end
+        else
+          per_page_default = 15
+          per_page_options = %w{5 15 30 45 60}
+        end
+
+        select_tag(:per_page,
+          options_for_select(per_page_options, params['per_page'] || per_page_default),
+          { id: "js-per-page-select", class: "form-control pull-right" })
       end
 
       # finds class for a given symbol / string
@@ -61,56 +107,68 @@ module Spree
       end
 
       def link_to_clone(resource, options={})
-        options[:data] = {:action => 'clone'}
-        link_to_with_icon('copy', Spree.t(:clone), clone_object_url(resource), options)
+        options[:data] = { action: 'clone' }
+        options[:class] = "btn btn-primary btn-sm"
+        link_to_with_icon('clone', Spree.t(:clone), clone_object_url(resource), options)
       end
 
       def link_to_new(resource)
-        options[:data] = {:action => 'new'}
+        options[:data] = { action: 'new' }
+        options[:class] = "btn btn-success btn-sm"
         link_to_with_icon('plus', Spree.t(:new), edit_object_url(resource))
       end
 
       def link_to_edit(resource, options={})
         url = options[:url] || edit_object_url(resource)
-        options[:data] = {:action => 'edit'}
+        options[:data] = { action: 'edit' }
+        options[:class] = "btn btn-primary btn-sm"
         link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options={})
-        options[:data] = {:action => 'edit'}
+        options[:data] = { action: 'edit' }
+        options[:class] = "btn btn-primary btn-sm"
         link_to_with_icon('edit', Spree.t(:edit), url, options)
       end
 
       def link_to_delete(resource, options={})
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t(:delete)
-        options[:class] = "delete-resource"
-        options[:data] = { :confirm => Spree.t(:are_you_sure), :action => 'remove' }
-        link_to_with_icon 'trash', name, url, options
+        options[:class] = "btn btn-danger btn-sm delete-resource"
+        options[:data] = { confirm: Spree.t(:are_you_sure), action: 'remove' }
+        link_to_with_icon 'delete', name, url, options
       end
 
       def link_to_with_icon(icon_name, text, url, options = {})
-        options[:class] = (options[:class].to_s + " fa fa-#{icon_name} icon_link with-tip").strip
+        options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip
         options[:class] += ' no-text' if options[:no_text]
         options[:title] = text if options[:no_text]
         text = options[:no_text] ? '' : raw("<span class='text'>#{text}</span>")
         options.delete(:no_text)
-        link_to(text, url, options)
+        if icon_name
+          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
+          text.insert(0, icon + ' ')
+        end
+        link_to(text.html_safe, url, options)
       end
 
       def icon(icon_name)
-        icon_name ? content_tag(:i, '', :class => icon_name) : ''
+        icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
       def button(text, icon_name = nil, button_type = 'submit', options={})
-        button_tag(text, options.merge(:type => button_type, :class => "fa fa-#{icon_name} button"))
+        if icon_name
+          icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
+          text.insert(0, icon + ' ')
+        end
+        button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}"))
       end
 
       def button_link_to(text, url, html_options = {})
         if (html_options[:method] &&
             html_options[:method].to_s.downcase != 'get' &&
             !html_options[:remote])
-          form_tag(url, :method => html_options.delete(:method)) do
+          form_tag(url, method: html_options.delete(:method)) do
             button(text, html_options.delete(:icon), nil, html_options)
           end
         else
@@ -121,19 +179,15 @@ module Spree
 
           html_options.delete('data-update') unless html_options['data-update']
 
-          html_options[:class] = 'button'
+          html_options[:class]  = html_options[:class] ? "btn #{html_options[:class]}" : "btn btn-default"
 
           if html_options[:icon]
-            html_options[:class] += " fa fa-#{html_options[:icon]}"
+            icon = content_tag(:span, '', class: "icon icon-#{html_options[:icon]}")
+            text.insert(0, icon + ' ')
           end
-          link_to(text_for_button_link(text, html_options), url, html_options)
-        end
-      end
 
-      def text_for_button_link(text, html_options)
-        s = ''
-        s << text
-        raw(s)
+          link_to(text.html_safe, url, html_options)
+        end
       end
 
       def configurations_menu_item(link_text, url, description = '')
@@ -148,11 +202,25 @@ module Spree
         is_active = url.ends_with?(controller.controller_name) ||
                     url.ends_with?("#{controller.controller_name}/edit") ||
                     url.ends_with?("#{controller.controller_name.singularize}/edit")
-        options.merge!(:class => is_active ? 'active' : nil)
+        options.merge!(class: is_active ? 'active' : nil)
         content_tag(:li, options) do
           link_to(link_text, url)
         end
       end
+
+      def main_part_classes
+        if cookies['sidebar-minimized'] == 'true'
+          return 'col-sm-12 col-md-12 sidebar-collapsed'
+        else
+          return 'col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2'
+        end
+      end
+
+      def wrapper_classes
+        if cookies['sidebar-minimized'] == 'true'
+          return 'sidebar-minimized'
+        end
+      end
     end
   end
 end

data/app/helpers/spree/admin/orders_helper.rb

@@ -6,13 +6,13 @@ module Spree
         links = []
         @order_events.sort.each do |event|
           if @order.send("can_#{event}?")
-            links << button_link_to(Spree.t(event), [event, :admin, @order],
+            links << button_link_to(Spree.t(event).capitalize, [event, :admin, @order],
                                     :method => :put,
                                     :icon => "#{event}",
                                     :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })
           end
         end
-        links.join('&nbsp;').html_safe
+        links.join(' ').html_safe
       end
 
       def line_item_shipment_price(line_item, quantity)

data/app/views/kaminari/_first_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="first">
+  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %>
+</li>

data/app/views/kaminari/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="gap"><a>..</a></li>

data/app/views/kaminari/_last_page.html.erb

@@ -0,0 +1,11 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="last">
+  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %>
+</li>

data/app/views/kaminari/_next_page.html.erb

@@ -0,0 +1,15 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="next <%= "disabled" if current_page.last? %>">
+  <% if current_page.last? %>
+    <a href="javascript:;">&raquo;</a>
+  <% else %>
+    <%= link_to_unless current_page.last?, "&raquo;".html_safe, url, :rel => 'next', :remote => remote %>
+  <% end %>
+</li>

data/app/views/kaminari/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="<%= 'active' if page.current? %>">
+  <%= link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/_paginator.html.erb

@@ -0,0 +1,21 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <ul class="pagination pagination-sm">
+    <%= prev_page_tag %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag %>
+  </ul>
+<% end -%>

data/app/views/kaminari/_prev_page.html.erb

@@ -0,0 +1,15 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    total_pages:   total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="previous <%= "disabled" if current_page.first? %>">
+  <% if current_page.first? %>
+    <a href="javascript:;">&laquo;</a>
+  <% else %>
+    <%= link_to_unless current_page.first?, "&laquo;".html_safe, url, :rel => 'prev', :remote => remote %>
+  <% end %>
+</li>

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -2,15 +2,16 @@
   @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
   @delete_url = admin_order_adjustment_path(@order, adjustment)
 %>
-<tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row" class="<%= cycle('odd', 'even')%>">
-  <td class="align-center"><%= display_adjustable(adjustment.adjustable) %></td>
-  <td class="align-center"><%= adjustment.label %></td>
-  <td class="align-center"><%= adjustment.display_amount.to_html %></td>
-  <td class="align-center"><%= adjustment_state(adjustment) %></td>
-  <td class='actions'>
+
+<tr id="<%= spree_dom_id(adjustment) %>" class="<%= adjustment.eligible? ? 'eligible' : 'ineligible' %>" data-hook="adjustment_row">
+  <td><%= display_adjustable(adjustment.adjustable) %></td>
+  <td><%= adjustment.label %></td>
+  <td class="text-center"><%= adjustment.display_amount.to_html %></td>
+  <td class="text-center"><span class="label label-<%= adjustment.state %>"><%= adjustment.state %></td>
+  <td class="actions actions-2 text-center">
     <% if adjustment.open? %>
-      <%= link_to_edit adjustment, :no_text => true %>
-      <%= link_to_delete adjustment, :no_text => true %>
+      <%= link_to_edit adjustment, no_text: true %>
+      <%= link_to_delete adjustment, no_text: true %>
     <% end %>
   </td>
-</tr>
+</tr>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -1,25 +1,29 @@
-<table class="index adjustments" data-hook="adjustments">
+<div class="panel-heading">
+  <h3 class="panel-title"><%= Spree.t(:order_adjustments) %></h3>
+</div>
+
+<table class="table table-bordered adjustments" data-hook="adjustments">
   <thead data-hook="adjustmment_head">
     <tr>
       <th><%= Spree.t(:adjustable) %></th>
       <th><%= Spree.t(:description) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:state) %></th>
+      <th class="text-center"><%= Spree.t(:amount) %></th>
+      <th class="text-center"><%= Spree.t(:state) %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <tbody>
-    <%= render :partial => "adjustment", :collection => @adjustments %>
-    <tr data-hook="adjustment_buttons">
-      <td class="align-center" colspan='4'>
-        <div>
-          <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get %>
-        </div>
-        <div>
-          <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get %>
-        </div>
-      </td>
-      <td class='actions'>&nbsp;</td>
-    </tr>
+    <%= render partial: "adjustment", collection: @adjustments %>
   </tbody>
 </table>
+
+<div class="panel-footer">
+  <div class="row text-center">
+    <div class="col-md-6">
+      <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get, class: "btn btn-success" %>  
+    </div>
+    <div class="col-md-6">
+      <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get, class: "btn btn-danger" %>
+    </div>
+  </div>
+</div>

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

@@ -1,16 +1,12 @@
-<div data-hook="admin_adjustment_form_fields" class="row">
-  <div class="alpha three columns">
-    <%= f.field_container :amount do %>
-      <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) %>
-      <%= text_field :adjustment, :amount, :class => 'fullwidth' %>
-      <%= f.error_message_on :amount %>
-    <% end %>
-  </div>
-  <div class="omega nine columns">
-    <%= f.field_container :label do %>
-      <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) %>
-      <%= text_field :adjustment, :label, :class => 'fullwidth' %>
-      <%= f.error_message_on :label %>
-    <% end %>
-  </div>
+<div data-hook="admin_adjustment_form_fields">
+  <%= f.field_container :amount, class: ['form-group'] do %>
+    <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", :class => "required")) %>
+    <%= text_field :adjustment, :amount, :class => 'form-control' %>
+    <%= f.error_message_on :amount %>
+  <% end %>
+  <%= f.field_container :label, class: ['form-group'] do %>
+    <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", :class => "required")) %>
+    <%= text_field :adjustment, :label, :class => 'form-control' %>
+    <%= f.error_message_on :label %>
+  <% end %>
 </div>

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

@@ -1,22 +1,19 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current =>  Spree.t(:adjustments) } %>
 
 <% content_for :page_title do %>
-  <i class="fa fa-arrow-right"></i> <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
+  / <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>
 <% end %>
 
-<% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_adjustments_list), spree.admin_order_adjustments_url(@order), :icon => 'arrow-left' %></li>
-<% end %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @adjustment } %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
-<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :method => :put do |f| %>
-  <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+<%= form_for @adjustment, url: admin_order_adjustment_path(@order, @adjustment), method: :put do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
 
-    <div class="filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'arrow-right' %>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>