From ae84eb42a88f1b6ade35b099de7156fb252f5bbf Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 9 Nov 2023 17:44:24 -0500
Subject: [PATCH 1/3] buttons displayed as text links; are right justified; and
 have a spacer when appropriate

---
 src/registrar/assets/sass/_theme/_admin.scss  | 20 +++++++++++++++++++
 .../django/admin/domain_change_form.html      | 16 +++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 080a343ee..5e7f38d19 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -161,6 +161,26 @@ h1, h2, h3 {
     font-size: 14px;
 }
 
+// right justify custom buttons and display as links
+.submit-row input.custom-link-button,
+.submit-row input.custom-link-button:hover {
+    background: none;
+    border: none;
+    color: var(--link-fg);
+    cursor: pointer;
+    text-decoration: none;
+    padding: 0;
+    font-size: inherit;
+    margin-left: auto;
+}
+.submit-row div.spacer {
+    flex-grow: 1;
+}
+.submit-row span {
+    align-items: center;
+}
+
+// Customize 
 // Keep th from collapsing 
 .min-width-25 {
     min-width: 25px;
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index 2ed3d7532..6c401ad72 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -8,15 +8,19 @@
 
 {% block field_sets %}
     <div class="submit-row">
-        {% if original.state == original.State.READY %}
-          <input type="submit" value="Place hold" name="_place_client_hold">
-        {% elif original.state == original.State.ON_HOLD %}
-          <input type="submit" value="Remove hold" name="_remove_client_hold">
-        {% endif %}
         <input id="manageDomainSubmitButton" type="submit" value="Manage domain" name="_edit_domain">
         <input type="submit" value="Get registry status" name="_get_status">
+        <div class="spacer"></div>
+        {% if original.state == original.State.READY %}
+        <input type="submit" value="Place hold" name="_place_client_hold" class="custom-link-button">
+        {% elif original.state == original.State.ON_HOLD %}
+        <input type="submit" value="Remove hold" name="_remove_client_hold" class="custom-link-button">
+        {% endif %}
+        {% if original.state == original.State.READY or original.state == original.State.ON_HOLD %}
+        <span> | </span>
+        {% endif %}
         {% if original.state != original.State.DELETED %}
-        <input type="submit" value="Delete domain in registry" name="_delete_domain">
+        <input type="submit" value="Remove from registry" name="_delete_domain" class="custom-link-button">
         {% endif %}
     </div>
     {{ block.super }}

From a2daef4bdc3f983836f0581228f4609d48e1ce3f Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 10 Nov 2023 06:43:44 -0500
Subject: [PATCH 2/3] vertical alignment on spacer

---
 src/registrar/assets/sass/_theme/_admin.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 5e7f38d19..56218c377 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -177,7 +177,7 @@ h1, h2, h3 {
     flex-grow: 1;
 }
 .submit-row span {
-    align-items: center;
+    margin-top: units(1);
 }
 
 // Customize 

From 636d82946236446e21a18a0d89da7eeada7e5966 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Fri, 10 Nov 2023 06:59:17 -0500
Subject: [PATCH 3/3] modified tests

---
 src/registrar/tests/test_admin.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index f2db9d5ee..f9d14db82 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -130,12 +130,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "Delete domain in registry")
+        self.assertContains(response, "Remove from registry")
 
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Delete domain in registry", "name": domain.name},
+            {"_delete_domain": "Remove from registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -170,12 +170,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "Delete domain in registry")
+        self.assertContains(response, "Remove from registry")
 
         # Test the error
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Delete domain in registry", "name": domain.name},
+            {"_delete_domain": "Remove from registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -215,12 +215,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "Delete domain in registry")
+        self.assertContains(response, "Remove from registry")
 
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Delete domain in registry", "name": domain.name},
+            {"_delete_domain": "Remove from registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -242,7 +242,7 @@ class TestDomainAdmin(MockEppLib):
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Delete domain in registry", "name": domain.name},
+            {"_delete_domain": "Remove from registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client