From 7271964f59e5158bd2fe410ea5bc826a35146846 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze 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 %} [no number] {% endif %} + {% trans "Revision" %} {{ application.aid }} +

{{ application.title }}

- {{ application.text|linebreaks }}

{% trans "Reason" %}:

@@ -228,7 +229,7 @@ {% if application.versions|length > 1 %}

{% trans "Revisions" %}:

- +
@@ -238,17 +239,22 @@ {% for revision in application.versions %} - + 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; }
# {% trans "Time" %}{% trans "Reason" %}
{{ revision.aid }} - {% if revision.rejected %} - - {% else %} + {% if application.status != "pub" %} {% if revision == application.permitted %} - {% else %}{% if revision.id > application.permitted.id and perms.application.can_manage_application %} - - - {% endif %}{% endif %} + {% else %} + {% if perms.application.can_manage_application %} + + {% endif %} + {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %} + + {% endif %} + {% endif %} + {% if revision.rejected %} + + {% endif %} {% endif %} {{ revision.time }}