Merge branch 'develop'

pull/3/head
Dave Cranwell 2014-02-06 16:50:30 +00:00
commit ba9c8d7e75
3 zmienionych plików z 5 dodań i 3 usunięć

Wyświetl plik

@ -32,6 +32,7 @@
<input type="submit" class="button button-small button-secondary no" value="Reject">
</form>
</li>
<li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}">Edit</a></li>
<li><a href="{% url 'wagtailadmin_pages_preview_for_moderation' revision.id %}">Preview</a></li>
</ul>
</td>

Wyświetl plik

@ -19,6 +19,7 @@
<td class="title">
<h2><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" title="Edit this page">{{ revision.page.title }}</a></h2>
<ul class="actions">
<li><a href="{% url 'wagtailadmin_pages_edit' revision.page.id %}" target="_blank">Edit</a></li>
{% if revision.page.has_unpublished_changes %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' revision.page.id %}" target="_blank">View draft</a></li>
{% endif %}

Wyświetl plik

@ -165,12 +165,12 @@
</h2>
{% if not moving and not choosing %}
<ul class="actions">
{% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" target="_blank">View draft</a></li>
{% endif %}
{% if page_perms.can_edit and 'edit' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_edit' page.id %}" title="Edit this page">Edit</a></li>
{% endif %}
{% if page.has_unpublished_changes and 'view_draft' not in hide_actions|default:'' %}
<li><a href="{% url 'wagtailadmin_pages_view_draft' page.id %}" target="_blank">View draft</a></li>
{% endif %}
{% if page.live and 'view_live' not in hide_actions|default:'' %}
<li><a href="{{ page.url }}" target="_blank">View live</a></li>
{% endif %}