From 2f476e10b050c4f29f2dbcd721330d0480d936f9 Mon Sep 17 00:00:00 2001
From: Sage Abdullah <sage.abdullah@torchbox.com>
Date: Wed, 9 Oct 2024 11:07:42 +0100
Subject: [PATCH] Use teal background color for footer actions when reverting
 revisions

Fixes color contrast issue with the buttons and makes them more
consistent with the 'normal' variant (not reverting a revision).
---
 .../pages/action_menu/page_locked.html        |  2 +-
 .../pages/action_menu/publish.html            |  2 +-
 .../pages/action_menu/save_draft.html         |  2 +-
 wagtail/admin/tests/test_workflows.py         | 38 +++++++++----------
 .../snippets/action_menu/locked.html          |  2 +-
 .../snippets/action_menu/menu_item.html       |  4 +-
 .../snippets/action_menu/publish.html         |  2 +-
 .../snippets/action_menu/save.html            |  2 +-
 wagtail/snippets/tests/test_snippets.py       | 30 +++++++++------
 9 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html
index b29feb9d38..fbb72083db 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/page_locked.html
@@ -1,5 +1,5 @@
 {% load i18n wagtailadmin_tags %}
-<button type="submit" class="button action-save {% if is_revision %}warning{% endif %}" disabled>
+<button type="submit" class="button action-save" disabled>
     {% if icon_name %}{% icon name=icon_name %}{% endif %}
     {% trans 'Page locked' %}
 </button>
diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html
index 11b7a66ca9..8ada4cc089 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/publish.html
@@ -3,7 +3,7 @@
     type="submit"
     name="action-publish"
     value="action-publish"
-    class="button button-longrunning {% if is_revision %}warning{% endif %}"
+    class="button button-longrunning"
     data-controller="w-progress"
     data-action="w-progress#activate"
     data-w-progress-active-value="{% trans 'Publishing…' %}"
diff --git a/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html b/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html
index b3708b2621..792701b9c2 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/action_menu/save_draft.html
@@ -1,7 +1,7 @@
 {% load i18n wagtailadmin_tags %}
 <button
     type="submit"
-    class="button action-save button-longrunning {% if is_revision %}warning{% endif %}"
+    class="button action-save button-longrunning"
     data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
     data-w-kbd-key-value="mod+s"
diff --git a/wagtail/admin/tests/test_workflows.py b/wagtail/admin/tests/test_workflows.py
index 6e1f32aaf5..5bc83d582f 100644
--- a/wagtail/admin/tests/test_workflows.py
+++ b/wagtail/admin/tests/test_workflows.py
@@ -1894,7 +1894,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # submit for approval
@@ -1910,7 +1910,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After submit, as a moderator, should only see save, approve, and reject buttons
@@ -1924,7 +1924,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         self.reject()
@@ -1940,7 +1940,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After cancel, as a submitter, should only see save and submit buttons
@@ -1953,7 +1953,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
     def test_workflow_action_menu_items_when_reverting(self):
@@ -1973,7 +1973,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # submit for approval
@@ -1989,7 +1989,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After submit, as a moderator, should only see save button
@@ -2003,7 +2003,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         self.reject()
@@ -2019,7 +2019,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After cancel, as a submitter, should only see save button
@@ -2033,7 +2033,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
     @override_settings(WAGTAILADMIN_BASE_URL="http://admin.example.com")
