From 4c9cc7460abea03455d24c531bde2e256a5dc976 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 27 Dec 2019 17:08:37 +0100
Subject: [PATCH 1/2] Increase space for buttons in savebar layout

---
 app/assets/javascripts/templates/admin/save_bar.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/templates/admin/save_bar.html.haml b/app/assets/javascripts/templates/admin/save_bar.html.haml
index e877e84747..b5f25eb659 100644
--- a/app/assets/javascripts/templates/admin/save_bar.html.haml
+++ b/app/assets/javascripts/templates/admin/save_bar.html.haml
@@ -1,9 +1,9 @@
 #save-bar.animate-show{ ng: { show: 'dirty || persist || StatusMessage.active()' } }
   .container
-    .eight.columns.alpha
+    .seven.columns.alpha
       %h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
         {{ StatusMessage.statusMessage.text || "&nbsp;" }}
       %h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #da5354' }
         {{ StatusMessage.invalidMessage || "&nbsp;" }}
-    .eight.columns.omega.text-right{ ng: { transclude: true } }
+    .nine.columns.omega.text-right{ ng: { transclude: true } }
 

From 91d959b7d6b7e60d14861c9032b352a2aa6e91f6 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 3 Jan 2020 16:25:26 +0100
Subject: [PATCH 2/2] Remove "previous" button from order cycle savebar

---
 app/views/admin/order_cycles/incoming.html.haml | 1 -
 app/views/admin/order_cycles/outgoing.html.haml | 1 -
 config/locales/en.yml                           | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/views/admin/order_cycles/incoming.html.haml b/app/views/admin/order_cycles/incoming.html.haml
index fdfa7c33f1..faaa81e03b 100644
--- a/app/views/admin/order_cycles/incoming.html.haml
+++ b/app/views/admin/order_cycles/incoming.html.haml
@@ -7,7 +7,6 @@
   = render 'wizard_progress'
 
   %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
-    %input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.edit_admin_order_cycle_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
     %input.red{ type: "button", value: t('.save'), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
     %input.red{ type: "button", value: t('.save_and_next'), ng: { click: "submit($event, '#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
     %input{ type: "button", value: t('.next'), ng: { click: "cancel('#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
diff --git a/app/views/admin/order_cycles/outgoing.html.haml b/app/views/admin/order_cycles/outgoing.html.haml
index e56587ffa1..0623d1f71e 100644
--- a/app/views/admin/order_cycles/outgoing.html.haml
+++ b/app/views/admin/order_cycles/outgoing.html.haml
@@ -7,7 +7,6 @@
   = render 'wizard_progress'
 
   %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
-    %input{ type: "button", value: t('.previous'), ng: { click: "cancel('#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }  
     %input.red{ type: "button", value: t('.save'), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
     %input.red{ type: "button", value: t('.save_and_back_to_list'), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
     %input{ type: "button", ng: { value: "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e2ef2352e3..c1a79e341a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -907,7 +907,6 @@ en:
         save_and_back_to_list: "Save and Back to List"
         choose_products_from: "Choose Products From:"
       incoming:
-        previous: "Previous"
         save: "Save"
         save_and_next: "Save and Next"
         next: "Next"