diff --git a/openslides/agenda/forms.py b/openslides/agenda/forms.py
index 68983a09f..f87bf1d47 100644
--- a/openslides/agenda/forms.py
+++ b/openslides/agenda/forms.py
@@ -63,8 +63,8 @@ class ItemOrderForm(forms.Form, CssClassMixin):
class ConfigForm(forms.Form, CssClassMixin):
agenda_start_event_time = forms.TimeField(
- widget=forms.TimeInput(format='%H:%M') ,
- input_formats=('%H:%M', '%H:%M:%S'),
+ widget=forms.TimeInput(format='%H:%M'),
+ input_formats=['%H:%M'],
required=False,
label=_("Begin of event (hh:mm)"),
)
diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index 288bf1676..525015178 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -181,7 +181,7 @@ class Item(MPTTModel, SlideMixin):
permissions = (
('can_see_agenda', ugettext_noop("Can see agenda")),
('can_manage_agenda', ugettext_noop("Can manage agenda")),
- ('can_see_orga_items', ugettext_noop("Can see orga items")),
+ ('can_see_orga_items', ugettext_noop("Can see orga items and time scheduling of agenda")),
)
class MPTTMeta:
diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index e6f75636b..b875f9976 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -25,6 +25,9 @@ table#menu-overview {
table#agendatime {
float: right;
- width: 15%;
+ width: 25%;
margin-bottom: 1em;
+}
+table#agendatime td {
+ padding: 5px;
}
\ No newline at end of file
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index 89c41aa92..208e66bbf 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -20,17 +20,20 @@
{% if perms.agenda.can_manage_agenda %}
{% endif %}
- {{ item }}
+ {% if item.type == "org" %}[{% endif %}{{ item }}{% if item.type == "org" %}]{% endif %}
{{ item.get_title_supplement|safe }}
{% if perms.agenda.can_manage_agenda %}
{{ item.comment|first_line }}
|
+ {% endif %}
+ {% if perms.agenda.can_see_orga_items %}
- {{ item.duration|time:"H:i" }}
+ {% if item.duration %}
+ {{ item.duration|time:"H:i" }}h
+ {% endif %}
|
-
{% 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 110f0e1f7..d815605ff 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -49,17 +49,20 @@
{% endif %}
- {% trans "Agenda" %}
-
+ {% trans "Agenda" %}
+ {% if perms.agenda.can_see_orga_items %}
+
- {% trans "Start of event" %} |
+ {% trans "Start of event" %}: |
{{ start|time:"H:i" }} |
- {% trans "Estimated end" %} |
+ {% trans "Estimated end" %}: |
{{ end|time:"H:i" }} |
-
+
+ {% endif %}
+
{% trans "Filter" %}:
{% trans "Hide closed items" %}
@@ -73,7 +76,7 @@
{% if perms.agenda.can_manage_agenda %}
| {% trans "Comment" %} |
{% endif %}
- {% if perms.agenda.can_manage_agenda %}
+ {% if perms.agenda.can_see_orga_items %}
{% trans "Duration" %} |
{% endif %}
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
@@ -90,7 +93,9 @@
{% if perms.agenda.can_manage_agenda %}
|
- {{ duration|time:"H:i" }} |
+ {% endif %}
+ {% if perms.agenda.can_see_orga_items %}
+ {{duration|time:"H:i"}}h |
{% endif %}
{% if perms.agenda.can_manage_agenda or perms.projector.can_manage_projector %}
diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html
index b1dc4bdd2..e1b8644a7 100644
--- a/openslides/agenda/templates/agenda/widget.html
+++ b/openslides/agenda/templates/agenda/widget.html
@@ -39,7 +39,7 @@
{% for p in item.get_ancestors %}
{% endfor %}
- {{ item }}
+ {% if item.type == "org" %}[{% endif %}{{ item }}{% if item.type == "org" %}]{% endif %}
{{ item.get_title_supplement|safe }}
{% empty %}
diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo
index 55f3077b4..fe5e93edf 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 5377c58f9..5e6a6c3b1 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: 2013-01-30 17:20+0100\n"
+"POT-Creation-Date: 2013-01-30 21:40+0100\n"
"PO-Revision-Date: 2012-07-28 11:07+0200\n"
"Last-Translator: Emanuel Schuetze \n"
"Language-Team: support@openslides.de\n"
@@ -33,9 +33,13 @@ msgstr "Französisch"
msgid "Parent item"
msgstr "Elternelement"
-#: agenda/forms.py:64
+#: agenda/forms.py:34 agenda/models.py:49
+msgid "Duration (hh:mm)"
+msgstr "Dauer (hh:mm)"
+
+#: agenda/forms.py:69
msgid "Begin of event (hh:mm)"
-msgstr "Beginn der Veranstaltung (ss:mm)"
+msgstr "Beginn der Veranstaltung (hh:mm)"
#: agenda/models.py:35
msgid "Agenda item"
@@ -56,7 +60,7 @@ msgstr "Titel"
msgid "Text"
msgstr "Text"
-#: agenda/models.py:41 agenda/templates/agenda/overview.html:74
+#: agenda/models.py:41 agenda/templates/agenda/overview.html:77
#: agenda/templates/agenda/view.html:13 participant/models.py:60
#: participant/templates/participant/overview.html:72
#: participant/templates/participant/user_detail.html:45
@@ -67,7 +71,7 @@ msgstr "Kommentar"
msgid "Closed"
msgstr "Abgeschlossen"
-#: agenda/models.py:43 agenda/templates/agenda/overview.html:83
+#: agenda/models.py:43 agenda/templates/agenda/overview.html:86
#: projector/models.py:31
msgid "Weight"
msgstr "Gewichtung"
@@ -79,10 +83,6 @@ msgstr "Gewichtung"
msgid "Type"
msgstr "Typ"
-#: agenda/models.py:49
-msgid "Duration (hh:mm)"
-msgstr "Dauer (ss:mm)"
-
#: agenda/models.py:182
msgid "Can see agenda"
msgstr "Darf die Tagesordnung sehen"
@@ -92,15 +92,15 @@ msgid "Can manage agenda"
msgstr "Darf die Tagesordung verwalten"
#: agenda/models.py:184
-msgid "Can see orga items"
-msgstr "Darf Organisationspunkte sehen"
+msgid "Can see orga items and time scheduling of agenda"
+msgstr "Darf Organisationspunkte und Tagesordnung-Zeitplan sehen"
#: agenda/models.py:194 agenda/slides.py:20 agenda/views.py:219
#: agenda/views.py:220 agenda/views.py:257 agenda/views.py:271
#: agenda/templates/agenda/base_agenda.html:10
#: agenda/templates/agenda/overview.html:8
#: agenda/templates/agenda/overview.html:52
-#: agenda/templates/agenda/overview.html:89
+#: agenda/templates/agenda/overview.html:92
#: agenda/templates/projector/AgendaSummary.html:6
#: agenda/templates/projector/AgendaSummary.html:10
msgid "Agenda"
@@ -161,12 +161,12 @@ msgstr "Eintrag anzeigen"
#: 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:44
+#: agenda/templates/agenda/item_row.html:47
msgid "Edit item"
msgstr "Eintrag bearbeiten"
#: agenda/templates/agenda/base_agenda.html:33
-#: agenda/templates/agenda/item_row.html:45
+#: agenda/templates/agenda/item_row.html:48
msgid "Delete item"
msgstr "Eintrag löschen"
@@ -243,12 +243,12 @@ msgstr "Eintrag als erledigt markieren"
msgid "Item closed"
msgstr "Eintrag erledigt"
-#: agenda/templates/agenda/item_row.html:39
-#: agenda/templates/agenda/overview.html:99
+#: agenda/templates/agenda/item_row.html:42
+#: agenda/templates/agenda/overview.html:104
msgid "Activate item"
msgstr "Eintrag projizieren"
-#: agenda/templates/agenda/item_row.html:48
+#: agenda/templates/agenda/item_row.html:51
#: agenda/templates/agenda/widget.html:35
msgid "Activate summary for this item"
msgstr "Zusammenfassung für diesen Eintrag projizieren"
@@ -279,44 +279,44 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: agenda/templates/agenda/overview.html:55
+#: agenda/templates/agenda/overview.html:56
msgid "Start of event"
msgstr "Beginn der Veranstaltung"
-#: agenda/templates/agenda/overview.html:59
+#: agenda/templates/agenda/overview.html:60
msgid "Estimated end"
msgstr "Voraussichtliches Ende"
-#: agenda/templates/agenda/overview.html:64
+#: agenda/templates/agenda/overview.html:67
#: assignment/templates/assignment/overview.html:12
#: motion/templates/motion/overview.html:12
#: participant/templates/participant/overview.html:22
msgid "Filter"
msgstr "Filter"
-#: agenda/templates/agenda/overview.html:65
+#: agenda/templates/agenda/overview.html:68
msgid "Hide closed items"
msgstr "Verstecke abgeschlossene Einträge"
-#: agenda/templates/agenda/overview.html:68
+#: agenda/templates/agenda/overview.html:71
msgid "item"
msgid_plural "items"
msgstr[0] "Eintrag"
msgstr[1] "Einträge"
-#: agenda/templates/agenda/overview.html:71
+#: agenda/templates/agenda/overview.html:74
msgid "Done"
msgstr "Erledigt"
-#: agenda/templates/agenda/overview.html:72
+#: agenda/templates/agenda/overview.html:75
msgid "Item"
msgstr "Eintrag"
-#: agenda/templates/agenda/overview.html:77
+#: agenda/templates/agenda/overview.html:80
msgid "Duration"
msgstr "Dauer"
-#: agenda/templates/agenda/overview.html:80
+#: agenda/templates/agenda/overview.html:83
#: assignment/templates/assignment/overview.html:28
#: motion/templates/motion/overview.html:43
#: participant/templates/participant/group_overview.html:14
@@ -324,7 +324,7 @@ msgstr "Dauer"
msgid "Actions"
msgstr "Aktionen"
-#: agenda/templates/agenda/overview.html:115
+#: agenda/templates/agenda/overview.html:120
#: agenda/templates/agenda/widget.html:46
#: projector/templates/projector/custom_slide_widget.html:36
msgid "No items available."
@@ -2421,11 +2421,3 @@ msgstr "undefinierter-dateiname"
msgid "Enter valid JSON"
msgstr "Gebe valides JSON ein"
-#~ msgid "Visible to all"
-#~ msgstr "Für alle sichtbar"
-
-#~ msgid "Moderators only"
-#~ msgstr "Nur für Moderatoren"
-
-#~ msgid "Visibility"
-#~ msgstr "Sichtbarkeit"
diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index 6cbc8b5bf..31fa40882 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -318,6 +318,7 @@ input[type="submit"], input[type="button"] {
}
#id_permissions, #id_users {
height: 310px;
+ width: 412px;
}
.button {
border: 1px solid #D3D3D3;
|