From f36c5b893873ace34088eef1a69199a0fa86db66 Mon Sep 17 00:00:00 2001
From: myersca1 <myersca1@g.cofc.edu>
Date: Sun, 2 Feb 2020 11:19:10 -0500
Subject: [PATCH 1/4] Edit new_resource partial

---
 app/views/spree/admin/shared/_new_resource_links.html.erb  | 5 -----
 app/views/spree/admin/shared/_new_resource_links.html.haml | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 app/views/spree/admin/shared/_new_resource_links.html.erb
 create mode 100644 app/views/spree/admin/shared/_new_resource_links.html.haml

diff --git a/app/views/spree/admin/shared/_new_resource_links.html.erb b/app/views/spree/admin/shared/_new_resource_links.html.erb
deleted file mode 100644
index 58ca902fe8..0000000000
--- a/app/views/spree/admin/shared/_new_resource_links.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'icon-ok' %>
-  <span class="or"><%= Spree.t(:or) %></span>
-  <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
-</div>
diff --git a/app/views/spree/admin/shared/_new_resource_links.html.haml b/app/views/spree/admin/shared/_new_resource_links.html.haml
new file mode 100644
index 0000000000..672432f7a9
--- /dev/null
+++ b/app/views/spree/admin/shared/_new_resource_links.html.haml
@@ -0,0 +1,4 @@
+.form-buttons.filter-actions.actions
+  = button t(:create), 'icon-ok'
+  %span.or= t(:or)
+  = button_link_to t(:cancel), collection_url, icon: 'icon-remove'
\ No newline at end of file

From 9218008530199f0954805efcdae99570c8516811 Mon Sep 17 00:00:00 2001
From: blainebillings <blaine.t.billings@gmail.com>
Date: Sun, 2 Feb 2020 11:22:54 -0500
Subject: [PATCH 2/4] Edit new_resource Partial

---
 app/views/spree/admin/shared/_new_resource_links.html.erb  | 5 -----
 app/views/spree/admin/shared/_new_resource_links.html.haml | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 app/views/spree/admin/shared/_new_resource_links.html.erb
 create mode 100644 app/views/spree/admin/shared/_new_resource_links.html.haml

diff --git a/app/views/spree/admin/shared/_new_resource_links.html.erb b/app/views/spree/admin/shared/_new_resource_links.html.erb
deleted file mode 100644
index 58ca902fe8..0000000000
--- a/app/views/spree/admin/shared/_new_resource_links.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'icon-ok' %>
-  <span class="or"><%= Spree.t(:or) %></span>
-  <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
-</div>
diff --git a/app/views/spree/admin/shared/_new_resource_links.html.haml b/app/views/spree/admin/shared/_new_resource_links.html.haml
new file mode 100644
index 0000000000..8b774f7ba6
--- /dev/null
+++ b/app/views/spree/admin/shared/_new_resource_links.html.haml
@@ -0,0 +1,4 @@
+.form-buttons.filter-actions.actions
+  = button t(:create), 'icon-ok'
+  %span.or= t(:or)
+  = button_link_to t(:cancel), collection_url, icon: 'icon-remove'

From ef4aa488c352274f4788713d435f797983f395d9 Mon Sep 17 00:00:00 2001
From: blainebillings <blaine.t.billings@gmail.com>
Date: Tue, 4 Feb 2020 09:34:28 -0500
Subject: [PATCH 3/4] Moves Create and Cancel References to Actions Namespace

---
 app/views/spree/admin/shared/_new_resource_links.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/spree/admin/shared/_new_resource_links.html.haml b/app/views/spree/admin/shared/_new_resource_links.html.haml
index 8b774f7ba6..ede33d407d 100644
--- a/app/views/spree/admin/shared/_new_resource_links.html.haml
+++ b/app/views/spree/admin/shared/_new_resource_links.html.haml
@@ -1,4 +1,4 @@
 .form-buttons.filter-actions.actions
-  = button t(:create), 'icon-ok'
+  = button t('actions.create'), 'icon-ok'
   %span.or= t(:or)
-  = button_link_to t(:cancel), collection_url, icon: 'icon-remove'
+  = button_link_to t('actions.cancel'), collection_url, icon: 'icon-remove'

From 577fb888436816ede551179e677b75547ecfff14 Mon Sep 17 00:00:00 2001
From: blainebillings <blaine.t.billings@gmail.com>
Date: Tue, 4 Feb 2020 09:39:01 -0500
Subject: [PATCH 4/4] Move Create and Cancel References to Actions Namespace

---
 app/views/spree/admin/shared/_new_resource_links.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/spree/admin/shared/_new_resource_links.html.haml b/app/views/spree/admin/shared/_new_resource_links.html.haml
index 8b774f7ba6..ede33d407d 100644
--- a/app/views/spree/admin/shared/_new_resource_links.html.haml
+++ b/app/views/spree/admin/shared/_new_resource_links.html.haml
@@ -1,4 +1,4 @@
 .form-buttons.filter-actions.actions
-  = button t(:create), 'icon-ok'
+  = button t('actions.create'), 'icon-ok'
   %span.or= t(:or)
-  = button_link_to t(:cancel), collection_url, icon: 'icon-remove'
+  = button_link_to t('actions.cancel'), collection_url, icon: 'icon-remove'