From 114b719cadd63f853491af65456813b3e19a411c Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 14 May 2012 21:55:36 +0200 Subject: [PATCH] Added comment column in agenda overview. --- .../agenda/templates/agenda/item_row.html | 9 +++ .../agenda/templates/agenda/overview.html | 2 + openslides/locale/de/LC_MESSAGES/django.mo | Bin 31762 -> 31750 bytes openslides/locale/de/LC_MESSAGES/django.po | 52 +++++++++--------- 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index eebe20c86..2a4ca93c7 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -17,8 +17,17 @@ {% if perms.agenda.can_manage_agenda %}
{% endif %} + {% if item.text %} {{ item }} + {% else %} + {{ item }} + {% endif %} + {% if perms.agenda.can_manage_agenda %} + + {{ item.comment }} + + {% endif %} {% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index dc4b436a3..617c2a870 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -62,6 +62,7 @@ {% trans "Done" %} {% trans "Item" %} {% if perms.agenda.can_manage_agenda %} + {% trans "Comment" %} {% trans "Actions" %} {% trans "Weight" %} {% endif %} @@ -74,6 +75,7 @@ {% if perms.agenda.can_manage_agenda %} + {% endif %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index d038dacd24d6d11f603d12a765aae24056a87149..1d6b8a8281a317ef8f96b98c344b4114453b4858 100644 GIT binary patch delta 3419 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 L;Kt#3hf@9r&^yAF diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 5a91de8b1..62b6b8db2 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-04-30 08:04+0200\n" +"POT-Creation-Date: 2012-05-14 10:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -92,10 +92,10 @@ msgid "Item %s was successfully deleted." msgstr "Eintrag %s wurde erfolgreich gelöscht." #: agenda/views.py:156 agenda/views.py:158 -#: agenda/templates/agenda/overview.html:46 application/models.py:531 +#: agenda/templates/agenda/overview.html:46 application/models.py:530 #: application/views.py:472 application/views.py:764 application/views.py:814 #: application/templates/application/view.html:79 -#: application/templates/projector/Application.html:33 +#: application/templates/projector/Application.html:37 #: assignment/templates/assignment/view.html:164 #: assignment/templates/assignment/view.html:168 #: assignment/templates/projector/Assignment.html:74 @@ -105,10 +105,10 @@ msgid "Yes" msgstr "Ja" #: agenda/views.py:156 agenda/views.py:158 -#: agenda/templates/agenda/overview.html:47 application/models.py:531 +#: agenda/templates/agenda/overview.html:47 application/models.py:530 #: application/views.py:472 application/views.py:764 application/views.py:815 #: application/templates/application/view.html:80 -#: application/templates/projector/Application.html:34 +#: application/templates/projector/Application.html:38 #: assignment/templates/assignment/view.html:165 #: assignment/templates/projector/Assignment.html:75 utils/utils.py:39 #: utils/views.py:215 @@ -272,7 +272,7 @@ msgstr "Tagesordnungseintrag bearbeiten" #: application/forms.py:42 application/views.py:782 #: application/templates/application/view.html:226 #: application/templates/application/view.html:246 -#: application/templates/projector/Application.html:69 +#: application/templates/projector/Application.html:77 msgid "Reason" msgstr "Begründung" @@ -287,7 +287,7 @@ msgstr "Triviale Änderungen erzeugen keine neue Version." #: application/forms.py:48 application/models.py:54 application/views.py:710 #: application/templates/application/overview.html:41 #: application/templates/application/view.html:18 -#: application/templates/projector/Application.html:22 +#: application/templates/projector/Application.html:55 msgid "Submitter" msgstr "Antragsteller/in" @@ -448,35 +448,35 @@ msgstr "Version %s nicht zugelassen" msgid "Status modified" msgstr "Status geändert" -#: application/models.py:407 +#: application/models.py:406 msgid "by" msgstr "von" -#: application/models.py:440 +#: application/models.py:439 msgid "Poll created" msgstr "Abstimmung erstellt" -#: application/models.py:488 +#: application/models.py:487 msgid "Can see application" msgstr "Darf Anträge sehen" -#: application/models.py:489 +#: application/models.py:488 msgid "Can create application" msgstr "Darf Anträge erstellen" -#: application/models.py:490 +#: application/models.py:489 msgid "Can support application" msgstr "Darf Anträge unterstützen" -#: application/models.py:491 +#: application/models.py:490 msgid "Can manage application" msgstr "Darf Anträge verwalten" -#: application/models.py:531 +#: application/models.py:530 msgid "Abstain" msgstr "Enthaltung" -#: application/models.py:564 application/views.py:667 application/views.py:873 +#: application/models.py:563 application/views.py:667 application/views.py:873 #: application/templates/application/base_application.html:9 #: application/templates/application/overview.html:7 #: application/templates/application/overview.html:10 @@ -676,7 +676,7 @@ msgstr "" #: application/templates/application/view.html:7 #: application/templates/application/view.html:210 #: application/templates/projector/Application.html:7 -#: application/templates/projector/Application.html:57 +#: application/templates/projector/Application.html:65 msgid "Application" msgstr "Antrag" @@ -685,7 +685,7 @@ msgstr "Antrag" #: 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:55 +#: application/templates/projector/Application.html:63 msgid "Application No." msgstr "Antrag Nr." @@ -711,20 +711,20 @@ msgstr "Abstimmungsergebnis" #: 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 +#: application/templates/projector/Application.html:33 msgid "Vote" msgstr "Abstimmung" #: application/views.py:764 application/views.py:816 #: application/templates/application/view.html:81 -#: application/templates/projector/Application.html:35 +#: application/templates/projector/Application.html:39 #: assignment/templates/assignment/view.html:166 #: assignment/templates/projector/Assignment.html:76 msgid "Abstention" msgstr "Enthaltung" #: application/views.py:764 application/templates/application/view.html:82 -#: application/templates/projector/Application.html:36 +#: application/templates/projector/Application.html:40 #: assignment/templates/assignment/view.html:185 #: assignment/templates/projector/Assignment.html:95 msgid "Invalid" @@ -733,7 +733,7 @@ msgstr "Ungültig" #: application/views.py:764 #: application/templates/application/poll_view.html:33 #: application/templates/application/view.html:84 -#: application/templates/projector/Application.html:38 assignment/views.py:401 +#: application/templates/projector/Application.html:42 assignment/views.py:401 #: assignment/templates/assignment/poll_view.html:40 #: assignment/templates/assignment/view.html:193 #: assignment/templates/assignment/view.html:196 @@ -1002,7 +1002,7 @@ msgid "Reset" msgstr "Zurücksetzen" #: application/templates/application/view.html:210 -#: application/templates/projector/Application.html:57 +#: application/templates/projector/Application.html:65 msgid "no number" msgstr "ohne Nummer" @@ -1056,11 +1056,11 @@ msgstr "unverändert" msgid "Log" msgstr "Log" -#: application/templates/projector/Application.html:26 +#: application/templates/projector/Application.html:29 msgid "Poll result" msgstr "Abstimmungsergebnis" -#: application/templates/projector/Application.html:44 +#: application/templates/projector/Application.html:47 msgid "No poll results available." msgstr "Keine Abstimmungen vorhanden." @@ -1452,8 +1452,8 @@ msgid "" "Get professional support for OpenSlides on www.openslides.org." msgstr "" -"Professionelle Unterstützung für OpenSlides gibt es unter www.openslides.org." +"Professionelle Unterstützung für OpenSlides gibt es unter www.openslides.org." #: config/models.py:114 msgid "General"