From fa71a1236d6db29926de859a59e56902c40e8fd0 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 7 Sep 2011 19:35:06 +0200
Subject: [PATCH] Count numbers of application, assignments and participants.
 Some minor style fixes.

---
 .../agenda/templates/agenda/base_agenda.html      |   2 +-
 openslides/agenda/templates/agenda/overview.html  |   5 +++--
 .../templates/application/overview.html           |   3 ++-
 .../assignment/templates/assignment/overview.html |   3 ++-
 .../templates/participant/overview.html           |   4 ++--
 .../static/images/icons/video-projector.png       | Bin 0 -> 720 bytes
 openslides/static/images/icons/view-restore.png   | Bin 0 -> 370 bytes
 7 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 openslides/static/images/icons/video-projector.png
 create mode 100644 openslides/static/images/icons/view-restore.png

diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 3e6ab46ae..457b531f8 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -11,7 +11,7 @@
         <li class="{% active request '/agenda/new/' %}"><a href="{% url item_new 'ItemText' %}">{%trans "New item" %}</a></li>
         {% endif %}
         {% if perms.agenda.can_see_projector %}
-        <li><a href="{% url item_beamer %}"><img src="/static/images/icons/view-presentation.png"> {%trans 'Projector live view' %}</a></li>
+        <li><a href="{% url item_beamer %}"><img src="/static/images/icons/video-projector.png"> {%trans 'Projector view' %}</a></li>
         {% endif %}
     </ul>
 {% endblock %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index abd52f81b..0e62211dd 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -46,9 +46,10 @@
             </em>
         </div>
         <div style="text-align:right; padding-bottom:3px;">
-        {% trans "Adjust projector live view" %}:
+        {% trans "Adjust projector view" %}:
         <a class="beamer_edit" href="{% url beamer_bigger %}"><img src="/static/images/icons/zoom-in.png"></a> <a class="beamer_edit" href="{% url beamer_smaller %}"><img src="/static/images/icons/zoom-out.png"></a>
         <a class="beamer_edit" href="{% url beamer_up %}"><img src="/static/images/icons/go-up.png"></a> <a class="beamer_edit" href="{% url beamer_down %}"><img src="/static/images/icons/go-down.png"></a>
+        {# <a href="{% url item_activate 0 %}"><img src="/static/images/icons/view-restore.png"></a> #} 
         </div>
         {% endif %}
         <table id="menu-overview" class="agendatable">
@@ -131,7 +132,7 @@
                 </td>
                 {% endif %}
                 <td style="width: 1px;white-space: nowrap;">
-                    <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show beamer preview' %}"></a>
+                    <a href="{{ item.get_absolute_url }}"><img src="/static/images/icons/document-preview.png" title="{% trans 'Show projector preview' %}"></a>
 
                     {% if  perms.agenda.can_manage_agenda %}
                     <a href="{% url item_edit item.id %}"><img src="/static/images/icons/document-edit.png" title="{% trans 'Edit item' %}"></a>
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index 1ff22d944..e973cbf30 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -23,7 +23,8 @@
         </select>
         </form>
     </p>
-    <br>
+   {{ 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/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 65c2b61aa..592a67531 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -14,7 +14,8 @@
         </select>
         </form>
     </p>
-    <br>
+   {{ assignments|length }}
+   {% blocktrans count counter=assignments|length %}Election{% plural %}Elections{% endblocktrans %}
     <table>
         <tr>
             <th><a href="?sort=name{% if 'name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "Elections" %}</a></th>
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index e9b2aa1e7..7b5fc01a7 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -34,9 +34,9 @@
             {% endfor %}
         </select>
         </form>
-        {{ users|length }} {% trans "Shown Users" %}
     </p>
-    <br>
+    {{ users|length }}
+    {% blocktrans count counter=users|length %}Participant{% plural %}Participants{% endblocktrans %}
     <table>
         <tr>
             <th><a href="?sort=first_name{% if 'first_name' in request.GET.sort and 'reverse' not in request.GET %}&reverse{%endif%}">{%trans "First Name" %}</a></th>
diff --git a/openslides/static/images/icons/video-projector.png b/openslides/static/images/icons/video-projector.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb2be2258ad636e049e7903049b6f0a662191bd4
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY8?OKW8?OOg8j&0T000McNliru*9ja65FZ>XC`teT0$oW&
zK~#9!#ZpUa6HyfYGI#Q7I!z)-lh~$dv?i^#L0yO-*e-m56(0!VKM<_H!~Oy3TCiQY
zbfYd5L1GXJLSvJW(B{!L>6m2NyeG}|+`*J=T#6rj+?jjs`ObIFz4-62^gkkz2wPo!
zeRXtnbir<SoRuW$B*2Gyy&jH^j+%yH?6=#kbfr@HxU}^Ab3FdFi$0c@U-*+hHsYmH
zk+)hc-syDAwb5wsTCK(p4s>3vmbs>t`0j3jt7_`o%F4?z5F`*LCqqw_Vdb*bY8^1g
z!MR}X*sR53fh@~V6y?(R`1rHFfYt5s+z>$lvMdr!cDr3+-`pF3Ddh3EuZvu1e*RkU
zgx7m<ApR$bgXRFjvETqmz!O_symMN<cmM7KD?uDMJgh<256sHVW)tOd88({@Uatp?
zF{&(43k-I<js9hJ>-Noua;f<1f~J)rNIIsy_4RdZrZy4q2QU$ufYC7!2m~-PG9ubB
z3-o9<`z38w-rnA3^?Kb*rs<<lC_w$GVtRTSx$F+!zxx2c-v_!r%*@R6+cHJ+`2v{F
z=X*rKbD2yAg6VV`dR0fI+Q#E2O9%$Xu(tLJA#y^_MDLWCH-%EE)Q0SII{Dn(9Qs$N
zswxtR1hh&6Z$EuOt**oAQcUZySj=4AZa3(ipxthRg~Q<hZA_7X!U!U$>pF6|E##|o
zsC9^iE3+6@hT(8Hgn&pkG)>#eX0vZB00doRDHx4L&(l+$a=Bcm_KJHxnaO8{TtiI~
z%`k~oNO*@5)nqdHovP;m)GhcsB%+PjBN{}Ge}Uhla5FU+K$&>}0000<MNUMnLSTaO
CT~JN{

literal 0
HcmV?d00001

diff --git a/openslides/static/images/icons/view-restore.png b/openslides/static/images/icons/view-restore.png
new file mode 100644
index 0000000000000000000000000000000000000000..7726c3546aa71ad49c31755dd4fcacaf848eee2e
GIT binary patch
literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d
zAk65bF}ngN$X?><>&kwEM@HCM-YMps0#GPFz$e5NNJD_?9LeBK-r<}5(s#vY>`o}z
zpIdq`ukuh)?cvh3w^pvZwQ9rd)f;ZF*?4E|raNo5-rczE?xxeH&zwGe_RQ(Cw{PFQ
zckjWQZ?E5efBo*=hj-uKzWe_E{jawleth`w>;1=H??3(g`03Zj|NsAol~#TO+Q(cH
z<QL2!VSIeA?L;7#G0EHAMP&=y&zV3@uBVG*NX4z(^Vj(r6nGp0S=9NCG**BAzduk>
zCF<+GLZ@3(EJU6PaA|nGxL_xxmoa6PcJSJeV#YJlH~K_Pbn2$PST6D}gP}+)>wyo0
z#DqIn9~5RjJm(}>{lopFl1VcECz0HlRU3Nmp1<&Z>wCWmY9a^u=9gH30>RVO&t;uc
GLK6UKbD~uM

literal 0
HcmV?d00001