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

added missing indicators on pages_for_moderation and recent_edits

Browse source
This commit is contained in:
Dave Cranwell 2014-10-13 11:31:10 +01:00
parent d78b540e20
commit e18e156564
4 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wagtail/wagtailadmin/static/wagtailadmin/scss/components/listing.scss
View file

@ -343,6 +343,12 @@ ul.listing{
}
}
}
.indicator{
margin-right:0;
font-size:1em;
opacity:0.7;
}
}
ul.listing{
border-top:1px dashed $color-input-border;
@ -391,13 +397,6 @@ table.listing{
}
}
.privacy-indicator,
.locked-indicator{
margin-right:0;
font-size:1em;
opacity:0.7;
}
.table-headers{
.ord{
padding-right:0;

15
wagtail/wagtailadmin/templates/wagtailadmin/home/pages_for_moderation.html
View file

@ -1,4 +1,4 @@
{% load i18n %}
{% load i18n wagtailadmin_tags %}
{% if page_revisions_for_moderation %}
<div class="panel nice-padding">{# TODO try moving these classes onto the section tag #}
<section>
@ -20,7 +20,18 @@
{% for revision in page_revisions_for_moderation %}
<tr>
<td class="title" valign="top">
<h2><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a></h2>
<h2>
<a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
{% test_page_is_public revision.page as is_public %}
{% if not is_public %}
<span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
{% endif %}
{% if revision.page.locked %}
<span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
{% endif %}
</h2>
<ul class="actions">
<li>
<form action="{% url 'wagtailadmin_pages_approve_moderation' revision.id %}" method="POST">

17
wagtail/wagtailadmin/templates/wagtailadmin/home/recent_edits.html
View file

@ -1,9 +1,9 @@
{% load i18n %}
{% load i18n wagtailadmin_tags %}
{% if last_edits %}
<div class="panel nice-padding">{# TODO try moving these classes onto the section tag #}
<section>
<h2>{% trans "Your most recent edits" %}</h2>
<table class="listing">
<table class="listing listing-page">
<col />
<col width="15%"/>
<col width="15%"/>
@ -18,7 +18,18 @@
{% for revision in last_edits %}
<tr>
<td class="title" valign="top">
<h2><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a></h2>
<h2>
<a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="{% trans 'Edit this page' %}">{{ revision.page.title }}</a>
{% test_page_is_public revision.page as is_public %}
{% if not is_public %}
<span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
{% endif %}
{% if revision.page.locked %}
<span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
{% endif %}
</h2>
<ul class="actions">
<li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" class="button button-small">{% trans "Edit" %}</a></li>
{% if revision.page.has_unpublished_changes %}

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

@ -42,7 +42,7 @@
{% test_page_is_public parent_page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
<span class="indicator privacy-indicator icon icon-no-view" title="{% trans "This page is protected from public view" %}"></span>
{% endif %}
</h2>
{% elif choosing %}
@ -55,7 +55,7 @@
{% test_page_is_public parent_page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
<span class="indicator privacy-indicator icon icon-no-view" title="This page is protected from public view"></span>
{% endif %}
</h2>
{% else %}
@ -67,7 +67,7 @@
{% endif %}
{% if parent_page.locked %}
<span class="locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
<span class="indicator locked-indicator icon icon-locked" title="{% trans "This page is locked to further editing" %}"></span>
{% endif %}
</h2>
@ -197,11 +197,11 @@
{% test_page_is_public page as is_public %}
{% if not is_public %}
<span class="privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
<span class="indicator privacy-indicator icon icon-no-view" title="{% trans 'This page is protected from public view' %}"></span>
{% endif %}
{% if page.locked %}
<span class="locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
<span class="indicator locked-indicator icon icon-locked" title="{% trans 'This page is locked to further editing' %}"></span>
{% endif %}
</h2>
{% if not moving and not choosing %}