Some minor fixes for agenda, application, participant overview table.

This commit is contained in:
Emanuel Schuetze 2012-04-20 08:14:23 +02:00
parent 4e904c7356
commit ae5efcfa9d
4 changed files with 20 additions and 11 deletions

View File

@ -21,18 +21,16 @@
{% endif %} {% endif %}
<a href="{{ item.get_absolute_url }}">{{ item }}</a> <a href="{{ item.get_absolute_url }}">{{ item }}</a>
</td> </td>
{% if perms.agenda.can_manage_agenda %}
<td> <td>
<span style="width: 1px; white-space: nowrap;"> <span style="width: 1px; white-space: nowrap;">
{% if perms.agenda.can_manage_agenda %}
<a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}"> <a class="activate_link {% if item.active %}active{% endif %}" href="{% url projector_activate_slide item.sid %}">
<span></span> <span></span>
</a> </a>
<a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit item' %}"></a> <a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit item' %}"></a>
<a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a> <a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a>
{% endif %}
</span> </span>
</td> </td>
{% if perms.agenda.can_manage_agenda %}
<td class="tabledrag-hide"> <td class="tabledrag-hide">
{% with form=item.weight_form %} {% with form=item.weight_form %}
{{ form.weight }} {{ form.weight }}

View File

@ -45,8 +45,10 @@
{%trans "Filter" %}: {%trans "Filter" %}:
<input type="checkbox" id="hide_closed_items"> {%trans "Hide closed items" %} <input type="checkbox" id="hide_closed_items"> {%trans "Hide closed items" %}
</p> </p>
{{ items|length }} {% trans "items" %}<span id="hiddencount"></span> {{ items|length }}
{% if items %} {% blocktrans count counter=items|length %}item
{% plural %}items{% endblocktrans %}
<span id="hiddencount"></span>
<form action="/agenda/" method="post">{% csrf_token %} <form action="/agenda/" method="post">{% csrf_token %}
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<div id="changed-order-message" style="display:none" class="notification warning"> <div id="changed-order-message" style="display:none" class="notification warning">
@ -60,25 +62,30 @@
<tr> <tr>
<th style="width: 1px;">{% trans "Done" %}</th> <th style="width: 1px;">{% trans "Done" %}</th>
<th>{% trans "Item" %}</th> <th>{% trans "Item" %}</th>
<th style="width: 1px;">{% if perms.agenda.can_manage_agenda %}{% trans "Actions" %}{% endif %}</th>
{% if perms.agenda.can_manage_agenda %} {% if perms.agenda.can_manage_agenda %}
<th style="width: 1px;">{% trans "Actions" %}</th>
<th class="tabledrag-hide">{% trans "Weight" %}</th> <th class="tabledrag-hide">{% trans "Weight" %}</th>
{% endif %} {% endif %}
</tr> </tr>
{% if items %}
<tr class="topline {% if overview %}activeline{% endif %}"> <tr class="topline {% if overview %}activeline{% endif %}">
<td></td> <td></td>
<td> <td>
<b>{% trans "Agenda" %}</b> <b>{% trans "Agenda" %}</b>
</td> </td>
{% if perms.agenda.can_manage_agenda %}
<td></td> <td></td>
{% endif %}
</tr> </tr>
{% for item in items %} {% for item in items %}
{% include "agenda/item_row.html" %} {% include "agenda/item_row.html" %}
{% endfor %} {% endfor %}
{% else %}
<tr>
<td colspan="3"><i>{%trans "No items available." %}</i></td>
</tr>
{% endif %}
</table> </table>
</form> </form>
{% else %}
<i>{% trans "No items available." %}</i>
{% endif %}
{% endblock %} {% endblock %}

View File

@ -27,7 +27,9 @@
</select> </select>
</form> </form>
</p> </p>
{{ applications.exist }} {% trans "Applications" %} {{ applications|length }}
{% blocktrans count counter=applications|length %}application
{% plural %}applications{% endblocktrans %}
<table> <table>
<tr> <tr>
<th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Number" %}</a></th> <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Number" %}</a></th>

View File

@ -54,7 +54,9 @@
</form> </form>
</p> </p>
{% if users|length == allusers|length %} {% if users|length == allusers|length %}
{{ users|length }} {% trans "Participants" %} {{ users|length }}
{% blocktrans count counter=users|length %}participant
{% plural %}participants{% endblocktrans %}
{% else %} {% else %}
{{ users|length }} {% trans "of" %} {{ allusers|length }} {% trans "Participants" %} (= {{ percent }} %) {{ users|length }} {% trans "of" %} {{ allusers|length }} {% trans "Participants" %} (= {{ percent }} %)
{% endif %} {% endif %}