From ae5efcfa9d35a5dcac07c1d526481dde8d61dd69 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Fri, 20 Apr 2012 08:14:23 +0200
Subject: [PATCH] Some minor fixes for agenda, application, participant
 overview table.

---
 .../agenda/templates/agenda/item_row.html     |  4 +---
 .../agenda/templates/agenda/overview.html     | 19 +++++++++++++------
 .../templates/application/overview.html       |  4 +++-
 .../templates/participant/overview.html       |  4 +++-
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index b2c9d5676..166a33eb5 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -21,18 +21,16 @@
         {% endif %}
         <a href="{{ item.get_absolute_url }}">{{ item }}</a>
     </td>
+    {% if perms.agenda.can_manage_agenda %}
     <td>
         <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 %}">
                     <span></span>
                 </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>
-            {% endif %}
         </span>
     </td>
-    {% if perms.agenda.can_manage_agenda %}
     <td class="tabledrag-hide">
         {% with form=item.weight_form %}
             {{ form.weight }}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 90e9447aa..46b3bd32c 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -45,8 +45,10 @@
     {%trans "Filter" %}:
     <input type="checkbox" id="hide_closed_items"> {%trans "Hide closed items" %}
     </p>
-    {{ items|length }} {% trans "items" %}<span id="hiddencount"></span>
-    {% if items %}
+    {{ items|length }}
+    {% blocktrans count counter=items|length %}item
+    {% plural %}items{% endblocktrans %}
+    <span id="hiddencount"></span>
         <form action="/agenda/" method="post">{% csrf_token %}
             {% if perms.agenda.can_manage_agenda %}
             <div id="changed-order-message" style="display:none" class="notification warning">
@@ -60,25 +62,30 @@
                 <tr>
                     <th style="width: 1px;">{% trans "Done" %}</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 %}
+                        <th style="width: 1px;">{% trans "Actions" %}</th>
                         <th class="tabledrag-hide">{% trans "Weight" %}</th>
                     {% endif %}
                 </tr>
+            {% if items %}
                 <tr class="topline {% if overview %}activeline{% endif %}">
                     <td></td>
                     <td>
                         <b>{% trans "Agenda" %}</b>
                     </td>
+                    {% if perms.agenda.can_manage_agenda %}
                     <td></td>
+                    {% endif %}
                 </tr>
 
                 {% for item in items %}
                     {% include "agenda/item_row.html" %}
                 {% endfor %}
+            {% else %}
+                <tr>
+                    <td colspan="3"><i>{%trans "No items available." %}</i></td>
+                </tr>
+            {% endif %}
             </table>
         </form>
-    {% else %}
-        <i>{% trans "No items available." %}</i>
-    {% endif %}
 {% endblock %}
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index de699d8bf..814a8b2ab 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -27,7 +27,9 @@
         </select>
         </form>
     </p>
-   {{ applications.exist }} {% trans "Applications" %}
+    {{ applications|length }}
+    {% blocktrans count counter=applications|length %}application
+    {% plural %}applications{% endblocktrans %}
     <table>
         <tr>
             <th><a href="?sort=number{% if 'number' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Number" %}</a></th>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index f80e145f9..af8009ea0 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -54,7 +54,9 @@
         </form>
     </p>
     {% if users|length == allusers|length %}
-        {{ users|length }} {% trans "Participants" %}
+        {{ users|length }}
+        {% blocktrans count counter=users|length %}participant
+        {% plural %}participants{% endblocktrans %}
     {% else %}
         {{ users|length }} {% trans "of" %} {{ allusers|length }} {% trans "Participants" %} (= {{ percent }} %)
     {% endif %}