diff --git a/openslides/agenda/static/javascript/agenda.js b/openslides/agenda/static/javascript/agenda.js index 8e4f5ef3e..2486c0668 100644 --- a/openslides/agenda/static/javascript/agenda.js +++ b/openslides/agenda/static/javascript/agenda.js @@ -4,7 +4,7 @@ * :copyright: 2011, 2012 by OpenSlides team, see AUTHORS. * :license: GNU GPL, see LICENSE for more details. */ - + function hideLine(object) { if (object == []) { return; @@ -18,7 +18,7 @@ function hideLine(object) { function hideClosedSlides(hide) { if (hide) { - $('#hidelink').attr('title','show'); + $('#hidelink').attr('title', 'show'); $('#hidelink').removeClass('hide').addClass('show'); $('.close_link.closed').parent().parent().each(function() { hideLine($(this)); @@ -60,7 +60,7 @@ $(function() { $.cookie('Slide.HideClosed', 0); hideClosedSlides(false); $('#hide_closed_items').attr('checked', false); - } + } else { // hide closed items $.cookie('Slide.HideClosed', 1); hideClosedSlides(true); diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index 71c9f065b..4928b6a97 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -6,7 +6,7 @@ */ /* agenda item open/closed */ -a.close_link span { +.close_link span { background-image: url(../images/icons/done-grey.png); background-repeat: no-repeat; background-position: center; @@ -14,7 +14,8 @@ a.close_link span { height: 16px; display: inline-block; } -a.close_link.closed span { + +.close_link.closed span { background-image: url(../images/icons/done.png); } diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index caff874e9..ca352c45f 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -3,13 +3,15 @@ {% load tags %} - {% if perms.agenda.can_manage_agenda %} - - - - {% elif item.closed %} + + {% if perms.agenda.can_manage_agenda %} + + + + {% elif item.closed %} - {% endif %} + {% endif %} + {% for p in item.get_ancestors %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 82f4355d5..216c2dcd6 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -10,13 +10,13 @@ {% block header %} + + {% if perms.agenda.can_manage_agenda %} - + - - + {% endif %} {% endblock %} @@ -93,8 +93,7 @@ {% if items %} {% for item in items %} - + {% include "agenda/item_row.html" %} {% endfor %}