ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Automated merge with ssh://oshahn.de/openslides

Browse Source
This commit is contained in:
Oskar Hahn 2011-09-04 10:21:58 +02:00
commit 89386a4ac7
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openslides/application/templates/application/view.html
View File

@ -211,8 +211,9 @@
{% else %} {% else %}
<i>[no number]</i> <i>[no number]</i>
{% endif %}</h1> {% endif %}</h1>
<h2>{{ application.title }}</h2> {% trans "Revision" %} {{ application.aid }}
<h2>{{ application.title }}</h2>
{{ application.text|linebreaks }} {{ application.text|linebreaks }}
@ -228,7 +229,7 @@
{% if application.versions|length > 1 %} {% if application.versions|length > 1 %}
<h2>{% trans "Revisions" %}:</h2> <h2>{% trans "Revisions" %}:</h2>
<table class="table"> <table class="table valigntop">
<tr> <tr>
<th>#</th> <th>#</th>
<th>{% trans "Time" %}</th> <th>{% trans "Time" %}</th>
@ -238,17 +239,22 @@
<th>{% trans "Reason" %}</th> <th>{% trans "Reason" %}</th>
</tr> </tr>
{% for revision in application.versions %} {% for revision in application.versions %}
<tr> <tr class="{% cycle 'odd' '' %}">
<td>{{ revision.aid }} <td>{{ revision.aid }}
{% if revision.rejected %} {% if application.status != "pub" %}
<img title="{%trans 'Version rejected' %}" src="/static/images/icons/task-reject.png">
{% else %}
{% if revision == application.permitted %} {% if revision == application.permitted %}
<img title="{%trans 'Version accepted' %}" src="/static/images/icons/task-accepted.png"> <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 %} {% 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> <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> <a href="{% url application_version_reject revision.id %}"><img title="{%trans 'Reject Version' %}" src="/static/images/icons/task-reject-grey.png"></a>
{% endif %}{% endif %} {% endif %}
{% endif %}
{% if revision.rejected %}
<img title="{%trans 'Version rejected' %}" src="/static/images/icons/task-reject.png">
{% endif %}
{% endif %} {% endif %}
</td> </td>
<td><i>{{ revision.time }}</i></td> <td><i>{{ revision.time }}</i></td>

3
openslides/static/styles/base.css
View File

@ -224,6 +224,9 @@ table a.table_edit {
text-indent:-9999px; text-indent:-9999px;
width:16px; width:16px;
} }
.valigntop td {
vertical-align:top;
}
.agendatable td.dragcell { .agendatable td.dragcell {
padding: 0px 0 0px 10px; padding: 0px 0 0px 10px;
} }