From b7643f869d64e02624724eabb3a6b9ef567249be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A6var=20=C3=96fj=C3=B6r=C3=B0=20Magn=C3=BAsson?=
 <saevar@overcast.is>
Date: Fri, 9 Oct 2020 17:41:18 +0000
Subject: [PATCH] Fix spacing around the privacy indicator panel. (#6454)

---
 CHANGELOG.txt                                 |  1 +
 docs/releases/2.11.rst                        |  2 ++
 .../pages/privacy_switch_panel.html           | 32 ++++++++++---------
 wagtail/admin/tests/test_privacy.py           | 12 +++----
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bf11b21598..f797826aba 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -42,6 +42,7 @@ Changelog
  * Fix: The Elasticsearch `URLS` setting can now take a string on its own instead of a list (Sævar Öfjörð Magnússon)
  * Fix: Avoid retranslating month / weekday names that Django already provides (Matt Westcott)
  * Fix: Fixed padding around checkbox and radio inputs (Cole Maclean)
+ * Fix: Fix spacing around the privacy indicator panel (Sævar Öfjörð Magnússon, Dan Braghis)
 
 
 2.10.2 (25.09.2020)
diff --git a/docs/releases/2.11.rst b/docs/releases/2.11.rst
index c84bd3dd44..c10df29c9c 100644
--- a/docs/releases/2.11.rst
+++ b/docs/releases/2.11.rst
@@ -72,6 +72,8 @@ Bug fixes
  * The Elasticsearch ``URLS`` setting can now take a string on its own instead of a list (Sævar Öfjörð Magnússon)
  * Avoid retranslating month / weekday names that Django already provides (Matt Westcott)
  * Fixed padding around checkbox and radio inputs (Cole Maclean)
+ * Fix spacing around the privacy indicator panel (Sævar Öfjörð Magnússon, Dan Braghis)
+
 
 Upgrade considerations
 ======================
diff --git a/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html b/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
index 8b54d6013e..c710ba590b 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
@@ -6,22 +6,24 @@
 {% endif %}
 
 {% if not page.is_root %}
-<div class="field-row privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
-    <p>
-        {% trans "Current status:" %}
+<div class="privacy-indicator {% if is_public %}public{% else %}private{% endif %}">
+    <fieldset>
+        <p>
+            {% trans "Current status:" %}
 
-        <span class="label-public icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
-             {% trans "Public" %}
-        </span>
-        <span class="label-private icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
-            {% trans "Private" %}
-        </span>
-    </p>
+            <span class="label-public icon icon-view" aria-label="{% trans 'Page privacy. Current status: Public' %}">
+                {% trans "Public" %}
+            </span>
+            <span class="label-private icon icon-no-view" aria-label="{% trans 'Page privacy. Current status: Private' %}">
+                {% trans "Private" %}
+            </span>
+        </p>
 
-    {% if page.id and page_perms.can_set_view_restrictions %}
-        <button data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="button action-set-privacy">
-            {% trans "Set page privacy" %}
-        </button>
-    {% endif %}
+        {% if page.id and page_perms.can_set_view_restrictions %}
+            <button data-url="{% url 'wagtailadmin_pages:set_privacy' page.id %}" class="button action-set-privacy">
+                {% trans "Set page privacy" %}
+            </button>
+        {% endif %}
+    </fieldset>
 </div>
 {% endif %}
diff --git a/wagtail/admin/tests/test_privacy.py b/wagtail/admin/tests/test_privacy.py
index 59586a358d..f9d64a911f 100644
--- a/wagtail/admin/tests/test_privacy.py
+++ b/wagtail/admin/tests/test_privacy.py
@@ -349,8 +349,8 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
 
         # Check the privacy indicator is public
         self.assertTemplateUsed(response, 'wagtailadmin/pages/privacy_switch_panel.html')
-        self.assertContains(response, '<div class="field-row privacy-indicator public">')
-        self.assertNotContains(response, '<div class="field-row privacy-indicator private">')
+        self.assertContains(response, '<div class="privacy-indicator public">')
+        self.assertNotContains(response, '<div class="privacy-indicator private">')
 
     def test_edit_private(self):
         """
@@ -363,8 +363,8 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
 
         # Check the privacy indicator is public
         self.assertTemplateUsed(response, 'wagtailadmin/pages/privacy_switch_panel.html')
-        self.assertContains(response, '<div class="field-row privacy-indicator private">')
-        self.assertNotContains(response, '<div class="field-row privacy-indicator public">')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')
 
     def test_edit_private_child(self):
         """
@@ -377,5 +377,5 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
 
         # Check the privacy indicator is public
         self.assertTemplateUsed(response, 'wagtailadmin/pages/privacy_switch_panel.html')
-        self.assertContains(response, '<div class="field-row privacy-indicator private">')
-        self.assertNotContains(response, '<div class="field-row privacy-indicator public">')
+        self.assertContains(response, '<div class="privacy-indicator private">')
+        self.assertNotContains(response, '<div class="privacy-indicator public">')