diff --git a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html index 667798c80..716ccc01b 100644 --- a/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html +++ b/wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html @@ -502,6 +502,7 @@
  • pick
  • redirect
  • view
  • +
  • no-view
  • collapse-up
  • collapse-down
  • help
  • diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index d3876f714..06a98f42a 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -220,11 +220,16 @@ .icon-redirect:before{ content:"3"; } -/* Credit: Icon made by Zurb from Flaticon.com */ +.icon-view:before, +.icon-no-view:before{ + vertical-align:-3.5px; + font-size:1.3rem; +} .icon-view:before{ content:"4"; - vertical-align:-4.5px; - font-size:1.3rem; +} +.icon-no-view:before{ + content:"^"; } .icon-collapse-down:before{ content:"5"; diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html index b1471ba25..24e92c33a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html @@ -1,6 +1,6 @@ {% load i18n %} {% trans "Page privacy" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="no-view" %}

    {% trans "This page has been made private by a parent page." %}

    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html index 263908a26..ad4e0f27b 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html @@ -1,6 +1,6 @@ {% load i18n %} {% trans "Page privacy" as title_str %} -{% include "wagtailadmin/shared/header.html" with title=title_str icon="locked" %} +{% include "wagtailadmin/shared/header.html" with title=title_str icon="no-view" %}

    {% trans "Privacy changes apply to all children of this page too." %}

    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html index 53aa44800..adbad98dd 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html @@ -10,14 +10,14 @@ {% if page_perms.can_set_view_restrictions %} {# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #} - {% trans 'Public' %} - {% trans 'Private' %} + {% trans 'Public' %} + {% trans 'Private' %} {% else %} {% if is_public %} - {% trans 'Public' %} + {% trans 'Public' %} {% else %} - {% trans 'Private' %} + {% trans 'Private' %} {% endif %} {% endif %}
    diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html index 698aadeb8..6a41611fe 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html @@ -40,7 +40,7 @@ {% test_page_is_public parent_page as is_public %} {% if not is_public %} - + {% endif %} {% elif choosing %} @@ -53,7 +53,7 @@ {% test_page_is_public parent_page as is_public %} {% if not is_public %} - + {% endif %} {% else %} @@ -181,7 +181,7 @@ {% test_page_is_public page as is_public %} {% if not is_public %} - + {% endif %} {% if not moving and not choosing %} diff --git a/wagtail/wagtailadmin/tests/test_privacy.py b/wagtail/wagtailadmin/tests/test_privacy.py index 4d80ab27f..6d8382c93 100644 --- a/wagtail/wagtailadmin/tests/test_privacy.py +++ b/wagtail/wagtailadmin/tests/test_privacy.py @@ -204,7 +204,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils): self.assertEqual(response.status_code, 200) # Must have one privacy icon (next to the private page) - self.assertContains(response, "