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/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index e6f75636b..3a656f47c 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -25,6 +25,10 @@ table#menu-overview { table#agendatime { float: right; - width: 15%; + width: 25%; margin-bottom: 1em; -} \ No newline at end of file +} + +table#agendatime td { + padding: 5px; +} diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index 3d644543e..a7943b6cf 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -20,7 +20,7 @@ {% 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 %} 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 c367970c0..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 c00022f33..a7bad35bd 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-31 20:14+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