merging from ui update branch

pull/3/head
Dave Cranwell 2014-02-05 11:59:07 +00:00
rodzic c1f6dbf8a2
commit 12c795f4b3
2 zmienionych plików z 7 dodań i 2 usunięć

Wyświetl plik

@ -655,7 +655,7 @@ input[type=submit], input[type=reset], input[type=button], .button, button{
&:before{
width:2.2em;
line-height:2.2em;
line-height:2.3em;
}
}
}

Wyświetl plik

@ -19,7 +19,12 @@
<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_view_draft' revision.page.id %}">Preview</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 %}
{% if revision.page.live %}
<li><a href="{{ revision.page.url }}" target="_blank">View live</a></li>
{% endif %}
</ul>
</td>
<td><div class="human-readable-date" title="{{ revision.created_at|date:"d M Y H:i" }}">{{ revision.created_at|timesince }}</div></td>