diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index f7317404d..93160c1f6 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -97,9 +97,10 @@ {% if perms.agenda.can_manage_agenda %} {% endif %} - -
+ + + {% for item in items %} @@ -161,21 +162,21 @@ {% endif %} {% endif %} - + {% if perms.agenda.can_manage_agenda %} - -
+
{% if item.children.exists %} {% endif %} {% endif %} +
{% if perms.agenda.can_manage_agenda %} @@ -233,16 +234,17 @@ Text {% endifequal %} - + -
+
{% if item.children.exists %} {% endif %} +
{% with form=item.weight_form %} diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index f8cf678ba..a6475d2ed 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -64,7 +64,8 @@ {% if user.last_login > user.date_joined %} {{ user.last_login }} {% endif %} - + + {% if user.is_active %} @@ -76,6 +77,7 @@ {% else %} {% endif %} + {% endif %} diff --git a/openslides/static/javascript/agenda.js b/openslides/static/javascript/agenda.js index f996f6560..5201ae5c7 100644 --- a/openslides/static/javascript/agenda.js +++ b/openslides/static/javascript/agenda.js @@ -63,7 +63,7 @@ $(function() { }); }); // hide closed items - $('#action_field div').after($('
').click(function () { + $('#action_field span').after($('').click(function () { if ($.cookie('Slide.HideClosed') == 1) { $.cookie('Slide.HideClosed', 0); hideClosedSlides(false); diff --git a/openslides/static/styles/agenda.css b/openslides/static/styles/agenda.css index b5d5b21a6..d176a52ab 100644 --- a/openslides/static/styles/agenda.css +++ b/openslides/static/styles/agenda.css @@ -13,7 +13,7 @@ tr.inactiveline a.activate_link div { height: 16px; } -a.close_link.closed div { +a.close_link.closed span { background-image: url(/static/images/icons/user-offline.png); background-repeat: no-repeat; background-position: center; @@ -21,7 +21,7 @@ a.close_link.closed div { height: 16px; display: inline-block; } -a.close_link.open div { +a.close_link.open span { background-image: url(/static/images/icons/user-online.png); background-repeat: no-repeat; background-position: center; @@ -30,7 +30,7 @@ a.close_link.open div { display: inline-block; } -a.hidelink.hide div { +a.hidelink.hide span { background-image: url(/static/images/icons/layer-visible-off.png); background-repeat: no-repeat; background-position: center; @@ -38,7 +38,7 @@ a.hidelink.hide div { height: 16px; display: inline-block; } -a.hidelink.show div { +a.hidelink.show span { background-image: url(/static/images/icons/layer-visible-on.png); background-repeat: no-repeat; background-position: center;