Permalink
Browse files

Merge pull request #957 from iakshay/master

Fix bug #772950 - Don't show "approved" information on history pages
  • Loading branch information...
darkwing committed Mar 26, 2013
2 parents 5c361db + bde8dd6 commit 0d7c90de702056bc6f6ddbf8f5035ab8e31c5ef1
Showing with 1 addition and 16 deletions.
  1. +0 −15 apps/wiki/templates/wiki/document_revisions.html
  2. +1 −1 media/css/wiki.css
@@ -51,21 +51,6 @@ <h1 class="title">{{ _('History of') }} <a href="{{ url('wiki.document', documen
<div class="date">
<a href="{{ url('wiki.revision', document.full_path, rev.id) }}" rel="nofollow, noindex">{{ datetimeformat(rev.created, format='datetime') }}</a>
</div>
- <div class="status">
- {% if document.current_revision.id == rev.id %}
- <span class="current">{{ _('Current') }}</span>
- {% elif not rev.is_approved and not rev.reviewed %}
- {% if not reached_current and user.has_perm('wiki.review_revision') %}
- <a href="{{ url('wiki.review_revision', document.full_path, rev.id) }}">{{ _('Review') }}</a>
- {% else %}
- <span class="unreviewed">{{ _('Unreviewed', 'revision') }}</span>
- {% endif %}
- {% elif rev.is_approved %}
- <span class="approved">{{ _('Approved') }}</span>
- {% else %}
- <span class="rejected">{{ _('Rejected') }}</span>
- {% endif %}
- </div>
<div class="significance">
{% if rev.significance == 20 %}
M
View
@@ -756,7 +756,7 @@ article.main div.tags input.adder {
#revision-list div.comment {
display: inline-block;
- width: 380px;
+ width: 460px;
}
#revision-list div.delete {

0 comments on commit 0d7c90d

Please sign in to comment.