From f85ebbfab91c37838801a379607ad083b9d8cae4 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 12 Sep 2011 09:06:24 +0200
Subject: [PATCH] Fixed active submenu class. Added submenu icon for generate
 passwords. Updated translation.

---
 .../templates/assignment/base_assignment.html |   4 +-
 openslides/locale/de/LC_MESSAGES/django.mo    | Bin 23517 -> 23516 bytes
 openslides/locale/de/LC_MESSAGES/django.po    |  74 ++++++++++--------
 .../participant/base_participant.html         |  17 ++--
 openslides/static/images/icons/quickopen.png  | Bin 0 -> 556 bytes
 5 files changed, 52 insertions(+), 43 deletions(-)
 create mode 100644 openslides/static/images/icons/quickopen.png

diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html
index 992896d05..60fd712c7 100644
--- a/openslides/assignment/templates/assignment/base_assignment.html
+++ b/openslides/assignment/templates/assignment/base_assignment.html
@@ -7,10 +7,10 @@
 {% endblock %}
 
 {% block submenu %}
-    {% url election_overview as url_electionoverview %}
+    {% url assignment_overview as url_assignment_overview %}
     <h4 class="sectiontitle">{%trans "Elections" %}</h4>
     <ul>
-        <li class="{% if request.path == url_electionoverview %}selected{% endif %}"><a href="{% url assignment_overview %}">{%trans "All elections" %}</a></li>
+        <li class="{% if request.path == url_assignment_overview %}selected{% endif %}"><a href="{% url assignment_overview %}">{%trans "All elections" %}</a></li>
         {% if perms.assignment.can_manage_assignment %}
             <li class="{% active request '/assignment/new' %}"><a href="{% url assignment_new %}">{%trans "New election" %}</a></li>
         {% endif %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 22de49a824549cbd9480e7ccaa2b467cb7478e5c..02ae55fdd3e479eb560f33afb14b4acc2ac0745e 100644
GIT binary patch
delta 187
zcmcb+o$=0g#tlnE>V+5>7+Rtj82o_rbRZ4lKLgSnK>8<;<^s}8(F_d2K$;gwgTxhq
zG&hje0@Cb2+6+i@0%<#_ya$k02J!=eG#`*I1=1k(EkK$FNKXLL0zi6hG=mt}!gWxI
ngFu=WC~<DHrD&`QyODx{rIms4=DC*76_`CUiZ*vdg)#yFenTD<

delta 188
zcmcb!o$>B=#tlnE>V+8?7+Rtj82o_r3?MB8q@M$64j}ytNOJ*c=4b{6kUBmf4H8!Z
z(%e8=8%VPQX>%aW38d|z@}59i8ORR;(tJR=3`m32w*qM%AUzRC3jpbP(F|f>3)e#>
o4gqOipv3vjmZGsL?1l<PMpj1Vo99|SS732T&CJ`}9u>+60HgsPga7~l

diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po
index b522a68fc..d1be1b993 100644
--- a/openslides/locale/de/LC_MESSAGES/django.po
+++ b/openslides/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-11 22:27+0200\n"
+"POT-Creation-Date: 2011-09-12 09:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Ja, mit allen Kindelementen."
 msgid "No"
 msgstr "Nein"
 
-#: agenda/api.py:67 participant/views.py:153 participant/views.py:231
+#: agenda/api.py:67 participant/views.py:156 participant/views.py:234
 #: utils/utils.py:40
 #, python-format
 msgid "Do you really want to delete <b>%s</b>?"
@@ -144,8 +144,8 @@ msgstr "Eintrag wurde erfolgreich geändert."
 msgid "Agenda item modified"
 msgstr "Tagesordnungseintrag geändert"
 
-#: agenda/views.py:251 participant/views.py:130 participant/views.py:216
-#: participant/views.py:245 participant/views.py:301 system/views.py:32
+#: agenda/views.py:251 participant/views.py:133 participant/views.py:219
+#: participant/views.py:248 participant/views.py:305 system/views.py:32
 #: system/views.py:59
 msgid "Please check the form for errors."
 msgstr "Bitte kontrollieren Sie das Formular nach Fehlern."
@@ -1203,62 +1203,68 @@ msgstr "Amt"
 msgid "First Password"
 msgstr "Erstes Passwort"
 
-#: participant/views.py:122
+#: participant/views.py:125
 msgid "New participant was successfully created."
 msgstr "Neuer Teilnehmer wurde erfolgreich angelegt."
 
-#: participant/views.py:124
+#: participant/views.py:127
 msgid "Participant was successfully modified."
 msgstr "Teilnehmer wurde erfolgreich geändert."
 
-#: participant/views.py:151
+#: participant/views.py:154
 #, python-format
 msgid "Participant <b>%s</b> was successfully deleted."
 msgstr "Teilnehmer <b>%s</b> wurde erfolgreich gelöscht."
 
-#: participant/views.py:163
+#: participant/views.py:166
 #, python-format
 msgid "Participant <b>%s</b> is now a normal user."
 msgstr "Teilnehmer <b>%s</b> ist jetzt ein normaler Nutzer."
 
