diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index a530e92b6..b813b3305 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -51,7 +51,7 @@ {% trans "Beamer" %} {% trans "Item" %} {% if perms.agenda.can_manage_agenda %} - {% trans "Item Type" %} + {% trans "Type" %} {% endif %} {% if perms.agenda.can_manage_agenda %}{% trans "Actions" %}{% endif %} {% if perms.agenda.can_manage_agenda %} @@ -59,9 +59,7 @@ {% endif %} - +
@@ -70,7 +68,10 @@ {% if perms.agenda.can_manage_agenda %} {% endif %} - + +
+ + {% for item in items %} {% if not item.hidden or perms.agenda.can_manage_agenda %} @@ -81,11 +82,9 @@ {% if perms.agenda.can_manage_aenda %} inactiveline{% endif %} {% endif %}"> - + -
+
diff --git a/openslides/static/images/icons/layer-visible-off.png b/openslides/static/images/icons/layer-visible-off.png new file mode 100644 index 000000000..24277f6de Binary files /dev/null and b/openslides/static/images/icons/layer-visible-off.png differ diff --git a/openslides/static/images/icons/layer-visible-on.png b/openslides/static/images/icons/layer-visible-on.png new file mode 100644 index 000000000..ea53bd1c0 Binary files /dev/null and b/openslides/static/images/icons/layer-visible-on.png differ diff --git a/openslides/static/javascript/agenda.js b/openslides/static/javascript/agenda.js index b55c91f33..2c7036298 100644 --- a/openslides/static/javascript/agenda.js +++ b/openslides/static/javascript/agenda.js @@ -36,7 +36,8 @@ function hideLine(object) { function hideClosedSlides(hide) { if (hide) { - $('#hidelink').text('show'); + $('#hidelink').attr('title','show'); + $('#hidelink').removeClass('hide').addClass('show'); $('.close_link.closed').parent().parent().each(function() { hideLine($(this)); }); @@ -44,7 +45,8 @@ function hideClosedSlides(hide) { $('#hiddencount').text(' ' + hidden + ' davon verborgen.'); } else { $('#menu-overview tr').show(); - $('#hidelink').text('hide'); + $('#hidelink').attr('title','hide'); + $('#hidelink').removeClass('show').addClass('hide'); $('#hiddencount').text(''); } return false; @@ -87,7 +89,7 @@ $(function() { }); }); // hide closed items - $('#action_field a').after($('hide').click(function () { + $('#action_field div').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 57bb3227a..d2552c076 100644 --- a/openslides/static/styles/agenda.css +++ b/openslides/static/styles/agenda.css @@ -2,35 +2,48 @@ tr.activeline a.activate_link div { background-image: url(/static/images/icons/task-accepted.png); background-repeat: no-repeat; background-position: center; - width: 20px; - height: 20px; + width: 16px; + height: 16px; } - tr.inactiveline a.activate_link div { background-image: url(/static/images/icons/task-accepted-grey.png); background-repeat: no-repeat; background-position: center; - width: 20px; - height: 20px; + width: 16px; + height: 16px; } - a.close_link.closed div { background-image: url(/static/images/icons/user-offline.png); background-repeat: no-repeat; background-position: center; - width: 20px; - height: 20px; + width: 16px; + height: 16px; display: inline-block; } - a.close_link.open div { background-image: url(/static/images/icons/user-online.png); background-repeat: no-repeat; background-position: center; - width: 20px; - height: 20px; + width: 16px; + height: 16px; display: inline-block; } +a.hidelink.hide div { + background-image: url(/static/images/icons/layer-visible-off.png); + background-repeat: no-repeat; + background-position: center; + width: 16px; + height: 16px; + display: inline-block; +} +a.hidelink.show div { + background-image: url(/static/images/icons/layer-visible-on.png); + background-repeat: no-repeat; + background-position: center; + width: 16px; + height: 16px; + display: inline-block; +} diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index d5e3f3540..60bf59207 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -230,10 +230,6 @@ table a.table_edit { .agendatable tr.activeline td { background-color: #bed4de; } -.agendatable td.select:hover { - cursor:pointer; - background-color: #bed4de; -} .agendatable td img.center { margin-left: 10px; }