mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix spacing around the privacy indicator panel. (#6454)

pull/6471/head
Sævar Öfjörð Magnússon 2020-10-09 17:41:18 +00:00 zatwierdzone przez Matt Westcott
rodzic cbf65ba645
commit b7643f869d
4 zmienionych plików z 26 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
CHANGELOG.txt
Wyświetl plik

@ -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)

2
docs/releases/2.11.rst
Wyświetl plik

@ -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
======================

32
wagtail/admin/templates/wagtailadmin/pages/privacy_switch_panel.html
Wyświetl plik

@ -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 %}

12
wagtail/admin/tests/test_privacy.py
Wyświetl plik

@ -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">')