-#: participant/views.py:167
+#: participant/views.py:170
 #, python-format
 msgid "Participant <b>%s</b> is now administrator."
 msgstr "Teilnehmer <b>%s</b> ist jetzt ein Administrator."
 
-#: participant/views.py:177
+#: participant/views.py:180
 #, python-format
 msgid "Participant <b>%s</b> was successfully deactivated."
 msgstr "Teilnehmer <b>%s</b> wurde erfolgreich deaktiviert."
 
-#: participant/views.py:181
+#: participant/views.py:184
 #, python-format
 msgid "Participant <b>%s</b> was successfully activated."
 msgstr "Teilnehmer <b>%s</b> wurde erfolgreich aktiviert."
 
-#: participant/views.py:208
+#: participant/views.py:211
 msgid "New group was successfully created."
 msgstr "Neue Gruppe wurde erfolgreich angelegt."
 
-#: participant/views.py:210
+#: participant/views.py:213
 msgid "Group was successfully modified."
 msgstr "Gruppe wurde erfolgreich geändert."
 
-#: participant/views.py:229
+#: participant/views.py:232
 #, python-format
 msgid "Group <b>%s</b> was successfully deleted."
 msgstr "Gruppe <b>%s</b>  wurde erfolgreich gelöscht."
 
-#: participant/views.py:243
+#: participant/views.py:246
 msgid "User settings successfully saved."
 msgstr "Nutzereinstellungen wurden erfolgreich gespeichert."
 
-#: participant/views.py:299
+#: participant/views.py:264
+msgid ""
+"The import function is available for the superuser (without user profile) "
+"only."
+msgstr ""
+
+#: participant/views.py:303
 #, python-format
 msgid "%d new participants were successfully imported."
 msgstr "%d neue Teilnehmer wurden erfolgreich importiert."
 
-#: participant/views.py:303
+#: participant/views.py:307
 msgid ""
 "Attention: All existing participants will be removed if you import new "
 "participants."
@@ -1266,14 +1272,14 @@ msgstr ""
 "Achtung: Alle existierenden Teilnehmer werden gelöscht, wenn Sie neue "
 "Teilnehmer importieren."
 
-#: participant/views.py:314
+#: participant/views.py:318
 #, python-format
 msgid "%s Password was successfully generated."
 msgid_plural "%s Passwords were successfully generated."
 msgstr[0] "Es wurde %s Passwort erfolgreich generiert."
 msgstr[1] "Es wurden %s Passwörter erfolgreich generiert."
 
-#: participant/views.py:316
+#: participant/views.py:320
 msgid ""
 "There are no participants which need a first time password. No passwords "
 "generated."
@@ -1281,53 +1287,53 @@ msgstr ""
 "Es sind keine Teilnehmer ohne Erst-Passwort vorhanden. Es wurden keine "
 "Passwörter generiert."
 
-#: participant/views.py:325
+#: participant/views.py:329
 #, python-format
 msgid "The Password for <b>%s</b> was successfully reset."
 msgstr "Das Passwort für <b>%s</b> wurde erfolgreich zurückgesetzt."
 
-#: participant/views.py:327
+#: participant/views.py:331
 #, python-format
 msgid "Do you really want to reset the password for <b>%s</b>?"
 msgstr "Soll das Passwort für <b>%s</b> wirklich zurückgesetzt werden?"
 
-#: participant/templates/participant/base_participant.html:6
+#: participant/templates/participant/base_participant.html:9
 #: participant/templates/participant/overview.html:2
 #: participant/templates/participant/overview.html:5 templates/base.html:49
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: participant/templates/participant/base_participant.html:9
+#: participant/templates/participant/base_participant.html:12
 msgid "All participants"
 msgstr "Alle Teilnehmer"
 
-#: participant/templates/participant/base_participant.html:12
+#: participant/templates/participant/base_participant.html:15
 #: participant/templates/participant/edit.html:8
 msgid "New participant"
 msgstr "Neuer Teilnehmer"
 
-#: participant/templates/participant/base_participant.html:13
+#: participant/templates/participant/base_participant.html:16
 msgid "All user groups"
 msgstr "Alle Benutzergruppen"
 
-#: participant/templates/participant/base_participant.html:14
+#: participant/templates/participant/base_participant.html:17
 #: participant/templates/participant/group_edit.html:8
 msgid "New user group"
 msgstr "Neue Benutzergruppe"
 
-#: participant/templates/participant/base_participant.html:15
-msgid "Print participant list"
-msgstr "Teilnehmerliste drucken"
-
-#: participant/templates/participant/base_participant.html:16
+#: participant/templates/participant/base_participant.html:18
 msgid "Import participant"
 msgstr "Teilnehmer importieren"
 
-#: participant/templates/participant/base_participant.html:17
+#: participant/templates/participant/base_participant.html:19
+msgid "Print participant list"
+msgstr "Teilnehmerliste drucken"
+
+#: participant/templates/participant/base_participant.html:20
 msgid "Generate first time passwords"
 msgstr "Erst-Passwörter generieren"
 
