diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index 7da0a4dc0..8b2c72d1e 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -25,9 +25,6 @@ - {% if item.children.exists %} - - {% endif %} {% endif %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 39406063e..3974b638a 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -60,7 +60,7 @@ {% endif %} - {{overview}} + {% trans "Agenda" %} ({{ items|length }} {% trans "items" %}) diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index 0e2a00570..612cbe015 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -78,15 +78,24 @@ {% if slide.model_slide %} {% else %} - + {% endif %} {% endfor %} diff --git a/openslides/projector/urls.py b/openslides/projector/urls.py index 62a421433..0138ede2a 100644 --- a/openslides/projector/urls.py +++ b/openslides/projector/urls.py @@ -33,6 +33,12 @@ urlpatterns = patterns('projector.views', name='projector_activate_slide', ), + url(r'^activate/(?P[^/]*)/summary/$', + ActivateView.as_view(), + {'summary': True}, + name='projector_activate_summary', + ), + url(r'^edit/(?P\d+)/$', ItemUpdate.as_view(), name='projector_edit_slide', diff --git a/openslides/static/javascript/projector-control.js b/openslides/static/javascript/projector-control.js index dec11f7f9..3673f37e1 100644 --- a/openslides/static/javascript/projector-control.js +++ b/openslides/static/javascript/projector-control.js @@ -10,6 +10,7 @@ $(function() { data: '', success: function(data) { $('.activate_link').removeClass('active'); + $('li').removeClass('activeline'); link.addClass('active'); }, error: function () { diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 0792b9973..c8f128cb3 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -230,7 +230,7 @@ table a.table_edit { .agendatable td.dragcell { padding: 0px 0 0px 10px; } -.agendatable tr.activeline td { +.agendatable tr.activeline td, .activeline { background-color: #bed4de; } .agendatable td img.center { diff --git a/openslides/static/styles/projector-control.css b/openslides/static/styles/projector-control.css index ece41be46..44f6cf613 100644 --- a/openslides/static/styles/projector-control.css +++ b/openslides/static/styles/projector-control.css @@ -23,6 +23,9 @@ padding: 0.4em; overflow: hidden; } +.portlet-content li{ + padding: 4px 0; +} .ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; @@ -69,7 +72,10 @@ a.activate_link div { float: left; width: 16px; height: 16px; - padding-right: 10px; + padding-right: 16px; + position: relative; + top: 4px; + left: 4px; } a.activate_link.active div { background-image: url(/static/images/icons/task-accepted.png);