From 7271964f59e5158bd2fe410ea5bc826a35146846 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 4 Sep 2011 10:21:06 +0200
Subject: [PATCH] View aversion accept/reject icons and revision number.

---
 .../templates/application/view.html           | 26 ++++++++++++-------
 openslides/static/styles/base.css             |  3 +++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index ab1d7ce15..1633ddfc7 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -211,9 +211,10 @@
     {% else %}
         <i>[no number]</i>
     {% endif %}</h1>
+    {% trans "Revision" %} {{ application.aid }}
+    
     <h2>{{ application.title }}</h2>
 
-
     {{ application.text|linebreaks }}
 
     <h2>{% trans "Reason" %}:</h2>
@@ -228,7 +229,7 @@
     {% if application.versions|length > 1 %}
     <h2>{% trans "Revisions" %}:</h2>
 
-    <table class="table">
+    <table class="table valigntop">
     <tr>
         <th>#</th>
         <th>{% trans "Time" %}</th>
@@ -238,17 +239,22 @@
         <th>{% trans "Reason" %}</th>
     </tr>
     {% for revision in application.versions  %}
-    <tr>
+    <tr class="{% cycle 'odd' '' %}">
         <td>{{ revision.aid }}
-        {% if revision.rejected %}
-            <img title="{%trans 'Version rejected' %}" src="/static/images/icons/task-reject.png">
-        {% else %}
+        {% if application.status != "pub" %}
         {% if revision == application.permitted %}
              <img title="{%trans 'Version accepted' %}" src="/static/images/icons/task-accepted.png">
-        {% else %}{% if revision.id > application.permitted.id and perms.application.can_manage_application %}
-            <a href="{% url application_version_permit revision.id %}"><img title="{%trans 'Accept Version' %}" src="/static/images/icons/task-accepted-grey.png"></a>
-            <a href="{% url application_version_reject revision.id %}"><img title="{%trans 'Reject Version' %}" src="/static/images/icons/task-reject-grey.png"></a>
-        {% endif %}{% endif %}
+        {% else %}
+             {% if perms.application.can_manage_application %}
+                 <a href="{% url application_version_permit revision.id %}"><img title="{%trans 'Accept Version' %}" src="/static/images/icons/task-accepted-grey.png"></a>
+             {% endif %}
+             {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %}
+                 <a href="{% url application_version_reject revision.id %}"><img title="{%trans 'Reject Version' %}" src="/static/images/icons/task-reject-grey.png"></a>
+             {% endif %}
+        {% endif %}
+        {% if revision.rejected %}
+            <img title="{%trans 'Version rejected' %}" src="/static/images/icons/task-reject.png">
+        {% endif %}
         {% endif %}
         </td>
         <td><i>{{ revision.time }}</i></td>
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 60bf59207..4186911d1 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -224,6 +224,9 @@ table a.table_edit {
     text-indent:-9999px;
     width:16px;
 }
+.valigntop td {
+    vertical-align:top;
+}
 .agendatable td.dragcell {
     padding: 0px 0 0px 10px;
 }