-#: participant/templates/participant/base_participant.html:18
+#: participant/templates/participant/base_participant.html:21
 msgid "Print first time passwords"
 msgstr "Erst-Passwörter drucken"
 
@@ -1456,7 +1462,7 @@ msgstr "Normaler Nutzer. Klicken, um Administrator zu werden!"
 
 #: participant/templates/participant/settings.html:7
 msgid "Your Settings"
-msgstr "Deine Einstellungen"
+msgstr "Ihre Einstellungen"
 
 #: poll/forms.py:33
 msgid "Votes in favour"
diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html
index db1a1c4f2..e6a2b24c7 100644
--- a/openslides/participant/templates/participant/base_participant.html
+++ b/openslides/participant/templates/participant/base_participant.html
@@ -2,19 +2,22 @@
 {% load tags %}
 
 {% block submenu %}
-    {% url user_overview as url_useroverview %}
+    {% url user_overview as url_users %}
+    {% url user_new as url_usernew %}
+    {% url user_group_overview as url_usergroups %}
+    {% url user_import as url_userimport %}
     <h4 class="sectiontitle">{%trans "Participants" %}</h4>
     <ul>
         {% if perms.participant.can_see_participant %}
-        <li class="{% if request.path == url_useroverview %}selected{% endif %}"><a href="{% url user_overview %}">{%trans "All participants" %}</a></li>
+        <li class="{% if request.path == url_users %}selected{% endif %}"><a href="{% url user_overview %}">{%trans "All participants" %}</a></li>
         {% endif %}
         {% if perms.participant.can_manage_participant %}
-        <li class="{% active request '/user/new' %}"><a href="{%  url user_new %}">{%trans "New participant" %}</a></li>
-        <li><a href="{%  url user_group_overview %}">{%trans "All user groups" %}</a></li>
-        <li><a href="{%  url user_group_new %}">{%trans "New user group" %}</a></li>
+        <li class="{% active request url_usernew %}"><a href="{%  url user_new %}">{%trans "New participant" %}</a></li>
+        <li class="{% if request.path == url_usergroups %}selected{% endif %}"><a href="{%  url user_group_overview %}">{%trans "All user groups" %}</a></li>
+        <li class="{% active request '/participant/group/new' %}"><a href="{%  url user_group_new %}">{%trans "New user group" %}</a></li>
+        <li class="{% if request.path == url_userimport %}selected{% endif %}"><a href="{% url user_import %}"> {%trans 'Import participant' %}</a></li>
         <li><a href="{% url user_print %}"><img src="/static/images/icons/application-pdf.png"> {%trans 'Print participant list' %}</a></li>
-        <li><a href="{% url user_import %}"> {%trans 'Import participant' %}</a></li>
-        <li><a href="{% url user_gen_passwords %}">{% trans 'Generate first time passwords' %}</a></li>
+        <li><a href="{% url user_gen_passwords %}"><img src="/static/images/icons/quickopen.png"> {% trans 'Generate first time passwords' %}</a></li>
         <li><a href="{% url print_passwords %}"><img src="/static/images/icons/application-pdf.png"> {% trans 'Print first time passwords' %}</a></li>
         {% endif %}
     </ul>
diff --git a/openslides/static/images/icons/quickopen.png b/openslides/static/images/icons/quickopen.png
new file mode 100644
index 0000000000000000000000000000000000000000..22927ed28d28db42370de25f28170298ac40f00b
GIT binary patch
literal 556
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~&H|6fVxZ#d
zAk65bF}ngN$X?><>&kwUjh9JQ`^xNY4xrG70G|+7AZ?^9WUMS?rXVmoL}+mU|MF<z
zjS0Mu@);QzfOai3U|^^Yku36)N;4OqS7_esCRkxAJRwG;+C#b5OJtV6;G<26hg-wf
zhO)0}5bFsLdC_N+q9<5wE4w$4^;{&w8c*hCC()?^!dIusZ*CT!<S%xrl(#ojvdC3v
ze=Faz0=;KjS>7LG__%@p+abQ+_f-EsV*dYKc4?u|%3}4^*@C+Y1@^Rx?dg=?*Cckf
zm+$gSp=-<duFvMbw}t!B3hu`(%8%D`zuL<EVXM&h{jA?FGW|Tx|ML|4&#MA|ZnFQq
zCi(ZS-2ZzF|L>{%f6Vazo%H|z|M|Et$btM^666O8I0#^5;?dO7*3q*H3=Iv>%ByQ?
zo-}#(!i9^rY&&)9_RFu|e*FCh0lIcKHGx_flf2zs{PWTrJ%OBZPZ!4!3CYldp-fE<
z3=Rj=w<nb+mY0`T|9|{L`HfNYnN9)yC!aD^CVwyAP`q%X`}OVT4I3Afz5lyPI<cnm
zt@DdD6OVqq)1fG0-Jia`<-#2KTiW_f%j<5b7%nc<I2<M!nP&Y}akXynj0-oLHgmDv
foG9PyAi-U4uepVX%QEg`HOLE|u6{1-oD!M<2dLTf

literal 0
HcmV?d00001