Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-08 15:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replaced eye icon and updated usage of the icon in UI

Browse source
This commit is contained in:
Dave Cranwell 2014-09-16 16:50:36 +01:00
parent 72e6d46eff
commit a6f4f5e5a5
7 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wagtail/contrib/wagtailstyleguide/templates/wagtailstyleguide/base.html
View file

@ -502,6 +502,7 @@
<li class="icon icon-pick">pick</li>
<li class="icon icon-redirect">redirect</li>
<li class="icon icon-view">view</li>
<li class="icon icon-no-view">no-view</li>
<li class="icon icon-collapse-up">collapse-up</li>
<li class="icon icon-collapse-down">collapse-down</li>
<li class="icon icon-help">help</li>

11
wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss
View file

@ -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";

2
wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/ancestor_privacy.html
View file

@ -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" %}
<div class="nice-padding">
<p>{% trans "This page has been made private by a parent page." %}</p>

2
wagtail/wagtailadmin/templates/wagtailadmin/page_privacy/set_privacy.html
View file

@ -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" %}
<div class="nice-padding">
<p class="help-block help-warning">{% trans "Privacy changes apply to all children of this page too." %}</p>

8
wagtail/wagtailadmin/templates/wagtailadmin/pages/_privacy_indicator.html
View file

@ -10,14 +10,14 @@
{% if page_perms.can_set_view_restrictions %}
<a href="{% url 'wagtailadmin_pages_set_privacy' page.id %}" class="status-tag primary action-set-privacy">
{# labels are shown/hidden in CSS according to the 'private' / 'public' class on view-permission-indicator #}
<span class="label-public icon icon-unlocked">{% trans 'Public' %}</span>
<span class="label-private icon icon-locked">{% trans 'Private' %}</span>
<span class="label-public icon icon-view">{% trans 'Public' %}</span>
<span class="label-private icon icon-no-view">{% trans 'Private' %}</span>
</a>
{% else %}
{% if is_public %}
<span class="label-public status-tag primary icon icon-unlocked ">{% trans 'Public' %}</span>
<span class="label-public status-tag primary icon icon-view ">{% trans 'Public' %}</span>
{% else %}
<span class="label-private status-tag primary icon icon-locked">{% trans 'Private' %}</span>
<span class="label-private status-tag primary icon icon-no-view">{% trans 'Private' %}</span>
{% endif %}
{% endif %}
</div>

6
wagtail/wagtailadmin/templates/wagtailadmin/pages/list.html
View file

@ -40,7 +40,7 @@
{% test_page_is_public parent_page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
<span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
{% endif %}
</h2>
{% elif choosing %}
@ -53,7 +53,7 @@
{% test_page_is_public parent_page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
<span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
{% endif %}
</h2>
{% else %}
@ -181,7 +181,7 @@
{% test_page_is_public page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-locked" title="This page is protected from public view"></span>
<span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
{% endif %}
</h2>
{% if not moving and not choosing %}

4
wagtail/wagtailadmin/tests/test_privacy.py
View file

@ -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, "<span class=\"privacy-indicator icon icon-locked\"", count=1)
self.assertContains(response, "<span class=\"privacy-indicator icon icon-no-view\"", count=1)
def test_explorer_list_private(self):
"""
@ -216,7 +216,7 @@ class TestPrivacyIndicators(TestCase, WagtailTestUtils):
self.assertEqual(response.status_code, 200)
# Must have one privacy icon (next to the private child page)
self.assertContains(response, "<span class=\"privacy-indicator icon icon-locked\"", count=1)
self.assertContains(response, "<span class=\"privacy-indicator icon icon-no-view\"", count=1)
def test_edit_public(self):
"""