From f1fb68a569a7198471d60eebe794ce7adb2098df Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 20:02:16 +0100 Subject: [PATCH 01/36] #375: Missing translation of participant type in participant PDF list. (Now get_type_display() is used.) --- 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 b1131ee5c..0c06c0c13 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -269,7 +269,7 @@ class ParticipantsListPDF(PDFView): Paragraph(user.last_name, stylesheet['Tablecell']), Paragraph(user.first_name, stylesheet['Tablecell']), Paragraph(user.detail, stylesheet['Tablecell']), - Paragraph(user.type, stylesheet['Tablecell']), + Paragraph(user.get_type_display(), stylesheet['Tablecell']), Paragraph(user.committee, stylesheet['Tablecell'])]) t = LongTable(data, style=[ ('VALIGN', (0, 0), (-1, -1), 'TOP'), From 71eb529adf9f1622f7ec6837fa7fae89dcd16bea Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 20:59:30 +0100 Subject: [PATCH 02/36] Fixed #403: Moved projector control icons into projector live widget (Added RequestContext to check perms in template.) --- .../templates/projector/dashboard.html | 21 -------------- .../templates/projector/live_view_widget.html | 29 +++++++++++++++++++ openslides/projector/views.py | 2 ++ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/openslides/projector/templates/projector/dashboard.html b/openslides/projector/templates/projector/dashboard.html index 5b6b9091e..4debd4139 100644 --- a/openslides/projector/templates/projector/dashboard.html +++ b/openslides/projector/templates/projector/dashboard.html @@ -15,27 +15,6 @@ {% block content %}

{% trans 'Dashboard' %}

- {% if perms.projector.can_manage_projector %} -
- - {% trans "Adjust projector view" %}: - - - - - - - - - - - - - - - -
- {% endif %}
{% for name, widget in widgets.items %} diff --git a/openslides/projector/templates/projector/live_view_widget.html b/openslides/projector/templates/projector/live_view_widget.html index 69672f157..0904868f1 100644 --- a/openslides/projector/templates/projector/live_view_widget.html +++ b/openslides/projector/templates/projector/live_view_widget.html @@ -1,7 +1,36 @@ {% load i18n %} {% load tags %} +{% load staticfiles %} + +{% if perms.projector.can_manage_projector %} +
+

+ + +
+ + + +

+

+ + +
+ + + +

+

+ + + +

+
+{% endif %} + +
diff --git a/openslides/projector/views.py b/openslides/projector/views.py index 7f008c87e..2b117ce38 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -22,6 +22,7 @@ from django.db import transaction from django.db.models import Q from django.dispatch import receiver from django.shortcuts import redirect +from django.template import RequestContext from django.utils.datastructures import SortedDict from django.utils.importlib import import_module from django.utils.translation import ugettext_lazy as _ @@ -410,6 +411,7 @@ def get_widgets(request): name='live_view', display_name=_('Projector live view'), template='projector/live_view_widget.html', + context = RequestContext(request, {}), permission_required='projector.can_see_projector', default_column=2)) From e3385298654c9bcd7ca0f348cfcdca211e5ad4c2 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 21:44:17 +0100 Subject: [PATCH 03/36] #296: Localised the datetime in PDF header --- openslides/utils/pdf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openslides/utils/pdf.py b/openslides/utils/pdf.py index 81af42171..a50dfdcd4 100755 --- a/openslides/utils/pdf.py +++ b/openslides/utils/pdf.py @@ -20,6 +20,7 @@ from reportlab.pdfbase.ttfonts import TTFont from reportlab.rl_config import defaultPageSize from django.conf import settings +from django.utils import formats # Import gettext for python 2.5 support from django.utils.translation import ugettext as _, gettext @@ -222,8 +223,8 @@ def firstPage(canvas, doc): # time canvas.setFont('Ubuntu', 7) - time = datetime.now().strftime(gettext("%Y-%m-%d %H:%Mh")) - canvas.drawString(15 * cm, 28 * cm, _("Printed: %s") % time) + time = formats.date_format(datetime.now(), 'DATETIME_FORMAT') + canvas.drawString(15 * cm, 28 * cm, _("As of: %s") % time) # title if doc.title: From 27fa32b718ce1b90180fd4a1b5e62a45ea3e54bf Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 22:14:49 +0100 Subject: [PATCH 04/36] Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard) --- openslides/config/forms.py | 4 +-- openslides/config/models.py | 4 +-- .../config/templates/config/general.html | 4 +-- openslides/config/views.py | 11 ++++--- .../templates/projector/default.html | 3 +- openslides/projector/views.py | 4 +-- openslides/templates/front_page.html | 29 ------------------- openslides/urls.py | 7 ++--- openslides/utils/views.py | 27 ----------------- 9 files changed, 17 insertions(+), 76 deletions(-) delete mode 100644 openslides/templates/front_page.html diff --git a/openslides/config/forms.py b/openslides/config/forms.py index cf5fbf3c1..ef1a9b4d8 100644 --- a/openslides/config/forms.py +++ b/openslides/config/forms.py @@ -56,13 +56,13 @@ class GeneralConfigForm(forms.Form, CssClassMixin): required=False, ) - frontpage_title = forms.CharField( + welcome_title = forms.CharField( widget=forms.TextInput(), label=_("Title"), required=False, ) - frontpage_welcometext = forms.CharField( + welcome_text = forms.CharField( widget=forms.Textarea(), label=_("Welcome text"), required=False, diff --git a/openslides/config/models.py b/openslides/config/models.py index 4620a2d51..a816be865 100644 --- a/openslides/config/models.py +++ b/openslides/config/models.py @@ -86,8 +86,8 @@ def default_config(sender, key, **kwargs): 'event_location': '', 'event_organizer': '', 'presentation': '', - 'frontpage_title': _('Welcome to OpenSlides'), - 'frontpage_welcometext': _('[Place for your welcome text.]'), + 'welcome_title': _('Welcome to OpenSlides'), + 'welcome_text': _('[Place for your welcome text.]'), 'system_enable_anonymous': False, }.get(key) diff --git a/openslides/config/templates/config/general.html b/openslides/config/templates/config/general.html index 55fbae5b1..86912cc82 100644 --- a/openslides/config/templates/config/general.html +++ b/openslides/config/templates/config/general.html @@ -23,9 +23,9 @@

- {% trans "Frontpage" %} + {% trans "Welcome Widget" %} {% for field in form %} - {% if "id_frontpage" in field.label_tag %} + {% if "id_welcome" in field.label_tag %}

{{ field.errors }} {{ field.required }} diff --git a/openslides/config/views.py b/openslides/config/views.py index 908ac7db6..e93e08f18 100644 --- a/openslides/config/views.py +++ b/openslides/config/views.py @@ -41,8 +41,8 @@ class GeneralConfig(FormView): 'event_date': config['event_date'], 'event_location': config['event_location'], 'event_organizer': config['event_organizer'], - 'frontpage_title': config['frontpage_title'], - 'frontpage_welcometext': config['frontpage_welcometext'], + 'welcome_title': config['welcome_title'], + 'welcome_text': config['welcome_text'], 'system_enable_anonymous': config['system_enable_anonymous'], } @@ -54,10 +54,9 @@ class GeneralConfig(FormView): config['event_location'] = form.cleaned_data['event_location'] config['event_organizer'] = form.cleaned_data['event_organizer'] - # frontpage - config['frontpage_title'] = form.cleaned_data['frontpage_title'] - config['frontpage_welcometext'] = \ - form.cleaned_data['frontpage_welcometext'] + # welcome widget + config['welcome_title'] = form.cleaned_data['welcome_title'] + config['welcome_text'] = form.cleaned_data['welcome_text'] # system if form.cleaned_data['system_enable_anonymous']: diff --git a/openslides/projector/templates/projector/default.html b/openslides/projector/templates/projector/default.html index de88476f5..3ce29380c 100644 --- a/openslides/projector/templates/projector/default.html +++ b/openslides/projector/templates/projector/default.html @@ -4,6 +4,5 @@ {% load i18n %} {% block content %} -

