From 70b161c539094d94dc7c60a8280dc88b784efdc7 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 19 Jul 2012 11:11:07 +0200 Subject: [PATCH 1/3] added name for participant app in __init__ removed some files, added though branch merge --- .../templates/projector/ItemApplication.html | 60 ------- .../templates/projector/ItemAssignment.html | 105 ------------ .../templates/projector/ItemPoll.html | 19 --- .../templates/projector/ItemText.html | 10 -- .../templates/projector/overview.html | 17 -- openslides/locale/de/LC_MESSAGES/django.mo | Bin 34943 -> 34925 bytes openslides/locale/de/LC_MESSAGES/django.po | 153 +++++++++++------- openslides/participant/__init__.py | 3 + 8 files changed, 100 insertions(+), 267 deletions(-) delete mode 100644 openslides/application/templates/projector/ItemApplication.html delete mode 100644 openslides/application/templates/projector/ItemAssignment.html delete mode 100644 openslides/application/templates/projector/ItemPoll.html delete mode 100644 openslides/application/templates/projector/ItemText.html delete mode 100644 openslides/application/templates/projector/overview.html diff --git a/openslides/application/templates/projector/ItemApplication.html b/openslides/application/templates/projector/ItemApplication.html deleted file mode 100644 index 8bbde4567..000000000 --- a/openslides/application/templates/projector/ItemApplication.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "beamer.html" %} -{% load tags %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - - - -

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

- {{ item.title }} -

-

{{ item.application.public_version.text|linebreaks }}
- {% if item.application.public_version.reason %} -
-

{% trans "Reason" %}:

- {{ item.application.public_version.reason|linebreaks }}
- {% endif %} -

-{% endblock %} diff --git a/openslides/application/templates/projector/ItemAssignment.html b/openslides/application/templates/projector/ItemAssignment.html deleted file mode 100644 index e0b175128..000000000 --- a/openslides/application/templates/projector/ItemAssignment.html +++ /dev/null @@ -1,105 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - #{{ item.title }}{% endblock %} -{% block header %} - - -{% endblock %} -{% block content %} -

{% trans "Election" %}: {{ item.assignment }}

- - {% if item.assignment.status != "fin" %} - - {% endif %} - - {% if not item.assignment.profile.exists %} -

-

{{ item.assignment.description|linebreaks }}
-

- {% endif %} - - {% if item.assignment.profile.exists and item.assignment.status != "fin" %} -

{% trans "Candidates" %}

-
    - {% for profile in item.assignment.profile.all|dictsort:"user.first_name" %} -
  1. {{ profile }}
    2. - {% empty %} -
  2. - {% trans "No candidates available." %} -
    3. - {% endfor %} -
-


- {% endif %} - - {% with polls|first as firstpoll %} - {% if polls.count > 0 and firstpoll.published %} -

{% trans "Election results" %}

- - - - {% for poll in item.assignment.poll_set.all %} - {% if poll.published %} - - {% endif %} - {% endfor %} - - {% for vote in votes %} - - {% with vote|first as candidate %} - - {% for v in vote|last %} - - {% endfor %} - {% endwith %} - - {% empty %} - - - - {% endfor %} - - - {% for p in polls %} - {% if p.published %} - - {% endif %} - {% endfor %} - - - - {% for p in polls %} - {% if p.published %} - - {% endif %} - {% endfor %} - -
{% trans "Candidates" %}{{forloop.counter}}. {% trans "ballot" %}
- {% if candidate.1 %} - - {% endif %} - {{ candidate.0 }} - {% if v %} - {% if v|length == 3 %} - {% if v.0 %}{{ v.0 }}{% else %}∅{% endif %}
- {% if v.1 %}{{ v.1 }}{% else %}∅{% endif %}
- {% if v.2 %}{{ v.2 }}{% else %}∅{% endif %}
- {% else %} - {% if v != "-" %}{% endif %} - {{ v }} - {% endif %} - {% endif %} -
{% trans "No ballots available." %}
{%trans 'Invalid votes' %} {{ p.votesinvalidf }}
{%trans 'Votes cast' %} {{ p.votescastf }}
- {% endif %} - {% endwith %} - -
-{% endblock %} diff --git a/openslides/application/templates/projector/ItemPoll.html b/openslides/application/templates/projector/ItemPoll.html deleted file mode 100644 index fe26c9197..000000000 --- a/openslides/application/templates/projector/ItemPoll.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - {%trans "Poll about" %}: -

{{ item.title }}

- - - {% for option in item.poll.get_options %} - - - - {% if item.poll.optiondecision %} - - - {% endif %} - - {% endfor %} -
{{ option }}{{ option.voteyes }}{{ option.voteno }}{{ option.voteundesided }}
-{% endblock %} diff --git a/openslides/application/templates/projector/ItemText.html b/openslides/application/templates/projector/ItemText.html deleted file mode 100644 index 36626b53d..000000000 --- a/openslides/application/templates/projector/ItemText.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - {% if item.text %} -

{{ item.title }}

- {{ item.text|safe|linebreaks }} - {% else %} -
{{ item.title }}
- {% endif %} -{% endblock %} diff --git a/openslides/application/templates/projector/overview.html b/openslides/application/templates/projector/overview.html deleted file mode 100644 index 1a5b240a4..000000000 --- a/openslides/application/templates/projector/overview.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - - {% if title %} {{ title }} {% else %} {%trans "Agenda" %} {% endif %} -{% endblock %} - -{% block content %} - {% if title %} -

{{ title }}

- {% else %} -

{%trans "Agenda" %}

- {% endif %} - -{% endblock %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 8d9361b488e1fdc69ece64034d519948382516dc..e57b7865d038decfb990c9178198f0617b014ce0 100644 GIT binary patch delta 6786 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 Ga{V8LnNG|A delta 6827 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 l=XA\n" "Language-Team: German\n" @@ -69,6 +69,8 @@ msgstr "Darf die Tagesordung verwalten" #: agenda/templates/agenda/overview.html:77 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 +#: application/templates/projector/overview.html:3 +#: application/templates/projector/overview.html:10 msgid "Agenda" msgstr "Tagesordnung" @@ -105,6 +107,9 @@ msgstr "Eintrag %s wurde erfolgreich gelöscht." #: application/views.py:487 application/views.py:809 application/views.py:860 #: application/templates/application/view.html:82 #: application/templates/projector/Application.html:37 +#: application/templates/projector/ItemApplication.html:30 +#: application/templates/projector/ItemAssignment.html:67 +#: application/templates/projector/ItemAssignment.html:71 #: assignment/models.py:240 assignment/views.py:557 #: assignment/templates/assignment/view.html:158 #: assignment/templates/assignment/view.html:162 @@ -119,6 +124,8 @@ msgstr "Ja" #: application/views.py:487 application/views.py:809 application/views.py:861 #: application/templates/application/view.html:83 #: application/templates/projector/Application.html:38 +#: application/templates/projector/ItemApplication.html:31 +#: application/templates/projector/ItemAssignment.html:68 #: assignment/models.py:240 assignment/views.py:558 #: assignment/templates/assignment/view.html:159 #: assignment/templates/projector/Assignment.html:79 utils/utils.py:53 @@ -342,6 +349,7 @@ msgstr "Bearbeiten" #: application/templates/application/view.html:232 #: application/templates/application/view.html:252 #: application/templates/projector/Application.html:77 +#: application/templates/projector/ItemApplication.html:56 msgid "Reason" msgstr "Begründung" @@ -357,6 +365,7 @@ msgstr "Triviale Änderungen erzeugen keine neue Version." #: application/templates/application/overview.html:41 #: application/templates/application/view.html:18 #: application/templates/projector/Application.html:55 +#: application/templates/projector/ItemApplication.html:19 msgid "Submitter" msgstr "Antragsteller/in" @@ -793,6 +802,7 @@ msgstr "Keine Anträge vorhanden." #: application/views.py:738 #: application/templates/application/base_application.html:24 #: application/templates/projector/Application.html:63 +#: application/templates/projector/ItemApplication.html:50 msgid "Application No." msgstr "Antrag Nr." @@ -800,6 +810,8 @@ msgstr "Antrag Nr." #: application/templates/application/overview.html:40 #: application/templates/application/view.html:37 #: application/templates/projector/Application.html:11 +#: application/templates/projector/ItemApplication.html:8 +#: application/templates/projector/ItemAssignment.html:13 #: assignment/templates/assignment/overview.html:14 #: assignment/templates/assignment/overview.html:27 #: assignment/templates/assignment/view.html:11 @@ -809,7 +821,7 @@ msgid "Status" msgstr "Status" #: application/views.py:792 application/templates/application/view.html:217 -#: application/templates/application/view.html:247 config/models.py:131 +#: application/templates/application/view.html:247 config/models.py:133 #: config/templates/config/version.html:5 #: config/templates/config/version.html:8 #: config/templates/config/version.html:11 @@ -828,19 +840,24 @@ msgstr "Abstimmungsergebnis" #: application/templates/application/view.html:69 #: application/templates/application/view.html:77 #: application/templates/projector/Application.html:33 +#: application/templates/projector/ItemApplication.html:27 msgid "Vote" msgstr "Abstimmung" #: application/views.py:809 application/views.py:862 #: application/templates/application/view.html:84 -#: application/templates/projector/Application.html:39 assignment/views.py:558 -#: assignment/templates/assignment/view.html:160 +#: application/templates/projector/Application.html:39 +#: application/templates/projector/ItemApplication.html:32 +#: application/templates/projector/ItemAssignment.html:69 +#: assignment/views.py:558 assignment/templates/assignment/view.html:160 #: assignment/templates/projector/Assignment.html:80 msgid "Abstention" msgstr "Enthaltung" #: application/views.py:809 application/templates/application/view.html:85 #: application/templates/projector/Application.html:40 +#: application/templates/projector/ItemApplication.html:33 +#: application/templates/projector/ItemAssignment.html:88 #: assignment/templates/assignment/view.html:182 #: assignment/templates/projector/Assignment.html:101 msgid "Invalid" @@ -849,8 +866,11 @@ msgstr "Ungültig" #: application/views.py:809 #: application/templates/application/poll_view.html:35 #: application/templates/application/view.html:87 -#: application/templates/projector/Application.html:42 assignment/views.py:442 -#: assignment/templates/assignment/poll_view.html:45 +#: application/templates/projector/Application.html:42 +#: application/templates/projector/ItemApplication.html:35 +#: application/templates/projector/ItemAssignment.html:93 +#: application/templates/projector/ItemAssignment.html:96 +#: assignment/views.py:442 assignment/templates/assignment/poll_view.html:45 #: assignment/templates/assignment/view.html:194 #: assignment/templates/assignment/view.html:199 #: assignment/templates/projector/Assignment.html:111 @@ -1027,8 +1047,9 @@ msgstr "Wahlmöglichkeit" msgid "Votes" msgstr "Stimmen" -#: application/templates/application/poll_view.html:31 assignment/views.py:435 -#: assignment/templates/assignment/poll_view.html:35 +#: application/templates/application/poll_view.html:31 +#: application/templates/projector/ItemAssignment.html:85 +#: assignment/views.py:435 assignment/templates/assignment/poll_view.html:35 #: assignment/templates/assignment/view.html:177 #: assignment/templates/projector/Assignment.html:97 msgid "Invalid votes" @@ -1168,19 +1189,83 @@ msgid "Log" msgstr "Log" #: application/templates/projector/Application.html:29 +#: application/templates/projector/ItemApplication.html:23 msgid "Poll result" msgstr "Abstimmungsergebnis" #: application/templates/projector/Application.html:47 +#: application/templates/projector/ItemApplication.html:41 msgid "No poll results available." msgstr "Keine Abstimmungen vorhanden." +#: application/templates/projector/ItemAssignment.html:8 +#: assignment/views.py:501 assignment/views.py:517 +#: assignment/templates/assignment/overview.html:25 +#: assignment/templates/assignment/poll_view.html:5 +#: assignment/templates/assignment/view.html:6 +#: assignment/templates/projector/Assignment.html:27 +msgid "Election" +msgstr "Wahl" + +#: application/templates/projector/ItemAssignment.html:16 #: assignment/forms.py:24 assignment/models.py:44 assignment/views.py:364 #: assignment/templates/assignment/view.html:13 #: assignment/templates/projector/Assignment.html:21 msgid "Number of available posts" msgstr "Anzahl der zur Wahl stehenden Posten" +#: application/templates/projector/ItemAssignment.html:30 +#: application/templates/projector/ItemAssignment.html:48 +#: assignment/views.py:370 assignment/views.py:403 +#: assignment/templates/assignment/overview.html:26 +#: assignment/templates/assignment/poll_view.html:18 +#: assignment/templates/assignment/view.html:36 +#: assignment/templates/assignment/view.html:110 +#: assignment/templates/projector/Assignment.html:38 +#: assignment/templates/projector/Assignment.html:56 +msgid "Candidates" +msgstr "Kandidaten/innen" + +#: application/templates/projector/ItemAssignment.html:36 +#: assignment/templates/assignment/view.html:47 +#: assignment/templates/projector/Assignment.html:44 +msgid "No candidates available." +msgstr "Keine Kandidaten/innen vorhanden." + +#: application/templates/projector/ItemAssignment.html:45 +#: assignment/templates/assignment/view.html:95 +#: assignment/templates/projector/Assignment.html:52 +msgid "Election results" +msgstr "Wahlergebnisse" + +#: application/templates/projector/ItemAssignment.html:51 +#: assignment/views.py:395 +#: assignment/templates/assignment/base_assignment.html:71 +#: assignment/templates/assignment/poll_view.html:5 +#: assignment/templates/assignment/poll_view.html:8 +#: assignment/templates/assignment/view.html:104 +#: assignment/templates/assignment/view.html:113 +#: assignment/templates/projector/Assignment.html:59 +msgid "ballot" +msgstr "Wahlgang" + +#: application/templates/projector/ItemAssignment.html:60 +#: assignment/templates/assignment/view.html:145 +#: assignment/templates/projector/Assignment.html:69 +msgid "Candidate is elected" +msgstr "Kandidat/in ist gewählt" + +#: application/templates/projector/ItemAssignment.html:81 +#: assignment/templates/assignment/view.html:213 +#: assignment/templates/projector/Assignment.html:126 +msgid "No ballots available." +msgstr "Keine Wahlgänge vorhanden." + +#: application/templates/projector/ItemPoll.html:4 +#, fuzzy +msgid "Poll about" +msgstr "Abstimmungsergebnis" + #: assignment/forms.py:35 msgid "Nominate a participant" msgstr "Teilnehmer/in vorschlagen" @@ -1382,26 +1467,6 @@ msgstr "Keine Wahlen vorhanden." msgid "Election: %s" msgstr "Wahlen: %s" -#: assignment/views.py:370 assignment/views.py:403 -#: assignment/templates/assignment/overview.html:26 -#: assignment/templates/assignment/poll_view.html:18 -#: assignment/templates/assignment/view.html:36 -#: assignment/templates/assignment/view.html:110 -#: assignment/templates/projector/Assignment.html:38 -#: assignment/templates/projector/Assignment.html:56 -msgid "Candidates" -msgstr "Kandidaten/innen" - -#: assignment/views.py:395 -#: assignment/templates/assignment/base_assignment.html:71 -#: assignment/templates/assignment/poll_view.html:5 -#: assignment/templates/assignment/poll_view.html:8 -#: assignment/templates/assignment/view.html:104 -#: assignment/templates/assignment/view.html:113 -#: assignment/templates/projector/Assignment.html:59 -msgid "ballot" -msgstr "Wahlgang" - #: assignment/views.py:398 msgid "ballots" msgstr "Wahlgänge" @@ -1417,14 +1482,6 @@ msgstr "" "N: %(NO)s\n" "E: %(ABSTAIN)s" -#: assignment/views.py:501 assignment/views.py:517 -#: assignment/templates/assignment/overview.html:25 -#: assignment/templates/assignment/poll_view.html:5 -#: assignment/templates/assignment/view.html:6 -#: assignment/templates/projector/Assignment.html:27 -msgid "Election" -msgstr "Wahl" - #: assignment/views.py:523 #, python-format msgid "%d. ballot" @@ -1512,11 +1569,6 @@ msgstr "Status ändern" msgid "Remove candidate" msgstr "Kandidate/in entfernen" -#: assignment/templates/assignment/view.html:47 -#: assignment/templates/projector/Assignment.html:44 -msgid "No candidates available." -msgstr "Keine Kandidaten/innen vorhanden." - #: assignment/templates/assignment/view.html:60 msgid "Withdraw self candidature" msgstr "Eigene Kandidatur zurückziehen" @@ -1529,11 +1581,6 @@ msgstr "Selbst kandidieren" msgid "Add new participant" msgstr "Neue/n Teilnehmer/in hinzufügen" -#: assignment/templates/assignment/view.html:95 -#: assignment/templates/projector/Assignment.html:52 -msgid "Election results" -msgstr "Wahlergebnisse" - #: assignment/templates/assignment/view.html:118 msgid "Publish/unpublish results" msgstr "Ergebnisse veröffentlichen/unveröffentlichen" @@ -1543,21 +1590,11 @@ msgstr "Ergebnisse veröffentlichen/unveröffentlichen" msgid "New ballot" msgstr "Neuer Wahlgang" -#: assignment/templates/assignment/view.html:145 -#: assignment/templates/projector/Assignment.html:69 -msgid "Candidate is elected" -msgstr "Kandidat/in ist gewählt" - #: assignment/templates/assignment/view.html:164 #: assignment/templates/projector/Assignment.html:84 msgid "was not a
candidate" msgstr "war kein Kandidat" -#: assignment/templates/assignment/view.html:213 -#: assignment/templates/projector/Assignment.html:126 -msgid "No ballots available." -msgstr "Keine Wahlgänge vorhanden." - #: config/forms.py:24 msgid "Event name" msgstr "Veranstaltungsname" @@ -1644,6 +1681,10 @@ msgstr "Startseite" msgid "System" msgstr "System" +#: participant/__init__.py:3 +msgid "Participant" +msgstr "Teilnehmer" + #: participant/forms.py:24 msgid "Keep applications, try to reassign submitter" msgstr "Anträge beibehalten, versuchen Antragssteller erneut zuzuweisen" diff --git a/openslides/participant/__init__.py b/openslides/participant/__init__.py index e69de29bb..f04c201d4 100644 --- a/openslides/participant/__init__.py +++ b/openslides/participant/__init__.py @@ -0,0 +1,3 @@ +from django.utils.translation import ugettext_noop + +NAME = ugettext_noop('Participant') From 834c30321b55c5286a11ae3697a85ad72c497343 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 19 Jul 2012 11:43:48 +0200 Subject: [PATCH 2/3] #310 Redirect to the password-change-page if the admin has not changed his password yet --- .../templates/participant/login.html | 2 +- openslides/participant/views.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html index 908ed02d8..1f182ade2 100644 --- a/openslides/participant/templates/participant/login.html +++ b/openslides/participant/templates/participant/login.html @@ -41,7 +41,7 @@ $(this).hide("fast"); }); -
+ {% csrf_token %} diff --git a/openslides/participant/views.py b/openslides/participant/views.py index 0024116c4..fd6be11b2 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -565,21 +565,22 @@ def reset_password(request, user_id): def login(request): + extra_content = {} try: admin = User.objects.get(pk=1) if admin.check_password(config['admin_password']): - first_time_message = _("Installation was successfully! Use %(user)s " - "(password: %(password)s) for first login.
" - "Important: Please change the password after " - "first login! Otherwise this message still appears for everyone " - "and could be a security risk.") % { + extra_content['first_time_essage'] = _( + "Installation was successfully! Use %(user)s " + "(password: %(password)s) for first login.
" + "Important: Please change the password after " + "first login! Otherwise this message still appears for everyone " + "and could be a security risk.") % { 'user': html_strong(admin.username), 'password': html_strong(config['admin_password'])} - else: - first_time_message = None + extra_content['next'] = reverse('password_change') except User.DoesNotExist: - first_time_message = None - return django_login(request, template_name='participant/login.html', extra_context={'first_time_message': first_time_message}) + pass + return django_login(request, template_name='participant/login.html', extra_context=extra_content) def register_tab(request): From fd0f3d68fa9e90c6fb8f109f6ff36a5d851edee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 19 Jul 2012 12:27:45 +0200 Subject: [PATCH 3/3] Fix typo in participant/views.py --- openslides/participant/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openslides/participant/views.py b/openslides/participant/views.py index fd6be11b2..ecca1330b 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -569,7 +569,7 @@ def login(request): try: admin = User.objects.get(pk=1) if admin.check_password(config['admin_password']): - extra_content['first_time_essage'] = _( + extra_content['first_time_message'] = _( "Installation was successfully! Use %(user)s " "(password: %(password)s) for first login.
" "Important: Please change the password after "