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 %} -
  3. - {% trans "No candidates available." %} -
  4. - {% 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 679f13f00..4cf8ef59e 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index a9f9b504e..19d2464fc 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-19 08:19+0200\n" +"POT-Creation-Date: 2012-07-19 11:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -156,28 +156,22 @@ msgstr "Neuer Eintrag" msgid "Agenda as PDF" msgstr "Tagesordnung als PDF" -#: agenda/templates/agenda/base_agenda.html:19 -#: projector/templates/projector/base_projector.html:20 -#: templates/front_page.html:25 -msgid "Projector view" -msgstr "Projektor-Ansicht" - -#: agenda/templates/agenda/base_agenda.html:31 +#: agenda/templates/agenda/base_agenda.html:26 msgid "View item" msgstr "Eintrag anzeigen" -#: agenda/templates/agenda/base_agenda.html:36 +#: agenda/templates/agenda/base_agenda.html:31 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16 #: agenda/templates/agenda/item_row.html:49 msgid "Edit item" msgstr "Eintrag bearbeiten" -#: agenda/templates/agenda/base_agenda.html:38 +#: agenda/templates/agenda/base_agenda.html:33 #: agenda/templates/agenda/item_row.html:50 msgid "Delete item" msgstr "Eintrag löschen" -#: agenda/templates/agenda/base_agenda.html:43 +#: agenda/templates/agenda/base_agenda.html:38 msgid "Show item" msgstr "Eintrag projizieren" @@ -492,7 +486,7 @@ msgstr "Version %d zugelassen" #: application/models.py:109 #, python-format -msgctxt "Rejected means not permitted" +msgctxt "Rejected meens not permittd" msgid "Version %d rejected" msgstr "Version %d verworfen" @@ -741,9 +735,10 @@ msgstr "Soll Version %s wirklich zurückgewiesen werden?" #: application/views.py:563 participant/views.py:395 msgid "" -"The import function is available for the admin (without user profile) only." +"The import function is available for the superuser (without user profile) " +"only." msgstr "" -"Die Importfunktion ist nur für den Admin (ohne Nutzerprofil) verfügbar." +"Die Importfunktion ist nur für den 'superuser' (ohne Nutzerprofil) verfügbar." #: application/views.py:594 application/views.py:598 application/views.py:604 #: application/views.py:607 participant/views.py:464 @@ -826,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 @@ -1267,8 +1262,9 @@ msgid "No ballots available." msgstr "Keine Wahlgänge vorhanden." #: application/templates/projector/ItemPoll.html:4 +#, fuzzy msgid "Poll about" -msgstr "Abstimmung über" +msgstr "Abstimmungsergebnis" #: assignment/forms.py:35 msgid "Nominate a participant" @@ -1685,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" @@ -1756,7 +1756,7 @@ msgstr "Mitarbeiter" msgid "Guest" msgstr "Gast" -#: participant/models.py:39 participant/views.py:608 +#: participant/models.py:39 participant/views.py:605 #: participant/templates/participant/overview.html:29 #: participant/templates/participant/overview.html:67 msgid "Group" @@ -1778,7 +1778,7 @@ msgstr "Nur zum Filtern der Benutzerliste." msgid "Typ" msgstr "Typ" -#: participant/models.py:46 participant/views.py:609 +#: participant/models.py:46 participant/views.py:606 #: participant/templates/participant/overview.html:44 #: participant/templates/participant/overview.html:69 msgid "Committee" @@ -1931,18 +1931,11 @@ msgstr "Soll das Passwort für %s wirklich zurückgesetzt werden?" #: participant/views.py:571 #, python-format -msgid "" -"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." +msgid "The password for the user %(user)s is %(password)s. Please change it" msgstr "" -"Die Installation war erfolgreich! Bitte %(user)s (Passwort: %(password)s) " -"für die erste Anmeldung verwenden.
Wichtig: Bitte ändern " -"Sie das Passwort direkt nach der erster Anmeldung! Andernfalls erscheint " -"diese Nachricht für alle Teilnehmer/innen und wäre ein Sicherheitsrisiko." +"Das Passwort für den Benutzer %(user)s ist %(password)s. Bitte ändere es" -#: participant/views.py:591 +#: participant/views.py:588 #: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/overview.html:7 #: participant/templates/participant/overview.html:17 @@ -1950,56 +1943,56 @@ msgstr "" msgid "Participants" msgstr "Teilnehmer/innen" -#: participant/views.py:604 +#: participant/views.py:601 msgid "Participant-list" msgstr "Teilnehmerliste" -#: participant/views.py:605 +#: participant/views.py:602 msgid "List of Participants" msgstr "Teilnehmerliste" -#: participant/views.py:608 participant/templates/participant/overview.html:66 +#: participant/views.py:605 participant/templates/participant/overview.html:66 msgid "Last Name" msgstr "Nachname" -#: participant/views.py:608 participant/templates/participant/overview.html:65 +#: participant/views.py:605 participant/templates/participant/overview.html:65 msgid "First Name" msgstr "Vorname" -#: participant/views.py:608 participant/templates/participant/overview.html:36 +#: participant/views.py:605 participant/templates/participant/overview.html:36 #: participant/templates/participant/overview.html:68 msgid "Type" msgstr "Typ" -#: participant/views.py:645 +#: participant/views.py:642 msgid "Participant-passwords" msgstr "Teilnehmer-Passwoerter" -#: participant/views.py:664 +#: participant/views.py:661 msgid "Account for OpenSlides" msgstr "Zugang für OpenSlides" -#: participant/views.py:666 +#: participant/views.py:663 #, python-format msgid "for %s" msgstr "für %s" -#: participant/views.py:669 +#: participant/views.py:666 #, python-format msgid "User: %s" msgstr "Nutzername: %s" -#: participant/views.py:671 +#: participant/views.py:668 #, python-format msgid "Password: %s" msgstr "Passwort: %s" -#: participant/views.py:674 +#: participant/views.py:671 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: participant/views.py:719 +#: participant/views.py:716 msgid "Participants settings successfully saved." msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert." @@ -2187,6 +2180,11 @@ msgstr "Projektor" msgid "Overview" msgstr "Übersicht" +#: projector/templates/projector/base_projector.html:20 +#: templates/front_page.html:25 +msgid "Projector view" +msgstr "Projektor-Ansicht" + #: projector/templates/projector/control.html:20 msgid "Adjust projector view" msgstr "Projektor-Ansicht anpassen" 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') 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..ecca1330b 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_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.") % { '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):