{% get_config 'frontpage_title' %}

- {% get_config 'frontpage_welcometext' %} +
{% get_config 'welcome_title' %}
{% endblock %} diff --git a/openslides/projector/views.py b/openslides/projector/views.py index 2b117ce38..e9ab1b3ec 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -397,10 +397,10 @@ def get_widgets(request): # welcome widget context = { - 'welcometext': config['frontpage_welcometext']} + 'welcometext': config['welcome_text']} widgets.append(Widget( name='welcome', - display_name=config['frontpage_title'], + display_name=config['welcome_title'], template='projector/welcome_widget.html', context=context, permission_required='projector.can_see_dashboard', diff --git a/openslides/templates/front_page.html b/openslides/templates/front_page.html deleted file mode 100644 index 8dd40846c..000000000 --- a/openslides/templates/front_page.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "base.html" %} - -{% load i18n %} -{% load staticfiles %} - -{% block title %}{{ block.super }} – {% trans "Home" %}{% endblock %} - -{% block content %} -

{{ title }}

-

{{ welcometext|safe|linebreaks }}

- - {% trans "You have access to the following pages:" %} -
-{% endblock %} - -{% block submenu %} - {% if perms.projector.can_see_projector %} -

{% trans "Home" %}

- - {% endif %} -{% endblock %} diff --git a/openslides/urls.py b/openslides/urls.py index ce763b3f2..2c3465260 100644 --- a/openslides/urls.py +++ b/openslides/urls.py @@ -15,15 +15,14 @@ from django.conf.urls.defaults import patterns, url, include from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.shortcuts import redirect from django.utils.importlib import import_module - -from openslides.utils.views import FrontPage +from django.views.generic import RedirectView handler500 = 'openslides.utils.views.server_error' urlpatterns = patterns('', - # frontpage - (r'^$', FrontPage.as_view()), + # Redirect to dashboard URL + (r'^$', RedirectView.as_view(url='/projector/dashboard/', permanent=False)), (r'^agenda/', include('openslides.agenda.urls')), (r'^motion/', include('openslides.motion.urls')), diff --git a/openslides/utils/views.py b/openslides/utils/views.py index 5d9e1303d..5e814bf9d 100644 --- a/openslides/utils/views.py +++ b/openslides/utils/views.py @@ -358,33 +358,6 @@ class PDFView(PermissionMixin, View): return self.render_to_response(self.get_filename()) -class FrontPage(TemplateView): - template_name = 'front_page.html' - - def has_permission(self, request): - if request.user.is_authenticated() or config['system_enable_anonymous']: - return True - return False - - def get_context_data(self, **kwargs): - context = super(FrontPage, self).get_context_data(**kwargs) - apps = [] - for app in settings.INSTALLED_APPS: - try: - mod = import_module(app + '.views') - tab = mod.register_tab(self.request) - except (ImportError, AttributeError): - continue - if tab.permission: - apps.append(tab) - context.update({ - 'apps': apps, - 'title': config['frontpage_title'], - 'welcometext': config['frontpage_welcometext'], - }) - return context - - def server_error(request, template_name='500.html'): """ 500 error handler. From b10cf331ab9fbf33275f08f9587f4e63dfe39cc3 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 22:24:29 +0100 Subject: [PATCH 05/36] Updated translation --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35385 -> 35441 bytes openslides/locale/de/LC_MESSAGES/django.po | 146 ++++++++++----------- 2 files changed, 70 insertions(+), 76 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 17c08c9e27867a884bb3a6789a52b06273d6d19f..13b963b7376eff95eab778036555ddd01f28c2c0 100644 GIT binary patch delta 10672 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index c8ed90f13..588a90749 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: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-08 09:41+0100\n" +"POT-Creation-Date: 2012-11-17 22:21+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -27,7 +27,7 @@ msgstr "Englisch" #: global_settings.py:38 msgid "French" -msgstr "" +msgstr "Französisch" #: agenda/forms.py:28 msgid "Parent item" @@ -484,7 +484,7 @@ msgid "Election was successfully modified." msgstr "Wahl wurde erfolgreich geändert." #: assignment/views.py:138 motion/views.py:257 motion/views.py:663 -#: participant/views.py:492 participant/views.py:515 utils/views.py:225 +#: participant/views.py:506 participant/views.py:529 utils/views.py:225 #: utils/views.py:243 utils/views.py:267 msgid "Please check the form for errors." msgstr "Bitte kontrollieren Sie das Formular nach Fehlern." @@ -902,23 +902,18 @@ msgstr "Willkommen bei OpenSlides" msgid "[Place for your welcome text.]" msgstr "[Platz für Ihren Begrüßungstext.]" -#: config/models.py:92 -#, python-format -msgid "Get professional support for OpenSlides on %s." -msgstr "Professionelle Unterstützung für OpenSlides gibt es unter %s." - -#: config/models.py:107 +#: config/models.py:103 msgid "General" msgstr "Allgemein" -#: config/models.py:131 config/templates/config/version.html:5 +#: config/models.py:127 config/templates/config/version.html:5 #: config/templates/config/version.html:8 #: config/templates/config/version.html:11 motion/views.py:789 #: motion/templates/motion/view.html:214 motion/templates/motion/view.html:244 msgid "Version" msgstr "Version" -#: config/views.py:79 +#: config/views.py:78 msgid "" "Anonymous access enabled. Please modify the \"Anonymous\" group to fit your " "required permissions." @@ -926,11 +921,11 @@ msgstr "" "Anonymer Zugriff aktiviert. Bitte setzen Sie die Rechte der Gruppe " "\"Anonymous\" passend zum gewünschten Zugriffslevel." -#: config/views.py:85 +#: config/views.py:84 msgid "General settings successfully saved." msgstr "Allgemeine Einstellungen erfolgreich gespeichert." -#: config/views.py:120 config/templates/config/base_config.html:7 +#: config/views.py:119 config/templates/config/base_config.html:7 msgid "Configuration" msgstr "Konfiguration" @@ -944,8 +939,8 @@ msgid "Event" msgstr "Veranstaltung" #: config/templates/config/general.html:26 -msgid "Frontpage" -msgstr "Startseite" +msgid "Welcome Widget" +msgstr "Willkommens-Widget" #: config/templates/config/general.html:41 msgid "System" @@ -1706,7 +1701,7 @@ msgstr "Keine Abstimmungsergebnisse vorhanden." msgid "Participant" msgstr "Teilnehmer" -#: participant/forms.py:26 participant/views.py:590 +#: participant/forms.py:26 participant/views.py:604 #: participant/templates/participant/group_overview.html:7 #: participant/templates/participant/group_overview.html:10 #: participant/templates/participant/user_detail.html:14 @@ -1718,7 +1713,7 @@ msgstr "Gruppen" msgid "Permissions" msgstr "Rechte" -#: participant/forms.py:47 participant/views.py:530 participant/views.py:576 +#: participant/forms.py:47 participant/views.py:544 participant/views.py:590 #: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/overview.html:7 #: participant/templates/participant/overview.html:18 @@ -1798,7 +1793,7 @@ msgstr "Nur zum Filtern der Teilnehmerliste." msgid "Typ" msgstr "Typ" -#: participant/models.py:53 participant/views.py:245 +#: participant/models.py:53 participant/views.py:259 #: participant/templates/participant/overview.html:45 #: participant/templates/participant/overview.html:70 #: participant/templates/participant/user_detail.html:34 @@ -1843,81 +1838,97 @@ msgstr "Zum Beispiel als Antragsteller." msgid "Welcome to OpenSlides!" msgstr "Willkommen bei OpenSlides!" -#: participant/views.py:240 +#: participant/views.py:210 +msgid "You can not delete yourself." +msgstr "Sie dürfen sich nicht selbst löschen." + +#: participant/views.py:212 +msgid "You can not delete the administrator." +msgstr "Sie dürfen den Administrator nicht löschen." + +#: participant/views.py:232 +msgid "You can not deactivate yourself." +msgstr "Sie dürfen sich nicht selbst deaktivieren." + +#: participant/views.py:235 +msgid "You can not deactivate the administrator." +msgstr "Sie dürfen den Administrator nicht deaktivieren." + +#: participant/views.py:254 msgid "Participant-list" msgstr "Teilnehmerliste" -#: participant/views.py:241 +#: participant/views.py:255 msgid "List of Participants" msgstr "Teilnehmerliste" -#: participant/views.py:244 participant/templates/participant/overview.html:67 +#: participant/views.py:258 participant/templates/participant/overview.html:67 msgid "Last Name" msgstr "Nachname" -#: participant/views.py:244 participant/templates/participant/overview.html:66 +#: participant/views.py:258 participant/templates/participant/overview.html:66 msgid "First Name" msgstr "Vorname" -#: participant/views.py:244 +#: participant/views.py:258 #: participant/templates/participant/group_overview.html:13 msgid "Group" msgstr "Gruppe" -#: participant/views.py:244 participant/templates/participant/overview.html:37 +#: participant/views.py:258 participant/templates/participant/overview.html:37 #: participant/templates/participant/overview.html:69 #: participant/templates/participant/user_detail.html:29 #: participant/templates/projector/UserSlide.html:24 msgid "Type" msgstr "Typ" -#: participant/views.py:276 +#: participant/views.py:290 msgid "Participant-passwords" msgstr "Teilnehmer-Passwoerter" -#: participant/views.py:298 +#: participant/views.py:312 msgid "Account for OpenSlides" msgstr "Zugang für OpenSlides" -#: participant/views.py:300 +#: participant/views.py:314 #, python-format msgid "for %s" msgstr "für %s" -#: participant/views.py:303 +#: participant/views.py:317 #, python-format msgid "User: %s" msgstr "Nutzername: %s" -#: participant/views.py:307 +#: participant/views.py:321 #, python-format msgid "Password: %s" msgstr "Passwort: %s" -#: participant/views.py:312 +#: participant/views.py:326 #, python-format msgid "URL: %s" msgstr "URL: %s" -#: participant/views.py:354 +#: participant/views.py:368 #, python-format msgid "%d new participants were successfully imported." msgstr "%d neue Teilnehmer/innen wurden erfolgreich importiert." -#: participant/views.py:365 +#: participant/views.py:379 msgid "Do you really want to reset the password?" msgstr "Soll das Passwort wirklich zurückgesetzt werden?" -#: participant/views.py:378 +#: participant/views.py:392 #, python-format msgid "The Password for %s was successfully reset." msgstr "Das Passwort für %s wurde erfolgreich zurückgesetzt." -#: participant/views.py:457 +#: participant/views.py:471 msgid "Participants settings successfully saved." msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert." -#: participant/views.py:467 +#: participant/views.py:481 #, python-format msgid "" "Installation was successfully! Use %(user)s (password: %(password)s) for " @@ -1930,15 +1941,15 @@ msgstr "" "Sie das Passwort nach der ersten Anmeldung! Anderenfalls erscheint diese " "Meldung weiterhin für alle und ist ein Sicherheitsrisiko." -#: participant/views.py:490 +#: participant/views.py:504 msgid "User settings successfully saved." msgstr "Nutzereinstellungen wurden erfolgreich gespeichert." -#: participant/views.py:512 +#: participant/views.py:526 msgid "Password successfully changed." msgstr "Passwort wurde erfolgreich geändert." -#: participant/views.py:562 +#: participant/views.py:576 msgid "My motions and elections" msgstr "Meine Anträge und Wahlen" @@ -1988,7 +1999,7 @@ msgid "Edit participant" msgstr "Teilnehmer/in bearbeiten" #: participant/templates/participant/base_participant.html:50 -#: participant/templates/participant/overview.html:97 +#: participant/templates/participant/overview.html:98 msgid "Delete participant" msgstr "Teilnehmer/in löschen" @@ -2092,15 +2103,15 @@ msgstr "von" msgid "Last Login" msgstr "Letzer Login" -#: participant/templates/participant/overview.html:99 +#: participant/templates/participant/overview.html:100 msgid "Change status to inactive" msgstr "Status ändern auf inaktiv" -#: participant/templates/participant/overview.html:102 +#: participant/templates/participant/overview.html:103 msgid "Change status to active" msgstr "Status ändern auf aktiv" -#: participant/templates/participant/overview.html:111 +#: participant/templates/participant/overview.html:113 #: participant/templates/participant/user_widget.html:22 msgid "No participants available." msgstr "Keine Teilnehmer/innen vorhanden." @@ -2171,31 +2182,28 @@ msgstr "Darf den Projektor sehen" msgid "Can see the dashboard" msgstr "Darf das Dashboard sehen" -#: projector/views.py:204 +#: projector/views.py:206 msgid "Errors in the form" msgstr "Fehler im Formular" -#: projector/views.py:383 projector/templates/projector/dashboard.html:17 +#: projector/views.py:384 projector/templates/projector/base_projector.html:7 +#: projector/templates/projector/base_projector.html:12 +#: projector/templates/projector/dashboard.html:17 msgid "Dashboard" msgstr "Dashboard" -#: projector/views.py:411 +#: projector/views.py:412 msgid "Projector live view" msgstr "Projektor-Live-Ansicht" -#: projector/views.py:437 +#: projector/views.py:439 msgid "Overlays" msgstr "Einblendungen" -#: projector/views.py:450 +#: projector/views.py:452 msgid "Custom Slides" msgstr "Benutzerdefinierte Folien" -#: projector/templates/projector/base_projector.html:7 -#: projector/templates/projector/base_projector.html:12 -msgid "Projector" -msgstr "Projektor" - #: projector/templates/projector/base_projector.html:15 msgid "Overview" msgstr "Übersicht" @@ -2207,7 +2215,6 @@ msgid "Select widgets" msgstr "Widgets auswählen" #: projector/templates/projector/base_projector.html:22 -#: templates/front_page.html:25 msgid "Projector view" msgstr "Projektor-Ansicht" @@ -2245,27 +2252,23 @@ msgstr "Willkommensseite" msgid "New slide" msgstr "Neue Folie" -#: projector/templates/projector/dashboard.html:21 -msgid "Adjust projector view" -msgstr "Projektor-Ansicht anpassen" - -#: projector/templates/projector/dashboard.html:22 +#: projector/templates/projector/live_view_widget.html:10 msgid "Zoom in" msgstr "Vergrößern" -#: projector/templates/projector/dashboard.html:25 +#: projector/templates/projector/live_view_widget.html:13 msgid "Zoom out" msgstr "Verkleinern" -#: projector/templates/projector/dashboard.html:28 +#: projector/templates/projector/live_view_widget.html:18 msgid "Scroll text up" msgstr "Text nach oben scrollen" -#: projector/templates/projector/dashboard.html:31 +#: projector/templates/projector/live_view_widget.html:21 msgid "Scroll text down" msgstr "Text nach unten scrollen" -#: projector/templates/projector/dashboard.html:34 +#: projector/templates/projector/live_view_widget.html:26 msgid "Reset projector view" msgstr "Projektor-Ansicht zurücksetzen" @@ -2286,8 +2289,7 @@ msgstr "Seite nicht gefunden." msgid "Server Error" msgstr "Serverfehler" -#: templates/base.html:21 templates/front_page.html:6 -#: templates/front_page.html.py:22 +#: templates/base.html:21 msgid "Home" msgstr "Startseite" @@ -2299,20 +2301,12 @@ msgstr "Abmelden" msgid "Welcome" msgstr "Willkommen" -#: templates/front_page.html:12 -msgid "You have access to the following pages:" -msgstr "Sie haben Zugriff auf folgende Seiten:" - -#: utils/pdf.py:225 -msgid "%Y-%m-%d %H:%Mh" -msgstr "%d.%m.%Y %H:%Mh" - -#: utils/pdf.py:226 +#: utils/pdf.py:227 #, python-format -msgid "Printed: %s" -msgstr "Gedruckt am: %s" +msgid "As of: %s" +msgstr "Stand: %s" -#: utils/pdf.py:237 utils/pdf.py:246 +#: utils/pdf.py:238 utils/pdf.py:247 #, python-format msgid "Page %s" msgstr "Seite %s" From 0cf4191934a61f6998707dd3608bec034b4a427f Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 17 Nov 2012 23:44:41 +0100 Subject: [PATCH 06/36] Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty. --- .../assignment/templates/assignment/view.html | 15 ++++++--------- .../templates/projector/Assignment.html | 2 -- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index 0cf5ec548..a900a28fc 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -89,6 +89,7 @@ {% endif %} {% endif %} +{% if assignment.elected %}

{% trans "Elected Candidates" %}

    {% for person in assignment.elected %} @@ -104,8 +105,9 @@
  • {% trans "No elected candidates available." %}
  • {% endfor %}
+{% endif %} -{% if perms.assignment.can_manage_assignments %} +{% if perms.assignment.can_manage_assignments and blocked_candidates %}

{% trans "Blocked Candidates" %}

    {% for person in blocked_candidates %} @@ -118,6 +120,7 @@
{% endif %} +{% if assignment.status != "sea" %}

{% trans "Election results" %}

{% if polls.exists %} @@ -215,7 +218,6 @@ {% endif %} - {% trans 'Votes cast' %} {% for poll in polls %} @@ -233,11 +235,8 @@ {% endif %} - {% else %} - - {% trans "No ballots available." %} - + {% trans "No results available." %} {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}

@@ -245,9 +244,7 @@

{% endif %} - {% endif %} - +{% endif %}
- {% endblock %} diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html index 8cf59860c..6a2a59b3c 100644 --- a/openslides/assignment/templates/projector/Assignment.html +++ b/openslides/assignment/templates/projector/Assignment.html @@ -124,8 +124,6 @@ {% elif some_polls_available %} {% trans "Vote results are not published yet." %} - {% elif assignment.candidates %} - {% trans "No ballots available." %} {% endif %}
{% endblock %} From b4a4d15a7f3f886ba6e9553eca41130cc748fd76 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Sun, 18 Nov 2012 14:21:11 +0100 Subject: [PATCH 07/36] Revert "Treat openslides the same way as other packages" This reverts commit 14ba868df4ca9b62bb99499532271109c2e4c998. --- extras/win32-portable/prepare_portable.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index 04c1e0cc7..574a4cfba 100644 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -45,6 +45,10 @@ LIBEXCLUDE = [ r"^unittest/", ] +OPENSLIDES_EXCLUDE = [ + r"^openslides/settings.py" +] + SITE_PACKAGES = { "django": { @@ -80,10 +84,7 @@ SITE_PACKAGES = { "pil": { # NOTE: PIL is a special case, see copy_pil "copy": [], - }, - "openslides": { - "copy" : ["openslides"], - }, + } } PY_DLLS = [ @@ -301,6 +302,9 @@ def main(): collect_lib(libdir, odir) collect_site_packages(sitedir, os.path.join(odir, "site-packages")) + exclude = get_pkg_exclude("openslides", OPENSLIDES_EXCLUDE) + copy_dir_exclude(exclude, ".", "openslides", odir) + if not compile_openslides_launcher(): sys.stdout.write("Using prebuild openslides.exe\n") From 720a993259acf6f82c4722bd59636c154d8687e0 Mon Sep 17 00:00:00 2001 From: Andy Kittner Date: Sun, 18 Nov 2012 14:38:22 +0100 Subject: [PATCH 08/36] Copy openslides from local checkout to site-packages We reverted to using the checkout instead of an installed openslides version when building the portable, but we still want openlides to be placed together with all the other packages --- extras/win32-portable/prepare_portable.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py index 574a4cfba..9418b8e10 100644 --- a/extras/win32-portable/prepare_portable.py +++ b/extras/win32-portable/prepare_portable.py @@ -18,8 +18,6 @@ import zipfile import distutils.ccompiler import distutils.sysconfig -from contextlib import nested - import pkg_resources sys.path.insert(0, os.getcwd()) @@ -45,10 +43,6 @@ LIBEXCLUDE = [ r"^unittest/", ] -OPENSLIDES_EXCLUDE = [ - r"^openslides/settings.py" -] - SITE_PACKAGES = { "django": { @@ -298,12 +292,13 @@ def main(): raise os.makedirs(odir) + out_site_packages = os.path.join(odir, "site-packages") collect_lib(libdir, odir) - collect_site_packages(sitedir, os.path.join(odir, "site-packages")) + collect_site_packages(sitedir, out_site_packages) - exclude = get_pkg_exclude("openslides", OPENSLIDES_EXCLUDE) - copy_dir_exclude(exclude, ".", "openslides", odir) + exclude = get_pkg_exclude("openslides") + copy_dir_exclude(exclude, ".", "openslides", out_site_packages) if not compile_openslides_launcher(): sys.stdout.write("Using prebuild openslides.exe\n") From 93d2dc8d7d17b1799e8e3ffcebbdbde2c01854c8 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 19 Nov 2012 22:54:09 +0100 Subject: [PATCH 09/36] Restructuring and optimization of assignment templates. (Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished') --- .../templates/assignment/overview.html | 5 +- .../assignment/templates/assignment/view.html | 47 ++++++------------- .../templates/projector/Assignment.html | 4 -- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 717ff1538..ed3ba8ded 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -32,10 +32,11 @@ {% if assignment.active %}activeline{% endif %}"> {{ assignment }} - {{ assignment.posts }} {% trans "posts" %} / {{ assignment.elected|length }} {% trans "elected" %} + {% trans "posts" %}: {{ assignment.posts }} {% if assignment.status != 'fin' %} - / {{ assignment.candidates|length }} {% trans "candidates" %} + | {% trans "candidates" %}: {{ assignment.get_participants|length }} {% endif %} + | {% trans "elected" %}: {{ assignment.elected|length }} {{ assignment.get_status_display }} diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index a900a28fc..47b6d0e2b 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -33,9 +33,10 @@

{{ assignment }}

{{ assignment.description|linebreaks }}

+{% if assignment.status != "fin" %}

{% trans "Candidates" %}

    - {% for person in assignment.candidates %} + {% for person in assignment.get_participants %}
  1. {{ person }} {% if perms.assignment.can_manage_assignment %} @@ -43,6 +44,14 @@ {% endif %} {% endif %} + {% if person in assignment.elected %} + | {% trans "elected" %} + {% if perms.assignment.can_manage_assignment %} + {% if assignment.status == "sea" or assignment.status == "vot" %} + + {% endif %} + {% endif %} + {% endif %}
  2. {% empty %}
  3. {% trans "No candidates available." %}
  4. @@ -85,29 +94,11 @@

    {% endif %} - {% endif %} {% endif %} - -{% if assignment.elected %} -

    {% trans "Elected Candidates" %}

    -
      - {% for person in assignment.elected %} -
    • - {{ person }} - {% if perms.assignment.can_manage_assignment %} - {% if assignment.status == "sea" or assignment.status == "vot" %} - - {% endif %} - {% endif %} -
    • - {% empty %} -
    • {% trans "No elected candidates available." %}
    • - {% endfor %} -
    {% endif %} -{% if perms.assignment.can_manage_assignments and blocked_candidates %} +{% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.status != "fin" %}

    {% trans "Blocked Candidates" %}

      {% for person in blocked_candidates %} @@ -123,18 +114,8 @@ {% if assignment.status != "sea" %}

      {% trans "Election results" %}

      -{% if polls.exists %} + {% if polls.exists %} - - - - {% with ballotnumber=polls.count %} - - {% endwith %} - - {% for poll in polls %} @@ -235,7 +216,7 @@ {% endif %}
      - {% trans "ballot" %} -
      {% trans "Candidates" %}
      -{% else %} + {% else %} {% trans "No results available." %} {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}

      @@ -244,7 +225,7 @@

      {% endif %} -{% endif %} + {% endif %} {% endif %}
{% endblock %} diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html index 6a2a59b3c..937328d0e 100644 --- a/openslides/assignment/templates/projector/Assignment.html +++ b/openslides/assignment/templates/projector/Assignment.html @@ -120,10 +120,6 @@ {% endfor %} - - {% elif some_polls_available %} - {% trans "Vote results are not published yet." %} {% endif %} -
{% endblock %} From c5595effeff9ee27d2559ac33715b2943b91088c Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 19 Nov 2012 22:59:13 +0100 Subject: [PATCH 10/36] Updated translation. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35441 -> 35272 bytes openslides/locale/de/LC_MESSAGES/django.po | 96 +++++++++------------ 2 files changed, 43 insertions(+), 53 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 13b963b7376eff95eab778036555ddd01f28c2c0..44203093a1aa614dbe62356443fbc587cc9bd1ad 100644 GIT binary patch delta 10103 zcmYk?2YgRgAII^Vgd|3$5k%x4iNs1sVnq;p#i~(zBm^;H#cti&vqk@?tu|FNYSU6% zwMOk$TlL`abZI?`KHBH=%{_U&+}G>pea^Y(-h0mPoO}Q3)hCNQ&$>PByTSPuTO7AN zEUPsBY!sA#9A7Cnaly_{6Rj4mBoiFR&nbRd7f?cathW&)H9c21n$FfcoP%xZ`6$wDq5BgCZitE2-V&Oi(_Zh`78{=G3bZ0 zFaVce8Qg^4Jl{G+p$H9MU;+F-_k?9VMqT&>b>Tmz9#F}$ic$~5f|!81t}YhBW~iBV zz(DMe(Kr^1;c8Sy_o9pETem3m#+R5MyH$1`+y`~zEYyR>;S`*Tr_npsvU=b}?2HxT zoPJX$jqoHU~A)OQ;OoN83fgiv^TXsF628rL>Ewr=e1rjhev>EP*S{`A<-( zKWo~*Lk-|LhG5aEmgSF?QTI>A0Blp0{A)zLXwZ#E8fT%}SED!XLGEQ8H2xd41SR90 z8ONcPDhc(#W~fcp8!O;=bAG)!zZ-SmbMfR~o8=M>8u3lk$eyB7moLG&u|Eb;FKy~^ z#yY4}w#34iiMnnK2I4!YOfEz{a5)yjwW#N8w<+ktqvphU)J(2pFy1%qf1+;SmFO&0 zL8Qs5Wa_<88M09`-ihp2>lP+qzG|c&>tQku#u{jErjU=qT@1$`P2H=yGZSCbfPzt* z&}G^yp=MGYHPZ&DnYKqgs5@$gvy4ko{kEVoc@TNMZR-MsXd0fNJ`^PwmNHTYmC6>V zCF)?>yQ6M25S5|vsMl#8>h0N$8t8u1raNKkmr(=y29?R5a%KJhprDbzL|y1r)7cCD zs9jzW^&x768hIw_1`~}_Py?Ke8rVYAfYzDwXHXgZ5;eeYFc$CWJkPfRYdI%EP!9-0 zElCyRlVDZDve*Y*I2EUZ7v9csxQq5A)Z z+N63lWMR~EN?;(*w_+(MMfFf?*%2#X8fp{H#WJ|coIirP(K*xruAyGHZ%|A2AJldK z#R&9ii%)YWGuwzT;fR3mS$S91%X;>L^(1qWlX6Dh@X)l0Ebq&-2TB6Q( zMeU6=)PN?U209(pZyqXRE6`TQ4HV+>7-|5&p&snfgm)U_a0jkJy}zxoFgGg6e+=b^r6If!t|I{M0Fg3x^N;Yh4WBv z%`)VxZEe6Pyo1_YR&!^GLQ$JE29=5G#uThXy+w2KA5LL34SLXG)C@PEM*IGGzhtU2u`;OsQKlK%Z951A;J&dORxCZBe_vC;Fm|x^5OKa|?`{kc`;Y5el05SEvujzm54@ zJ4+COxv4|#fyU^EovS9JREYQP*upKfV74C}>SiBX5{> z(bR+5I3q8Cx`7LosaR95gPKtb)R(e1DidQ+Ghc+7*ecWm_oLpD6Q=z(`tyA2DFv;W zS6e6LF{oW!2`gh$tbn7?g{x3&cMP>Be#FvPpdH_Pj7ANlGrDjzYR@b|e)z0|SP7q@ ztp}8S!};K}#Z2mxQ19;}Ou?6^HLTsR+MfI?ReNdB+8;F?ZlTund(@gfMi)LqJs_lm^LCU%t!X0aK1rzS8lsl0m8o~d zVCsEM`xw-9Q#+7<ZFHkAY-_sd*Ing-^#V1s61|+1#i7o( zMZHb~uoTY0%D53VkSnMRK101l!M&YqU)u*92wnJ^Q z0jLi}HfrrAVghc)vUnS7;wy~D>V2Ir-vCUaz7(6_6->qw{dfj;L=9{)M&s&!wzG*& z(V!VzLJjBvYVDq(Qs|rE)I(7-kHvi06g9w9)WFB0GB6Fb1Pf5tuR%><59;ms7e=7J z-QO8NRn&}=Q6p@K8bB&)U_DVc8if^b1}deyP?VFN@?;&bHFH!gN8Q|PM5OrM$ z`k-BoLhg)EySpidV=pX?lTbHWfqLDxpw>JGb=^_a5?n_g^d0DAFc7_|yRZ(%pw9P0 zWo`(vl(sd3f^NJBHM2Dsh37C5f5B=Poav;t88)Wg0eM5MrKk_rGc1RN1~~(dM?J6& z7WLq7SXhAi;K5FYM(4`<&!V7?D^Rc7dW^<<7=s0dIBOP<+O^$K85xYeI1aUECZjUA z5WR4#IltYw4>f>KQTI8A<$1n!n}Xg)uc1yR%A!&ii?LYEw5OvV^`WTEH4)3>9Msz9 zp!Uistd4h384SvDHfeP%Og#;i;ViV(!A(K#N6qLC>V3bDTC2Y?484XqBac9Ra1ziT zTcd8+12x0RsHK>Tg>X0e;Zf88E}#Z}a~SKdweuM6%)B@TP>(>}ARaY<&ZyM(z*x*i zy*}$uoA4xRK;NRiq|Z_Pi;i$6QW@31DQam4qWaArLH>1vZKmT%%uoF;YQ*b?h1nY)b2(66ZLijFeB1vZ6X8aiV^9E9pP8iQ~- zw#1Jy5dTCC%s1O)47FqtsI{+%I$z(MZ-d%fT~QMlhZ^uK)cx!=6twGinG?UFQtv(5 zS*yyZnI)kfR3CL=3)FzSp)!<#3HXj_&%q+pk6}@~V(Jf3Z`EH&W^5~RjPvboU>u2B zqxGlBgY?O+jtSMW{7jZQ2iEah`8|K_QV7 zKO!653K?fvpW_TvDqD_sHd7Z2r#{@c083Keh5AySM?L7FsXsyO0sjfk^)aZ7q?mdK ztgH8bFonjr6}1Y+%dM@fl@1u6_dUO7`X}^lOZwD6R{O?BJx19%cI$1dj4w=k^dx>bsJFye+-dw4wVCwKD9S`4>H%+} zUgPel&76knHxreqofwZNYzpltJVh^T@{VH*^r7AwmC8<71v61MT85hWan#q+Z7>wmF$^c!6g2XcsFZ(-y6_TeNgkk5{oI`Qp5pWiLGAYPsJEgP zD#dM459)@RKo)AoV~n#=16_%&(cVTu7rrp&o9a9u0Ck}Y^`Jy7iH)!n_QWzc4mH3J zFdR3c9&iek`ma$Ldx_d>Wv4ky9fzKJ|Jze2&52H^y)Y8BHe0b0-a+jJpXuh;5Ou?J zRR1}se#bEmf5t{wdWL1afqhWzdyGF|J?eoo`R_ly|7|H~#8*)l+(W%K)n+*(Zh%qL zTcahz*cSLxoJ(`wb)cT^1FNxBW^|weJF5E|?Q|6PJ`$gJC{R7I~i6%q` z!h<%gUo)ZtWgYJl(Zu(}Y}$GgLn-GS`90W@@0reO)D|C2oTIG~5vfLw3IzMcIzgMZ zcVk?G$52Nz<08tHDW4`DQx3;f>R^s!)9-*WRj)*6D&^^rWg5#-o@p+~#Fey1U_7ya zxK4d4&M^Hy#h#|zoc6MmuVFDiEOK zilJ=@$5zV6iD37Lh?vaNrn$CpFK1et-bZQE8>qK&Cv7jV2ho#gK>U}u zNc-oe|8(kUluHmFnKqiNpNTKs9%V!A^_1Qx8WFxkr0KQEc=@%ff?g|cr2HrSR}gu} zN(%a}T;tr}*ZS)G`_#u_I`Y}JLh&;`Jyv}xbExPy;XJX2&@qx!WVMNQDT_{*PLQ=~2<>Mf(n72%+PqyKZDi>{L@b zKucYsEm4^WAXb@k6mx(5Pr4^ZCVPDDJ{lR4`z}79eHo#Tatr#_B0`8x#75fqe&!yl zsefzAZ7E+N)|&bk*oS%@q6?v;KQ_iIxi#kIZV*+(K4Q-HrB!?XC87Tt$0B;ckHi|v zwM{=?yiJ>q0uI(;W1?|5UNGep`ZpxX6FX?j!SjR>_j=*N9Q3yoL66O#e?zTMz0bi7Lb; zq73afiGLBrsh=Y9j*=8Q=&S5U<8oq>IWyq3PCwALiSQ@(5;ur;=KKuGIvNs-b4$)2 zf5TGx+`=?sgXurdIc*i7UWamN;*562911IFOeOXcXNabza~>xt9HRXfOhO&=aUAg% zM*kq5g?GKBkEM2DPuv8QtL{ zqNAz*M!A$Jx1l`Cls_;|pshaTf%qOVmhwWvn^-`MAl4H)IudUXS55sWeyk7BG78T) z(G?pIXDNFVhjYG-S?-rJr}_-<5`ELM`epV@%g%76jdEoT%XVc9$>^J%(J!Z9o!>m& zfhkGuK`9^RJWcu8FDHMS*4{ozu7rfz)obQ-?bs|R=Wxa%pXgL`hboy_uCyWCB(v|p yY}bH{v7c`kI3(LOG;QSI%#4vat%gqUa^D-?&fR;&1&<~<0V8h)=7db`=JS8$a;IDX delta 10225 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\n" "Language-Team: support@openslides.de\n" @@ -185,7 +185,7 @@ msgstr "Abbrechen" #: agenda/templates/agenda/edit.html:27 #: assignment/templates/assignment/edit.html:29 #: assignment/templates/assignment/poll_view.html:69 -#: assignment/templates/assignment/view.html:83 +#: assignment/templates/assignment/view.html:92 #: motion/templates/motion/edit.html:29 #: motion/templates/motion/poll_view.html:55 #: participant/templates/participant/edit.html:34 @@ -227,8 +227,8 @@ msgid "Do you want to save the changed order of agenda items?" msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" #: agenda/templates/agenda/overview.html:46 assignment/models.py:302 -#: assignment/views.py:577 assignment/templates/assignment/view.html:184 -#: assignment/templates/assignment/view.html:188 +#: assignment/views.py:577 assignment/templates/assignment/view.html:168 +#: assignment/templates/assignment/view.html:172 #: assignment/templates/projector/Assignment.html:78 #: assignment/templates/projector/Assignment.html:82 motion/models.py:574 #: motion/views.py:804 motion/views.py:855 @@ -239,7 +239,7 @@ msgid "Yes" msgstr "Ja" #: agenda/templates/agenda/overview.html:47 assignment/models.py:302 -#: assignment/views.py:578 assignment/templates/assignment/view.html:185 +#: assignment/views.py:578 assignment/templates/assignment/view.html:169 #: assignment/templates/projector/Assignment.html:79 motion/models.py:574 #: motion/views.py:804 motion/views.py:856 #: motion/templates/motion/view.html:80 @@ -299,7 +299,7 @@ msgid "Preview" msgstr "Vorschau" #: agenda/templates/agenda/widget.html:23 -#: assignment/templates/assignment/view.html:148 +#: assignment/templates/assignment/view.html:132 #: assignment/templates/assignment/widget.html:11 #: motion/templates/motion/widget.html:11 #: participant/templates/participant/group_widget.html:11 @@ -309,7 +309,7 @@ msgid "Delete" msgstr "Löschen" #: agenda/templates/agenda/widget.html:26 -#: assignment/templates/assignment/view.html:147 +#: assignment/templates/assignment/view.html:131 #: assignment/templates/assignment/widget.html:14 #: motion/templates/motion/widget.html:14 #: participant/templates/participant/group_widget.html:14 @@ -553,7 +553,8 @@ msgid "not elected" msgstr "nicht gewählt" #: assignment/views.py:298 assignment/views.py:481 -#: assignment/templates/assignment/overview.html:35 +#: assignment/templates/assignment/overview.html:39 +#: assignment/templates/assignment/view.html:48 msgid "elected" msgstr "gewählt" @@ -565,7 +566,7 @@ msgstr "Abstimmung wurde erfolgreich gelöscht." msgid "Assignment" msgstr "Wahl" -#: assignment/views.py:358 assignment/templates/assignment/overview.html:58 +#: assignment/views.py:358 assignment/templates/assignment/overview.html:59 #: assignment/templates/assignment/widget.html:23 msgid "No assignments available." msgstr "Keine Wahlen vorhanden." @@ -578,8 +579,8 @@ msgstr "Wahlen: %s" #: assignment/views.py:389 assignment/views.py:422 #: assignment/templates/assignment/overview.html:26 #: assignment/templates/assignment/poll_view.html:18 -#: assignment/templates/assignment/view.html:36 -#: assignment/templates/assignment/view.html:136 +#: assignment/templates/assignment/view.html:37 +#: assignment/templates/assignment/view.html:120 #: assignment/templates/projector/Assignment.html:38 #: assignment/templates/projector/Assignment.html:56 msgid "Candidates" @@ -594,8 +595,7 @@ msgstr "Abstimmungsergebnis" #: 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:130 -#: assignment/templates/assignment/view.html:139 +#: assignment/templates/assignment/view.html:123 #: assignment/templates/projector/Assignment.html:59 msgid "ballot" msgstr "Wahlgang" @@ -616,15 +616,15 @@ msgstr "" "E: %(ABSTAIN)s" #: assignment/views.py:454 assignment/templates/assignment/poll_view.html:35 -#: assignment/templates/assignment/view.html:203 +#: assignment/templates/assignment/view.html:187 #: assignment/templates/projector/Assignment.html:97 #: motion/templates/motion/poll_view.html:31 msgid "Invalid votes" msgstr "Ungültige Stimmen" #: assignment/views.py:461 assignment/templates/assignment/poll_view.html:45 -#: assignment/templates/assignment/view.html:220 -#: assignment/templates/assignment/view.html:225 +#: assignment/templates/assignment/view.html:203 +#: assignment/templates/assignment/view.html:208 #: assignment/templates/projector/Assignment.html:111 #: assignment/templates/projector/Assignment.html:117 motion/views.py:804 #: motion/templates/motion/poll_view.html:35 @@ -660,7 +660,7 @@ msgid_plural "%d available posts" msgstr[0] "%d verfügbare Posten" msgstr[1] "%d verfügbare Posten" -#: assignment/views.py:578 assignment/templates/assignment/view.html:186 +#: assignment/views.py:578 assignment/templates/assignment/view.html:170 #: assignment/templates/projector/Assignment.html:80 motion/views.py:804 #: motion/views.py:857 motion/templates/motion/view.html:81 #: motion/templates/projector/Motion.html:39 @@ -692,17 +692,17 @@ msgstr "Wahl anzeigen" #: assignment/templates/assignment/base_assignment.html:39 #: assignment/templates/assignment/edit.html:8 #: assignment/templates/assignment/edit.html:17 -#: assignment/templates/assignment/overview.html:49 +#: assignment/templates/assignment/overview.html:50 msgid "Edit election" msgstr "Wahl bearbeiten" #: assignment/templates/assignment/base_assignment.html:44 -#: assignment/templates/assignment/overview.html:50 +#: assignment/templates/assignment/overview.html:51 msgid "Delete election" msgstr "Wahl löschen" #: assignment/templates/assignment/base_assignment.html:50 -#: assignment/templates/assignment/overview.html:52 +#: assignment/templates/assignment/overview.html:53 msgid "Election as PDF" msgstr "Wahl als PDF" @@ -746,7 +746,7 @@ msgstr "Posten" msgid "candidates" msgstr "Kandidaten/innen" -#: assignment/templates/assignment/overview.html:44 +#: assignment/templates/assignment/overview.html:45 msgid "Activate election" msgstr "Wahl projizieren" @@ -779,84 +779,74 @@ msgstr "Stimmzettel als PDF" msgid "Change status" msgstr "Status ändern" -#: assignment/templates/assignment/view.html:43 -#: assignment/templates/assignment/view.html:99 -#: assignment/templates/assignment/view.html:113 +#: assignment/templates/assignment/view.html:44 +#: assignment/templates/assignment/view.html:106 msgid "Remove candidate" msgstr "Kandidate/in entfernen" -#: assignment/templates/assignment/view.html:48 +#: assignment/templates/assignment/view.html:51 +msgid "Mark candidate as not elected" +msgstr "Kandidat/in als nicht gewählt markieren" + +#: assignment/templates/assignment/view.html:57 #: assignment/templates/projector/Assignment.html:44 msgid "No candidates available." msgstr "Keine Kandidaten/innen vorhanden." -#: assignment/templates/assignment/view.html:60 +#: assignment/templates/assignment/view.html:69 msgid "Withdraw self candidature" msgstr "Eigene Kandidatur zurückziehen" -#: assignment/templates/assignment/view.html:66 +#: assignment/templates/assignment/view.html:75 msgid "Self candidature" msgstr "Selbst kandidieren" -#: assignment/templates/assignment/view.html:77 +#: assignment/templates/assignment/view.html:86 msgid "Add new participant" msgstr "Neue/n Teilnehmer/in hinzufügen" -#: assignment/templates/assignment/view.html:92 -msgid "Elected Candidates" -msgstr "Gewählte Kandidaten/innen" - -#: assignment/templates/assignment/view.html:104 -msgid "No elected candidates available." -msgstr "Keine gewählten Kandidaten/innen vorhanden." - -#: assignment/templates/assignment/view.html:109 +#: assignment/templates/assignment/view.html:102 msgid "Blocked Candidates" msgstr "Blockierte Kandidaten/innen" -#: assignment/templates/assignment/view.html:116 +#: assignment/templates/assignment/view.html:109 msgid "No blocked candidates available." msgstr "Keine blockierten Kandidaten/innen vorhanden." -#: assignment/templates/assignment/view.html:121 +#: assignment/templates/assignment/view.html:115 #: assignment/templates/projector/Assignment.html:52 msgid "Election results" msgstr "Wahlergebnisse" -#: assignment/templates/assignment/view.html:144 +#: assignment/templates/assignment/view.html:128 msgid "Publish/unpublish results" msgstr "Ergebnisse veröffentlichen/unveröffentlichen" -#: assignment/templates/assignment/view.html:156 -#: assignment/templates/assignment/view.html:244 +#: assignment/templates/assignment/view.html:140 +#: assignment/templates/assignment/view.html:224 msgid "New ballot" msgstr "Neuer Wahlgang" -#: assignment/templates/assignment/view.html:171 +#: assignment/templates/assignment/view.html:155 #: assignment/templates/projector/Assignment.html:69 msgid "Candidate is elected" msgstr "Kandidat/in ist gewählt" -#: assignment/templates/assignment/view.html:190 +#: assignment/templates/assignment/view.html:174 #: assignment/templates/projector/Assignment.html:84 msgid "was not a
candidate" msgstr "war kein Kandidat" -#: assignment/templates/assignment/view.html:208 +#: assignment/templates/assignment/view.html:192 #: assignment/templates/projector/Assignment.html:101 motion/views.py:804 #: motion/templates/motion/view.html:82 #: motion/templates/projector/Motion.html:40 msgid "Invalid" msgstr "Ungültig" -#: assignment/templates/assignment/view.html:239 -#: assignment/templates/projector/Assignment.html:128 -msgid "No ballots available." -msgstr "Keine Wahlgänge vorhanden." - -#: assignment/templates/projector/Assignment.html:126 -msgid "Vote results are not published yet." -msgstr "Wahlergebnisse sind noch nicht veröffentlicht." +#: assignment/templates/assignment/view.html:220 +msgid "No results available." +msgstr "Keine Ergebnisse vorhanden." #: config/forms.py:24 msgid "Event name" From 844b2892f1a01ac6755767c60125705fd9411152 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 19 Nov 2012 23:05:38 +0100 Subject: [PATCH 11/36] Updated translation for professional support footer. --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35272 -> 35509 bytes openslides/locale/de/LC_MESSAGES/django.po | 10 +++++++++- openslides/templates/base.html | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 44203093a1aa614dbe62356443fbc587cc9bd1ad..88587ffd0b15e7d890ddbbe6888b6aa6d460d1e6 100644 GIT binary patch delta 10300 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index a75818a6c..8b66578b2 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: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 22:57+0100\n" +"POT-Creation-Date: 2012-11-19 23:01+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -2291,6 +2291,14 @@ msgstr "Abmelden" msgid "Welcome" msgstr "Willkommen" +#: templates/base.html:79 +msgid "" +"Get professional " +"support for OpenSlides." +msgstr "" +"Nutzen Sie unseren professionellen " +"Support für OpenSlides." + #: utils/pdf.py:227 #, python-format msgid "As of: %s" diff --git a/openslides/templates/base.html b/openslides/templates/base.html index 2966c7c14..e6af09a28 100644 --- a/openslides/templates/base.html +++ b/openslides/templates/base.html @@ -76,7 +76,7 @@ {% endblock %} From 0fbb7dced326d909c625c59d61d0df0570f4a769 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 19 Nov 2012 23:30:09 +0100 Subject: [PATCH 12/36] Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35509 -> 35528 bytes openslides/locale/de/LC_MESSAGES/django.po | 10 +++++----- openslides/motion/views.py | 2 +- openslides/participant/api.py | 4 ++-- openslides/participant/forms.py | 4 ++-- openslides/participant/models.py | 8 ++++---- .../templates/participant/overview.html | 14 +++++++------- openslides/participant/tests.py | 2 +- openslides/participant/views.py | 16 ++++++++-------- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 88587ffd0b15e7d890ddbbe6888b6aa6d460d1e6..19262fae97466696415dad5df38b58c6ab7e9551 100644 GIT binary patch delta 9017 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 WLD95Hg-;cXE|^qM{@(1L1OEp)em6t_ delta 8996 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 8b66578b2..ff59ff9ff 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: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-19 23:01+0100\n" +"POT-Creation-Date: 2012-11-19 23:20+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -1762,8 +1762,8 @@ msgstr "Gast" #: participant/models.py:44 participant/templates/participant/overview.html:30 #: participant/templates/participant/overview.html:68 -msgid "Detail" -msgstr "Detail" +msgid "Structure level" +msgstr "Gliederungsebene" #: participant/models.py:45 msgid "Will be shown after the name." @@ -2296,8 +2296,8 @@ msgid "" "Get professional " "support for OpenSlides." msgstr "" -"Nutzen Sie unseren professionellen " -"Support für OpenSlides." +"Nutzen Sie unseren professionellen Support für OpenSlides." #: utils/pdf.py:227 #, python-format diff --git a/openslides/motion/views.py b/openslides/motion/views.py index 8f564d60f..f777ec7cf 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -615,7 +615,7 @@ def motion_import(request): user.last_name = last_name user.first_name = first_name user.username = gen_username(first_name, last_name) - user.detail = '' + user.structure_level = '' user.committee = '' user.gender = '' user.type = '' diff --git a/openslides/participant/api.py b/openslides/participant/api.py index 5f5bf2b0b..938eacca6 100644 --- a/openslides/participant/api.py +++ b/openslides/participant/api.py @@ -71,7 +71,7 @@ def import_users(csv_file): dialect=dialect)): if line_no: try: - (first_name, last_name, gender, detail, type, committee, comment) = line[:7] + (first_name, last_name, gender, structure_level, type, committee, comment) = line[:7] except ValueError: error_messages.append(_('Ignoring malformed line %d in import file.') % line_no + 1) continue @@ -80,7 +80,7 @@ def import_users(csv_file): user.first_name = first_name user.username = gen_username(first_name, last_name) user.gender = gender - user.detail = detail + user.structure_level = structure_level user.type = type user.committee = committee user.comment = comment diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py index a176e505d..da395680e 100644 --- a/openslides/participant/forms.py +++ b/openslides/participant/forms.py @@ -27,7 +27,7 @@ class UserCreateForm(forms.ModelForm, CssClassMixin): class Meta: model = User - fields = ('first_name', 'last_name', 'is_active', 'groups', 'detail', + fields = ('first_name', 'last_name', 'is_active', 'groups', 'structure_level', 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') @@ -35,7 +35,7 @@ class UserUpdateForm(UserCreateForm): class Meta: model = User fields = ('username', 'first_name', 'last_name', 'is_active', 'groups', - 'detail', 'gender', 'type', 'committee', 'about_me', 'comment', + 'structure_level', 'gender', 'type', 'committee', 'about_me', 'comment', 'default_password') diff --git a/openslides/participant/models.py b/openslides/participant/models.py index 6f90709f4..68d4034a3 100644 --- a/openslides/participant/models.py +++ b/openslides/participant/models.py @@ -40,8 +40,8 @@ class User(DjangoUser, PersonMixin, Person, SlideMixin): ) django_user = models.OneToOneField(DjangoUser, editable=False, parent_link=True) - detail = models.CharField( - max_length=100, blank=True, default='', verbose_name=_("Detail"), + structure_level = models.CharField( + max_length=100, blank=True, default='', verbose_name=_("Structure level"), help_text=_('Will be shown after the name.')) gender = models.CharField( max_length=50, choices=GENDER_CHOICES, blank=True, @@ -67,10 +67,10 @@ class User(DjangoUser, PersonMixin, Person, SlideMixin): return self.get_full_name() or self.username def get_name_suffix(self): - return self.detail + return self.structure_level def set_name_suffix(self, value): - self.detail = value + self.structure_level = value name_suffix = property(get_name_suffix, set_name_suffix) diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 4a9aa133b..f61afe04f 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -26,11 +26,11 @@ - + + {% for level in structure_levels %} + {% endfor %}