From ccc1d2b707b99a5bff3384e37bb78d3fcd1a3e12 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 20 Apr 2012 22:13:47 +0200 Subject: [PATCH] #104: Updated second submneu for application. --- openslides/application/models.py | 2 +- .../application/base_application.html | 41 ++ .../templates/application/poll_view.html | 11 - .../templates/application/view.html | 30 +- openslides/application/views.py | 4 + openslides/locale/de/LC_MESSAGES/django.mo | Bin 31171 -> 31179 bytes openslides/locale/de/LC_MESSAGES/django.po | 400 +++++++++--------- openslides/static/styles/base.css | 3 + 8 files changed, 259 insertions(+), 232 deletions(-) diff --git a/openslides/application/models.py b/openslides/application/models.py index f0624d444..9b5efcf77 100644 --- a/openslides/application/models.py +++ b/openslides/application/models.py @@ -395,7 +395,7 @@ class Application(models.Model, SlideMixin): self.log = "" self.log += u"%s | %s" % (datetime.now().strftime("%d.%m.%Y %H:%M:%S"), _propper_unicode(text)) if user is not None: - self.log += u" (by %s)" % (_propper_unicode(user.username)) + self.log += u" ("+_("by")+" %s)" % (_propper_unicode(user.username)) self.log += "\n" self.save() diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html index cb962944d..ad14ad6a0 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -17,4 +17,45 @@ {% endif %}
  • {%trans 'All applications as PDF' %}
    • + + {# second submenu #} + {% if application %} +
    +

    {% trans "Application No." %} + {% if application.number != None %} + {{ application.number }} + {% else %} + [-] + {% endif %} +

    + + {% endif %} {% endblock %} diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html index 32036be59..c25a87a28 100644 --- a/openslides/application/templates/application/poll_view.html +++ b/openslides/application/templates/application/poll_view.html @@ -5,17 +5,6 @@ {% block title %}{{ block.super }} - {{ poll }}{% endblock %} -{% if perms.application.can_manage_application %} -{% block submenu %} - {{ block.super }} -
    -

    {%trans "Application No." %} {{ poll.application.number }}

    - -{% endblock %} -{% endif %} - {% block content %}

    {%trans "Application No." %} {{ application.number }} - {%trans "Vote" %}

    {{ application.title }}

    diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 32d71e728..575d002e4 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -9,30 +9,7 @@ {% block submenu %} {{ block.super }} -
    -

    {% trans "Application No." %} - {% if application.number != None %} - {{ application.number }} - {% else %} - [-] - {% endif %} -

    - + {% endblock %} {% block content %} @@ -210,7 +187,10 @@ {% trans 'Withdrawed by Submitter' %} {% endif %} {% endif %} - +

    + {% if perms.agenda.can_manage_agenda %} + {%trans 'New agenda item' %} + {% endif %}

    {%trans "For Administration only:" %}

    diff --git a/openslides/application/views.py b/openslides/application/views.py index cdf1aa1c6..abe727863 100644 --- a/openslides/application/views.py +++ b/openslides/application/views.py @@ -162,8 +162,10 @@ def edit(request, application_id=None): if not request.user == application.submitter and not is_manager: messages.error(request, _("You can not edit this application. You are not the submitter.")) return redirect(reverse('application_view', args=[application.id])) + actions = application.get_allowed_actions(user=request.user) else: application = None + actions = None if request.method == 'POST': dataform = ApplicationForm(request.POST, prefix="data") @@ -253,6 +255,7 @@ def edit(request, application_id=None): 'form': dataform, 'managerform': managerform, 'application': application, + 'actions': actions, } @login_required @@ -416,6 +419,7 @@ class ViewPoll(PollFormView): self.application = self.poll.get_application() context['application'] = self.application context['ballot'] = self.poll.get_ballot() + context['actions'] = self.application.get_allowed_actions(user=self.request.user) return context def get_success_url(self): diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 8cbed2d37ffddb9685e839ccf89db77e8ddafc25..784f0b2536d9706adf5b9065a3815ccf3f76b5c4 100644 GIT binary patch delta 8417 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 delta 8428 zcmYk>30PKD9>?*6?4l?jf-C}pqM|6c@4JF#E{Te%2#N@?D48rxHx9svL}Rir%eoh{se2_E(*^If zZop9Luc2;v78CFr+ya z`2*OL`X5jeIEjqWT)^gd10#68325hbj7Qxl71g0P>cULqACt`=Ik*CY@H5m*zeDwl zNp@%23ENX2ge`EMb(wA7g0Zx}h8=jmxlADhy}62enQ)}Z^tbgn$f}qP=!-j08QO)D z@I_SW@8BaiwSzGq;Ac1&4|QZYFfzrM5m<@J%n|ggqHu~r0FLcsOiP@M8c>O?dr+y} zj*+;}w!dlXwHQtNFBpL#o!zDDfLfy7s6B9(t>>WbU(uQT>w?uZ_~A}eN~^6GQ7QCE zb!XfPn^I50I7~-fKM{3(5&Gi-)RH`aTGDl>>m1aBcViE%NhSZ9aXk$hp`NaeVb~fI zP?;HwL6~XHLiNu@-LMjy;2L}0vFD$%^;b|6Ifh!=3&=m_md6%Sx*F4qhI_FeI@lB6 zM<4V{b7vfcs;6Lc?265B2x{OHPHS;1=ze-fU)u;(=LsrXpcG(W6F@%O%mr~%%MTB^zD zqxXLf1>L9++ha9qvz1|9Dwm_|U7YxTtjKmyN$`_;hZL~g*EvcVCrT8+c z-`BQ&3$>(yecbD!`;dR7q$dqZRVMO}8P6XPxE}R@XRs9>Ma}FZRLXCmX40JX(?sHM zB(_IAxD0jQhwb_GRtL2tRUQgT&2H41AF>`reSqFU?SXGl4~*pFpcHpT?ea;e)aRp8 zTW;%Bs0Y7@TEc^_X2EU>P5ZK?HVL0kL&<8b;9ORQ=mSZX�>m9 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\n" "Language-Team: LANGUAGE \n" @@ -34,13 +34,13 @@ msgid "Countdown (in seconds)" msgstr "Countdown (in Sekunden)" #: agenda/models.py:38 application/forms.py:40 -#: application/templates/application/view.html:263 config/forms.py:27 +#: application/templates/application/view.html:243 config/forms.py:27 #: projector/models.py:17 msgid "Title" msgstr "Titel" #: agenda/models.py:39 application/forms.py:41 -#: application/templates/application/view.html:264 projector/models.py:18 +#: application/templates/application/view.html:244 projector/models.py:18 msgid "Text" msgstr "Text" @@ -89,25 +89,25 @@ msgstr "Eintrag %s wurde erfolgreich gelöscht." #: agenda/views.py:142 agenda/views.py:144 #: agenda/templates/agenda/overview.html:55 application/models.py:522 -#: application/views.py:688 application/views.py:732 -#: application/templates/application/view.html:102 +#: application/views.py:692 application/views.py:736 +#: application/templates/application/view.html:79 #: application/templates/projector/Application.html:33 #: assignment/templates/assignment/view.html:186 #: assignment/templates/assignment/view.html:190 #: assignment/templates/projector/Assignment.html:72 -#: assignment/templates/projector/Assignment.html:76 utils/pdf.py:332 -#: utils/utils.py:39 utils/views.py:207 +#: assignment/templates/projector/Assignment.html:76 utils/utils.py:39 +#: utils/views.py:207 msgid "Yes" msgstr "Ja" #: agenda/views.py:142 agenda/views.py:144 #: agenda/templates/agenda/overview.html:56 application/models.py:522 -#: application/views.py:688 application/views.py:733 -#: application/templates/application/view.html:103 +#: application/views.py:692 application/views.py:737 +#: application/templates/application/view.html:80 #: application/templates/projector/Application.html:34 #: assignment/templates/assignment/view.html:187 -#: assignment/templates/projector/Assignment.html:73 utils/pdf.py:332 -#: utils/utils.py:39 utils/views.py:207 +#: assignment/templates/projector/Assignment.html:73 utils/utils.py:39 +#: utils/views.py:207 msgid "No" msgstr "Nein" @@ -144,7 +144,7 @@ msgstr "Tagesordnungs-Einstellungen" #: agenda/templates/agenda/config.html:13 agenda/templates/agenda/edit.html:12 #: application/templates/application/config.html:13 #: application/templates/application/edit.html:21 -#: application/templates/application/poll_view.html:51 +#: application/templates/application/poll_view.html:40 #: assignment/templates/assignment/config.html:13 #: assignment/templates/assignment/edit.html:17 #: assignment/templates/assignment/poll_view.html:53 @@ -161,7 +161,7 @@ msgstr "Speichern" #: application/templates/application/config.html:17 #: application/templates/application/edit.html:28 #: application/templates/application/import.html:26 -#: application/templates/application/poll_view.html:58 +#: application/templates/application/poll_view.html:47 #: assignment/templates/assignment/config.html:17 #: assignment/templates/assignment/edit.html:24 #: assignment/templates/assignment/poll_view.html:60 @@ -193,7 +193,7 @@ msgstr "Eintrag bearbeiten" #: agenda/templates/agenda/edit.html:15 #: application/templates/application/edit.html:24 -#: application/templates/application/poll_view.html:54 +#: application/templates/application/poll_view.html:43 #: assignment/templates/assignment/edit.html:20 #: assignment/templates/assignment/poll_view.html:56 #: assignment/templates/assignment/view.html:110 @@ -248,9 +248,9 @@ msgstr "Aktionen" msgid "No items available." msgstr "Keine Einträge vorhanden." -#: application/forms.py:42 application/views.py:706 +#: application/forms.py:42 application/views.py:710 +#: application/templates/application/view.html:226 #: application/templates/application/view.html:246 -#: application/templates/application/view.html:266 #: application/templates/projector/Application.html:60 msgid "Reason" msgstr "Begründung" @@ -263,15 +263,15 @@ msgstr "Triviale Änderung" msgid "Trivial changes don't create a new version." msgstr "Triviale Änderungen erzeugen keine neue Version." -#: application/forms.py:48 application/models.py:54 application/views.py:634 +#: application/forms.py:48 application/models.py:54 application/views.py:638 #: application/templates/application/overview.html:40 -#: application/templates/application/view.html:41 +#: application/templates/application/view.html:18 #: application/templates/projector/Application.html:22 msgid "Submitter" msgstr "Antragsteller/in" -#: application/forms.py:49 application/models.py:56 application/views.py:647 -#: application/templates/application/view.html:48 +#: application/forms.py:49 application/models.py:56 application/views.py:651 +#: application/templates/application/view.html:25 msgid "Supporters" msgstr "Unterstützer/innen" @@ -332,12 +332,12 @@ msgid "Permitted" msgstr "Zugelassen" #: application/models.py:35 application/templates/application/overview.html:23 -#: application/templates/application/view.html:188 +#: application/templates/application/view.html:165 msgid "Accepted" msgstr "Angenommen" #: application/models.py:36 application/templates/application/overview.html:24 -#: application/templates/application/view.html:193 +#: application/templates/application/view.html:170 msgid "Rejected" msgstr "Abgelehnt" @@ -345,17 +345,17 @@ msgstr "Abgelehnt" msgid "Withdrawed" msgstr "Zurückgezogen" -#: application/models.py:38 application/templates/application/view.html:201 +#: application/models.py:38 application/templates/application/view.html:178 msgid "Adjourned" msgstr "Vertagt" # please check! -#: application/models.py:39 application/templates/application/view.html:204 +#: application/models.py:39 application/templates/application/view.html:181 msgid "Not Concerned" msgstr "Nicht befasst" # please check! -#: application/models.py:40 application/templates/application/view.html:207 +#: application/models.py:40 application/templates/application/view.html:184 msgid "Commited a bill" msgstr "Verwiesen (in Ausschuss)" @@ -398,12 +398,12 @@ msgstr "Unterstützer/innen gelöscht" msgid "Status reseted to: %s" msgstr "Status zurückgesetzt auf: %s" -#: application/models.py:229 application/views.py:205 +#: application/models.py:229 application/views.py:207 #, python-format msgid "Supporter: +%s" msgstr "Unterstützer/in: +%s" -#: application/models.py:239 application/views.py:216 +#: application/models.py:239 application/views.py:218 #, python-format msgid "Supporter: -%s" msgstr "Unterstützer/in: -%s" @@ -427,6 +427,10 @@ msgstr "Version %s nicht zugelassen" msgid "Status modified" msgstr "Status geändert" +#: application/models.py:398 +msgid "by" +msgstr "von" + #: application/models.py:431 msgid "Poll created" msgstr "Abstimmung erstellt" @@ -451,7 +455,7 @@ msgstr "Darf Anträge verwalten" msgid "Abstain" msgstr "Enthaltung" -#: application/models.py:555 application/views.py:591 application/views.py:789 +#: application/models.py:555 application/views.py:595 application/views.py:795 #: application/templates/application/base_application.html:9 #: application/templates/application/overview.html:6 #: application/templates/application/overview.html:9 @@ -468,21 +472,21 @@ msgstr "" msgid "You can not edit this application. You are not the submitter." msgstr "Sie dürfen keine Anträge von anderen bearbeiten." -#: application/views.py:218 +#: application/views.py:220 msgid "New application was successfully created." msgstr "Neuer Antrag wurde erfolgreich angelegt." -#: application/views.py:220 +#: application/views.py:222 msgid "Application was successfully modified." msgstr "Antrag wurde erfolgreich geändert." -#: application/views.py:227 application/views.py:562 assignment/views.py:128 +#: application/views.py:229 application/views.py:566 assignment/views.py:130 #: participant/views.py:166 participant/views.py:269 participant/views.py:298 #: participant/views.py:456 utils/views.py:157 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." -#: application/views.py:234 +#: application/views.py:236 msgid "" "Attention: Do you really want to edit this application? The supporters will " "not be removed automatically because you can manage applications. " @@ -492,7 +496,7 @@ msgstr "" "werden nicht automatisch entfernt, da Sie Anträge verwalten dürfen. " "Prüfen Sie, ob die Unterstützungen noch gültig sind." -#: application/views.py:236 +#: application/views.py:238 #, python-format msgid "" "Attention: Do you really want to edit this application? All %s " @@ -501,127 +505,127 @@ msgstr "" "Wollen Sie den Antrag wirklich ändern? Alle %s Unterstützer/innen " "werden dann automatisch entfernt. Versuchen Sie diese erneut zu gewinnen." -#: application/views.py:266 +#: application/views.py:269 #, python-format msgid "You can not delete application %s." msgstr "Sie können Antrag %s nicht löschen." -#: application/views.py:272 +#: application/views.py:275 #, python-format msgid "Application %s was successfully deleted." msgstr "Antrag %s wurde erfolgreich gelöscht." -#: application/views.py:288 +#: application/views.py:291 msgid "Application number was successfully set." msgstr "Antragsnummer wurde erfolgreich gesetzt." -#: application/views.py:304 +#: application/views.py:307 msgid "Application was successfully permitted." msgstr "Antrag wurde erfolgreich zugelassen." -#: application/views.py:317 +#: application/views.py:320 msgid "Application was successfully rejected." msgstr "Antrag wurde erfolgreich verworfen." -#: application/views.py:331 +#: application/views.py:334 #, python-format msgid "Application status was set to: %s." msgstr "Antragsstatus wurde gesetzt auf: %s" -#: application/views.py:345 +#: application/views.py:348 msgid "Application status was reset." msgstr "Antragsstatus wurde zurückgesetzt." -#: application/views.py:359 +#: application/views.py:362 msgid "You have support the application successfully." msgstr "Sie haben den Antrag erfolgreich unterstützt." -#: application/views.py:373 +#: application/views.py:376 msgid "You have unsupport the application successfully." msgstr "Sie haben dem Antrag erfolgreich Ihre Unterstützung entzogen." -#: application/views.py:387 +#: application/views.py:390 msgid "New vote was successfully created." msgstr "Neue Abstimmung erfolgreich angelegt." -#: application/views.py:403 +#: application/views.py:406 msgid "Poll was successfully deleted." msgstr "Abstimmung wurde erfolgreich gelöscht." -#: application/views.py:405 +#: application/views.py:408 #, python-format msgid "the %s. poll" msgstr "die %s. Abstimmung" -#: application/views.py:433 +#: application/views.py:437 #, python-format msgid "Version %s accepted." msgstr "Version %s akzeptiert." -#: application/views.py:435 +#: application/views.py:439 #, python-format msgid "Do you really want to permit version %s?" msgstr "Soll Version %s wirklich zugelassen werden?" -#: application/views.py:445 +#: application/views.py:449 #, python-format msgid "Version %s rejected." msgstr "Version %s zurückgewiesen." -#: application/views.py:447 +#: application/views.py:451 msgid "ERROR by rejecting the version." msgstr "FEHLER beim Zurückweisen der Version." -#: application/views.py:449 +#: application/views.py:453 #, python-format msgid "Do you really want to reject version %s?" msgstr "Soll Version %s wirklich zurückgewiesen werden?" -#: application/views.py:458 participant/views.py:314 +#: application/views.py:462 participant/views.py:314 msgid "" "The import function is available for the superuser (without user profile) " "only." msgstr "" "Die Importfunktion ist nur für den 'superuser' (ohne Nutzerprofil) verfügbar." -#: application/views.py:489 application/views.py:493 application/views.py:499 -#: application/views.py:502 participant/views.py:383 +#: application/views.py:493 application/views.py:497 application/views.py:503 +#: application/views.py:506 participant/views.py:383 #, python-format msgid "Ignoring malformed line %d in import file." msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert." -#: application/views.py:548 +#: application/views.py:552 #, python-format msgid "%d application was successfully imported." msgid_plural "%d applications were successfully imported." msgstr[0] "%d Antrag wurde erfolgreich importiert." msgstr[1] "%d Anträge wurden erfolgreich importiert." -#: application/views.py:551 +#: application/views.py:555 #, python-format msgid "%d application was successfully modified." msgid_plural "%d applications were successfully modified." msgstr[0] "%d Antrag wurde erfolgreich geändert." msgstr[1] "%d Anträge wurden erfolgreich geändert." -#: application/views.py:554 +#: application/views.py:558 #, python-format msgid "%d new user was added." msgid_plural "%d new users were added." msgstr[0] "%d neuer Nutzer wurde erstellt." msgstr[1] "%d neue Nutzer wurden erstellt." -#: application/views.py:558 participant/views.py:452 +#: application/views.py:562 participant/views.py:452 msgid "Import aborted because of severe errors in the input file." msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen." -#: application/views.py:560 participant/views.py:454 +#: application/views.py:564 participant/views.py:454 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "" "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 " "wird unterstützt!" -#: application/views.py:564 +#: application/views.py:568 msgid "" "Attention: Existing applications will be modified if you import new " "applications with the same number." @@ -629,7 +633,7 @@ msgstr "" "Achtung: Existierende Anträge werden geändert wenn Sie neue Anträge mit " "identischer Nummer importieren." -#: application/views.py:565 +#: application/views.py:569 msgid "" "Attention: Importing an application without a number multiple times will " "create duplicates." @@ -637,27 +641,26 @@ msgstr "" "Achtung: Bei mehrfachem Import eines Antrags ohne Nummer können Duplikate " "entstehen." -#: application/views.py:598 application/views.py:720 +#: application/views.py:602 application/views.py:724 #: application/templates/application/edit.html:6 #: application/templates/application/view.html:7 -#: application/templates/application/view.html:230 +#: application/templates/application/view.html:210 #: application/templates/projector/Application.html:7 msgid "Application" msgstr "Antrag" -#: application/views.py:613 application/views.py:615 application/views.py:627 -#: application/views.py:629 application/views.py:728 -#: application/templates/application/poll_view.html:12 -#: application/templates/application/poll_view.html:20 -#: application/templates/application/view.html:13 -#: application/templates/application/view.html:228 +#: application/views.py:617 application/views.py:619 application/views.py:631 +#: application/views.py:633 application/views.py:732 +#: application/templates/application/base_application.html:24 +#: application/templates/application/poll_view.html:9 +#: application/templates/application/view.html:208 #: application/templates/projector/Application.html:53 msgid "Application No." msgstr "Antrag Nr." -#: application/views.py:661 application/templates/application/overview.html:19 +#: application/views.py:665 application/templates/application/overview.html:19 #: application/templates/application/overview.html:39 -#: application/templates/application/view.html:60 +#: application/templates/application/view.html:37 #: application/templates/projector/Application.html:11 #: assignment/templates/assignment/overview.html:14 #: assignment/templates/assignment/overview.html:27 @@ -667,39 +670,39 @@ msgstr "Antrag Nr." msgid "Status" msgstr "Status" -#: application/views.py:681 application/templates/application/view.html:70 -#: assignment/views.py:337 +#: application/views.py:685 application/templates/application/view.html:47 +#: assignment/views.py:339 msgid "Vote results" msgstr "Abstimmungsergebnis" -#: application/views.py:687 application/views.py:730 -#: application/templates/application/poll_view.html:20 -#: application/templates/application/poll_view.html:23 -#: application/templates/application/view.html:91 -#: application/templates/application/view.html:97 +#: application/views.py:691 application/views.py:734 +#: application/templates/application/poll_view.html:9 +#: application/templates/application/poll_view.html:12 +#: application/templates/application/view.html:68 +#: application/templates/application/view.html:74 #: application/templates/projector/Application.html:30 msgid "Vote" msgstr "Abstimmung" -#: application/views.py:688 application/views.py:734 -#: application/templates/application/view.html:104 +#: application/views.py:692 application/views.py:738 +#: application/templates/application/view.html:81 #: application/templates/projector/Application.html:35 #: assignment/templates/assignment/view.html:188 -#: assignment/templates/projector/Assignment.html:74 utils/pdf.py:332 +#: assignment/templates/projector/Assignment.html:74 msgid "Abstention" msgstr "Enthaltung" -#: application/views.py:688 application/templates/application/view.html:105 +#: application/views.py:692 application/templates/application/view.html:82 #: application/templates/projector/Application.html:36 #: assignment/templates/assignment/view.html:207 #: assignment/templates/projector/Assignment.html:93 msgid "Invalid" msgstr "Ungültig" -#: application/views.py:688 -#: application/templates/application/poll_view.html:44 -#: application/templates/application/view.html:107 -#: application/templates/projector/Application.html:38 assignment/views.py:384 +#: application/views.py:692 +#: application/templates/application/poll_view.html:33 +#: application/templates/application/view.html:84 +#: application/templates/projector/Application.html:38 assignment/views.py:386 #: assignment/templates/assignment/poll_view.html:38 #: assignment/templates/assignment/view.html:215 #: assignment/templates/assignment/view.html:218 @@ -708,11 +711,11 @@ msgstr "Ungültig" msgid "Votes cast" msgstr "Abgegebene Stimmen" -#: application/views.py:720 assignment/templates/assignment/poll_view.html:5 +#: application/views.py:724 assignment/templates/assignment/poll_view.html:5 msgid "Poll" msgstr "Abstimmung" -#: application/views.py:782 +#: application/views.py:788 msgid "Application settings successfully saved." msgstr "Antrags-Einstellungen erfolgreich gespeichert." @@ -735,16 +738,46 @@ msgstr "Anträge importieren" msgid "All applications as PDF" msgstr "Alle Anträge als PDF" +#: application/templates/application/base_application.html:34 +msgid "View application" +msgstr "Antrag anzeigen" + +#: application/templates/application/base_application.html:38 +#: application/templates/application/edit.html:10 +msgid "Edit application" +msgstr "Antrag bearbeiten" + +#: application/templates/application/base_application.html:42 +msgid "Delete application" +msgstr "Antrag löschen" + +#: application/templates/application/base_application.html:45 +msgid "Application as PDF" +msgstr "Antrag als PDF" + +#: application/templates/application/base_application.html:48 +msgid "Show Application" +msgstr "Antrag projizieren" + +#: application/templates/application/base_application.html:50 +#: application/templates/application/view.html:53 +#: application/templates/application/view.html:91 +msgid "New vote" +msgstr "Neue Abstimmung" + +#: application/templates/application/base_application.html:54 +msgid "View Vote" +msgstr "Abstimmung anzeigen" + +#: application/templates/application/base_application.html:56 +msgid "Ballot paper" +msgstr "Stimmzettel" + #: application/templates/application/config.html:5 #: application/templates/application/config.html:8 msgid "Application settings" msgstr "Antrags-Einstellungen" -#: application/templates/application/edit.html:10 -#: application/templates/application/view.html:23 -msgid "Edit application" -msgstr "Antrag bearbeiten" - #: application/templates/application/edit.html:18 msgid "required" msgstr "erforderlich" @@ -813,7 +846,7 @@ msgid "Number of supporters" msgstr "Anzahl der Unterstützer/innen" #: application/templates/application/overview.html:41 -#: application/templates/application/view.html:130 +#: application/templates/application/view.html:107 msgid "Creation Time" msgstr "Erstellungszeit" @@ -821,33 +854,29 @@ msgstr "Erstellungszeit" msgid "No applications available." msgstr "Keine Anträge vorhanden." -#: application/templates/application/poll_view.html:14 -msgid "Print vote" -msgstr "Abstimmung drucken" - -#: application/templates/application/poll_view.html:23 +#: application/templates/application/poll_view.html:12 msgid "Results of" msgstr "Ergebnis der" -#: application/templates/application/poll_view.html:24 +#: application/templates/application/poll_view.html:13 #: assignment/templates/assignment/poll_view.html:13 poll/models.py:192 msgid "majority" msgstr "Mehrheit" -#: application/templates/application/poll_view.html:24 +#: application/templates/application/poll_view.html:13 #: assignment/templates/assignment/poll_view.html:13 poll/models.py:194 msgid "undocumented" msgstr "nicht erfasst" -#: application/templates/application/poll_view.html:30 +#: application/templates/application/poll_view.html:19 msgid "Option" msgstr "Wahlmöglichkeit" -#: application/templates/application/poll_view.html:31 +#: application/templates/application/poll_view.html:20 msgid "Votes" msgstr "Stimmen" -#: application/templates/application/poll_view.html:40 assignment/views.py:376 +#: application/templates/application/poll_view.html:29 assignment/views.py:378 #: assignment/templates/assignment/poll_view.html:34 #: assignment/templates/assignment/view.html:204 #: assignment/templates/projector/Assignment.html:90 @@ -855,153 +884,132 @@ msgid "Invalid votes" msgstr "Ungültige Stimmen" #: application/templates/application/view.html:21 -msgid "View application" -msgstr "Antrag anzeigen" - -#: application/templates/application/view.html:26 -msgid "Delete application" -msgstr "Antrag löschen" - -#: application/templates/application/view.html:29 -msgid "Show Application" -msgstr "Antrag projizieren" - -#: application/templates/application/view.html:32 -msgid "Create agenda item" -msgstr "Tagesordnungseintrag anlegen" - -#: application/templates/application/view.html:34 -msgid "Application as PDF" -msgstr "Antrag als PDF" - -#: application/templates/application/view.html:44 msgid "You!" msgstr "Sie!" -#: application/templates/application/view.html:76 -#: application/templates/application/view.html:114 -msgid "New vote" -msgstr "Neue Abstimmung" - -#: application/templates/application/view.html:94 +#: application/templates/application/view.html:71 msgid "Delete Vote" msgstr "Abstimmung löschen" -#: application/templates/application/view.html:121 +#: application/templates/application/view.html:98 msgid "Enter vote results!" msgstr "Abstimmungsergebnisse eingeben!" -#: application/templates/application/view.html:137 +#: application/templates/application/view.html:114 msgid "Withdraw" msgstr "Zurückziehen" -#: application/templates/application/view.html:145 +#: application/templates/application/view.html:122 msgid "Unsupport" msgstr "Nicht unterstützen" -#: application/templates/application/view.html:151 +#: application/templates/application/view.html:128 msgid "Support" msgstr "Unterstützen" -#: application/templates/application/view.html:157 +#: application/templates/application/view.html:134 msgid "minimum required supporters" msgstr "minimal erforderliche Unterstützer/innen" -#: application/templates/application/view.html:164 +#: application/templates/application/view.html:141 msgid "Manage application" msgstr "Antrag verwalten" -#: application/templates/application/view.html:167 +#: application/templates/application/view.html:144 msgid "Formal validation" msgstr "Formale Gültigkeitsprüfung" -#: application/templates/application/view.html:169 +#: application/templates/application/view.html:146 msgid "Publish" msgstr "Veröffentlen" -#: application/templates/application/view.html:172 +#: application/templates/application/view.html:149 msgid "Permit" msgstr "Zulassen" -#: application/templates/application/view.html:175 +#: application/templates/application/view.html:152 msgid "Not permit (reject)" msgstr "Nicht zulassen (verwerfen)" -#: application/templates/application/view.html:178 +#: application/templates/application/view.html:155 msgid "Set Number" msgstr "Setze Nummer" -#: application/templates/application/view.html:185 +#: application/templates/application/view.html:162 msgid "Result after vote" msgstr "Ergebnis nach der Abstimmung" -#: application/templates/application/view.html:199 +#: application/templates/application/view.html:176 msgid "Result after debate" msgstr "Ergebnis nach der Debatte" -#: application/templates/application/view.html:210 +#: application/templates/application/view.html:187 msgid "Withdrawed by Submitter" msgstr "Zurückgezogen durch Antragsteller/in" -#: application/templates/application/view.html:216 +#: application/templates/application/view.html:192 +msgid "New agenda item" +msgstr "Neuer Tagesordnungseintrag" + +#: application/templates/application/view.html:196 msgid "For Administration only:" msgstr "Nur zur Administration:" -#: application/templates/application/view.html:218 +#: application/templates/application/view.html:198 msgid "Reset" msgstr "Zurücksetzen" -#: application/templates/application/view.html:230 +#: application/templates/application/view.html:210 msgid "no number" -msgstr "Ohne Nummer" +msgstr "ohne Nummer" -#: application/templates/application/view.html:233 -#: application/templates/application/view.html:261 config/models.py:134 +#: application/templates/application/view.html:213 +#: application/templates/application/view.html:241 config/models.py:134 #: config/templates/config/version.html:5 #: config/templates/config/version.html:8 #: config/templates/config/version.html:11 msgid "Version" msgstr "Version" -#: application/templates/application/view.html:236 +#: application/templates/application/view.html:216 msgid "Show newest Version" msgstr "Neuste Version anzeigen" -#: application/templates/application/view.html:238 +#: application/templates/application/view.html:218 msgid "Show permitted Version" msgstr "Zugelassene Version anzeigen" -#: application/templates/application/view.html:256 +#: application/templates/application/view.html:236 msgid "Version History" msgstr "Versionshistorie" -#: application/templates/application/view.html:262 +#: application/templates/application/view.html:242 msgid "Time" msgstr "Zeit" -#: application/templates/application/view.html:273 +#: application/templates/application/view.html:253 msgid "Version accepted" msgstr "Version akzeptiert" -#: application/templates/application/view.html:276 +#: application/templates/application/view.html:256 msgid "Accept Version" msgstr "Zugelassene Version" -#: application/templates/application/view.html:279 +#: application/templates/application/view.html:259 msgid "Reject Version" msgstr "Version zurückweisen" -#: application/templates/application/view.html:283 +#: application/templates/application/view.html:263 msgid "Version rejected" msgstr "Version zurückgewiesen" -#: application/templates/application/view.html:293 -#: application/templates/application/view.html:300 -#: application/templates/application/view.html:307 +#: application/templates/application/view.html:273 +#: application/templates/application/view.html:280 +#: application/templates/application/view.html:287 msgid "unchanged" msgstr "unverändert" -#: application/templates/application/view.html:316 +#: application/templates/application/view.html:296 msgid "Log" msgstr "Log" @@ -1051,7 +1059,7 @@ msgstr "Name" msgid "Description" msgstr "Beschreibung" -#: assignment/models.py:32 assignment/views.py:320 +#: assignment/models.py:32 assignment/views.py:322 #: assignment/templates/assignment/view.html:18 #: assignment/templates/projector/Assignment.html:21 msgid "Number of available posts" @@ -1097,96 +1105,96 @@ msgstr "Darf selbst für Wahlen kandidieren" msgid "Can manage assignment" msgstr "Darf Wahlen verwalten" -#: assignment/models.py:165 assignment/views.py:287 assignment/views.py:469 +#: assignment/models.py:165 assignment/views.py:289 assignment/views.py:573 #: assignment/templates/assignment/base_assignment.html:14 #: assignment/templates/assignment/overview.html:6 #: assignment/templates/assignment/overview.html:9 msgid "Elections" msgstr "Wahlen" -#: assignment/views.py:72 +#: assignment/views.py:74 #, python-format msgid "Candidate %s was nominated successfully." msgstr "Kandidat/in %s wurde erfolgreich vorgeschlagen." -#: assignment/views.py:120 +#: assignment/views.py:122 msgid "New election was successfully created." msgstr "Neue Wahl wurde erfolgreich angelegt." -#: assignment/views.py:122 +#: assignment/views.py:124 msgid "Election was successfully modified." msgstr "Wahl wurde erfolgreich geändert." -#: assignment/views.py:142 +#: assignment/views.py:144 #, python-format msgid "Election %s was successfully deleted." msgstr "Wahl %s wurde erfolgreich gelöscht." -#: assignment/views.py:155 +#: assignment/views.py:157 #, python-format msgid "Election status was set to: %s." msgstr "Wahlstatus wurde gesetzt auf: %s." -#: assignment/views.py:166 +#: assignment/views.py:168 msgid "You have set your candidature successfully." msgstr "Sie haben Ihre Kandidatur erfolgreich gesetzt." -#: assignment/views.py:171 +#: assignment/views.py:173 msgid "You can't candidate. Your user account is only for administration." msgstr "" "Sie können nicht kandidieren. Ihr Nutzerkonto ist nur zur Administration." -#: assignment/views.py:179 +#: assignment/views.py:181 msgid "You have withdrawn your candidature successfully." msgstr "Sie haben Ihre Kandidatur erfolgreich zurückgezogen." -#: assignment/views.py:190 +#: assignment/views.py:192 #, python-format msgid "Candidate %s was withdrawn successfully." msgstr "Die Kandidatur von %s wurde erfolgreich zurückgezogen." -#: assignment/views.py:193 +#: assignment/views.py:195 #, python-format msgid "Do you really want to withdraw %s from the election?" msgstr "Soll %s wirklich von der Wahl zurückgezogen werden?" -#: assignment/views.py:208 +#: assignment/views.py:210 msgid "New ballot was successfully created." msgstr "Neuer Wahlgang erfolgreich angelegt." -#: assignment/views.py:234 +#: assignment/views.py:236 msgid "Poll successfully set to published." msgstr "Abstimmung wurde erfolgreich veröffentlicht." -#: assignment/views.py:236 +#: assignment/views.py:238 msgid "Poll successfully set to unpublished." msgstr "Abstimmung wurde erfolgreich unveröffentlicht." -#: assignment/views.py:238 +#: assignment/views.py:240 #, python-format msgid "Poll ID %d does not exist." msgstr "Abstimmungs-ID %d existiert nicht." -#: assignment/views.py:252 +#: assignment/views.py:254 msgid "not elected" msgstr "nicht gewählt" -#: assignment/views.py:255 assignment/views.py:405 +#: assignment/views.py:257 assignment/views.py:407 msgid "elected" msgstr "gewählt" -#: assignment/views.py:311 assignment/templates/assignment/view.html:6 +#: assignment/views.py:313 assignment/templates/assignment/view.html:6 msgid "Assignment" msgstr "Wahl" -#: assignment/views.py:316 assignment/templates/assignment/edit.html:5 +#: assignment/views.py:318 assignment/views.py:450 assignment/views.py:461 +#: assignment/templates/assignment/edit.html:5 #: assignment/templates/assignment/overview.html:25 -#: assignment/templates/projector/Assignment.html:13 utils/pdf.py:304 -#: utils/pdf.py:313 +#: assignment/templates/projector/Assignment.html:13 msgid "Election" msgstr "Wahl" -#: assignment/views.py:325 assignment/views.py:345 +#: assignment/views.py:327 assignment/views.py:347 #: assignment/templates/assignment/overview.html:26 #: assignment/templates/assignment/view.html:61 #: assignment/templates/assignment/view.html:132 @@ -1195,23 +1203,23 @@ msgstr "Wahl" msgid "Candidates" msgstr "Kandidaten/innen" -#: assignment/views.py:340 +#: assignment/views.py:342 msgid "ballots" msgstr "Wahlgänge" -#: assignment/views.py:363 +#: assignment/views.py:365 msgid "Y" msgstr "J" -#: assignment/views.py:364 +#: assignment/views.py:366 msgid "N" msgstr "N" -#: assignment/views.py:365 +#: assignment/views.py:367 msgid "A" msgstr "E" -#: assignment/views.py:462 +#: assignment/views.py:566 msgid "Election settings successfully saved." msgstr "Wahl-Einstellungen wurden erfolgreich gespeichert." @@ -1258,11 +1266,11 @@ msgstr "Keine Wahlen vorhanden." #: assignment/templates/assignment/poll_view.html:9 #: assignment/templates/assignment/view.html:128 #: assignment/templates/assignment/view.html:136 -#: assignment/templates/projector/Assignment.html:56 utils/pdf.py:316 +#: assignment/templates/projector/Assignment.html:56 msgid "ballot" msgstr "Wahlgang" -#: assignment/templates/assignment/poll_view.html:10 utils/pdf.py:316 +#: assignment/templates/assignment/poll_view.html:10 msgid "candidate" msgid_plural "candidates" msgstr[0] "Kandidat/in" @@ -1981,10 +1989,6 @@ msgstr "Passwort: %s" msgid "URL: %s" msgstr "URL: %s" -#: utils/pdf.py:316 -msgid "available posts" -msgstr "verfügbare Posten" - #: utils/utils.py:88 msgid "Sorry, you have no rights to see this page." msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." @@ -1992,3 +1996,9 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen." #: utils/views.py:223 msgid "undefined-filename" msgstr "undefinierter-dateiname" + +#~ msgid "Print vote" +#~ msgstr "Abstimmung drucken" + +#~ msgid "available posts" +#~ msgstr "verfügbare Posten" diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 25eafd920..c60525fbd 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -586,3 +586,6 @@ ul.results { .preview { background:url("../images/icons/preview.png") no-repeat 0px 0px; } +.poll { + background:url("../images/icons/view-statistics.png") no-repeat 0px 0px; +} \ No newline at end of file