diff --git a/openslides/agenda/signals.py b/openslides/agenda/signals.py index b4286aa27..843bb239e 100644 --- a/openslides/agenda/signals.py +++ b/openslides/agenda/signals.py @@ -51,15 +51,15 @@ def setup_agenda_config_page(sender, **kwargs): validators=[validate_start_time, ], widget=forms.DateTimeInput(format='%d.%m.%Y %H:%M'), required=False, - label=_('Begin of event'), - help_text=_('Input format: DD.MM.YYYY HH:MM'))) + label=ugettext_lazy('Begin of event'), + help_text=ugettext_lazy('Input format: DD.MM.YYYY HH:MM'))) agenda_show_last_speakers = ConfigVariable( name='agenda_show_last_speakers', default_value=1, form_field=forms.IntegerField( min_value=0, - label=_('Number of last speakers to be shown on the projector'))) + label=ugettext_lazy('Number of last speakers to be shown on the projector'))) extra_stylefiles = ['styles/timepicker.css', 'styles/jquery-ui/jquery-ui.custom.min.css'] extra_javascript = ['javascript/jquery-ui.custom.min.js', diff --git a/openslides/agenda/static/styles/agenda_sort.css b/openslides/agenda/static/styles/agenda_sort.css index 36d231b2f..fc2446b03 100644 --- a/openslides/agenda/static/styles/agenda_sort.css +++ b/openslides/agenda/static/styles/agenda_sort.css @@ -37,6 +37,9 @@ ol.agenda_list { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#ededed',GradientType=0 ); overflow: auto; } +.agenda_list li > div.activeline { + background: #bed4de !important; +} .agenda_list.sortable li > div { cursor: move; } @@ -52,13 +55,14 @@ ol.agenda_list { .agenda_list .openclose { width: 40px; float: left; min-height: 1px; } .agenda_list .duration { width: 92px; float: right; min-height: 1px; padding-left: 5px; } -.agenda_list .manage { width: 150px; float: right; min-height: 1px; padding-left: 5px; } +.agenda_list .manage { width: 200px; float: right; min-height: 1px; padding-left: 5px; } .agenda_list .title { float: left; } .agenda_list .optional { float: left; } -.agenda_list .opener_closer { float: left; margin-right: 10px; } +.agenda_list .opener_closer { float: left; margin-right: 10px; margin-left:-6px;} +.agenda_list .opener_closer .btn { padding: 0 2px; } .agenda_list .optional { float: right; width: 208px; padding-left: 8px;} -#menu-overview .manage { width: 150px; } +#menu-overview .manage { width: 200px; } #menu-overview .duration { width: 75px; } #menu-overview .optional { width: 200px; } diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index e8fb05dd4..ae973c19d 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -1,15 +1,15 @@ {% load i18n %} {% load tags %} -