@@ -2180,7 +2180,7 @@ class TestSubmitPageToWorkflow(BasePageWorkflowTests):
 
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save " disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
         self.assertNotContains(
             response,
@@ -2245,7 +2245,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # submit for approval
@@ -2262,7 +2262,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After submit, as a moderator, should only see save, approve, and reject buttons
@@ -2276,7 +2276,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         self.reject()
@@ -2292,7 +2292,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
     def test_workflow_action_menu_items_when_reverting(self):
@@ -2312,7 +2312,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # submit for approval
@@ -2329,7 +2329,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         # After submit, as a moderator, should only see save button
@@ -2343,7 +2343,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
         self.reject()
@@ -2359,7 +2359,7 @@ class TestSubmitSnippetToWorkflowNotLockable(TestSubmitSnippetToWorkflow):
         self.assertNotContains(response, "Request changes")
         self.assertNotContains(
             response,
-            '<button type="submit" class="button action-save warning" disabled>',
+            '<button type="submit" class="button action-save" disabled>',
         )
 
     def test_submit_for_approval_changes_lock_status(self):
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/locked.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/locked.html
index 352f5d75f0..23755dd1d1 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/locked.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/locked.html
@@ -1,5 +1,5 @@
 {% load i18n wagtailadmin_tags %}
-<button type="submit" class="button action-save {% if is_revision %}warning{% endif %}" disabled>
+<button type="submit" class="button action-save" disabled>
     {% if icon_name %}{% icon name=icon_name %}{% endif %}
     {% trans 'Locked' %}
 </button>
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html
index 588111b915..bd296f58e4 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/menu_item.html
@@ -1,6 +1,6 @@
 {% load wagtailadmin_tags %}
 {% if url %}
-    <a class="button{% if classname %} {{ classname }}{% endif %}{% if is_revision %} warning{% endif %}" href="{{ url }}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</a>
+    <a class="button{% if classname %} {{ classname }}{% endif %}" href="{{ url }}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</a>
 {% else %}
-    <button type="submit" name="{{ name }}" value="{{ label }}" class="button{% if classname %} {{ classname }}{% endif %}{% if is_revision %} warning{% endif %}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</button>
+    <button type="submit" name="{{ name }}" value="{{ label }}" class="button{% if classname %} {{ classname }}{% endif %}">{% if icon_name %}{% icon name=icon_name %}{% endif %}{{ label }}</button>
 {% endif %}
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html
index 0d60d2128e..cb40b32fda 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/publish.html
@@ -3,7 +3,7 @@
     type="submit"
     name="{{ name }}"
     value="{{ name }}"
-    class="button action-save button-longrunning{% if is_revision %} warning{% endif %}"
+    class="button action-save button-longrunning"
     data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
     data-w-kbd-key-value="mod+s"
diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html
index 4473fe256a..e579efd835 100644
--- a/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html
+++ b/wagtail/snippets/templates/wagtailsnippets/snippets/action_menu/save.html
@@ -1,7 +1,7 @@
 {% load i18n wagtailadmin_tags %}
 <button
     type="submit"
-    class="button action-save button-longrunning{% if is_revision %} warning{% endif %}"
+    class="button action-save button-longrunning"
     data-controller="w-progress w-kbd"
     data-action="w-progress#activate"
     data-w-kbd-key-value="mod+s"
diff --git a/wagtail/snippets/tests/test_snippets.py b/wagtail/snippets/tests/test_snippets.py
index ec774fadc0..e18bacfa52 100644
--- a/wagtail/snippets/tests/test_snippets.py
+++ b/wagtail/snippets/tests/test_snippets.py
@@ -4557,15 +4557,24 @@ class TestSnippetRevisions(WagtailTestUtils, TestCase):
 
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailsnippets/snippets/edit.html")
+        soup = self.get_soup(response.content)
 
         # The save button should be labelled "Replace current draft"
-        self.assertContains(response, "Replace current draft")
-        # The publish button should exist
-        self.assertContains(response, "Publish this version")
-        # The publish button should have name="action-publish"
-        self.assertContains(
-            response,
-            '<button\n    type="submit"\n    name="action-publish"\n    value="action-publish"\n    class="button action-save button-longrunning warning"\n    data-controller="w-progress w-kbd"\n    data-action="w-progress#activate"\n    data-w-kbd-key-value="mod+s"\n',
+        footer = soup.select_one("footer")
+        save_button = footer.select_one(
+            'button[type="submit"]:not([name="action-publish"])'
+        )
+        self.assertIsNotNone(save_button)
+        self.assertEqual(save_button.text.strip(), "Replace current draft")
+        # The publish button should exist and have name="action-publish"
+        publish_button = footer.select_one(
+            'button[type="submit"][name="action-publish"]'
+        )
+        self.assertIsNotNone(publish_button)
+        self.assertEqual(publish_button.text.strip(), "Publish this version")
+        self.assertEqual(
+            set(publish_button.get("class")),
+            {"button", "action-save", "button-longrunning"},
         )
 
         # Should not show the Unpublish action menu item
@@ -4573,11 +4582,8 @@ class TestSnippetRevisions(WagtailTestUtils, TestCase):
             "wagtailsnippets_tests_draftstatemodel:unpublish",
             args=(quote(self.snippet.pk),),
         )
-        self.assertNotContains(
-            response,
-            f'<a class="button action-secondary" href="{unpublish_url}">',
-        )
-        self.assertNotContains(response, "Unpublish")
+        unpublish_button = footer.select_one(f'a[href="{unpublish_url}"]')
+        self.assertIsNone(unpublish_button)
 
     def test_get_with_previewable_snippet(self):
         self.snippet = MultiPreviewModesModel.objects.create(text="Preview-enabled foo")