From ba28afdc49f566b7f0dc2098503b23f80d1b2195 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Sep 2011 18:11:05 +0200 Subject: [PATCH] Added icons to hide/show hidden agenda items. Some style changes. --- .../agenda/templates/agenda/overview.html | 17 ++++----- .../static/images/icons/layer-visible-off.png | Bin 0 -> 783 bytes .../static/images/icons/layer-visible-on.png | Bin 0 -> 838 bytes openslides/static/javascript/agenda.js | 8 ++-- openslides/static/styles/agenda.css | 35 ++++++++++++------ openslides/static/styles/base.css | 4 -- 6 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 openslides/static/images/icons/layer-visible-off.png create mode 100644 openslides/static/images/icons/layer-visible-on.png 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 0000000000000000000000000000000000000000..24277f6dea1913a153409028f33509d285ac89fa GIT binary patch literal 783 zcmV+q1MvKbP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0B*Vf0B*Vg*50uf00007bV*G`2iXY{ z02>=Ewir|Z00NImL_t(|+ND!ZNLq0m|30T<{zngiHO!T@!=N$U#Zk=7)-ExI-Mk3e z!9xte4r2`Qu!EE3wo8Oyw@Nddj5)N!vbqdg9)caF;79_?lBf18W6In2_gL@-ZI?bE z?~A8_hh zrYA!~L(dY4gc+Of5}|Mr{C@ujkx0}F7enTDyH_HS$TvWEymJ|w_{&1Ta% z9FBfc^He?$g+lL1Ef5HRfWkeg@$qpp#O@C=`k>fk5CZN5FGm7LUi*tJSKZ*=({Zm5SjSm?(OaE0D>c67^Z7rV1QNP zw064<8=IT3vb+o!9aL$WBh_d$FfuYiNP5x8kLh&!7f0ap`CxHz(TclLG)=SUE|~@r znT&hN<#MRk>)cVHxnM9D06lty2j@N~AQ$)pQ!r$+S(>OQ?e4N;V`E%H71vR#)kGQj zk(!XQn8aJse+3Y^Tn_U2{641e4)48<-@$F1D#jCrzP>)zY&LU=;CT~Ih)4BQDm98q zN)-G9Q&Us-F!P74R_o@$!GRKQp;IoGD`?)v?CflGW@e`C@p$0U_zlzSGG8;ai&Fpq N002ovPDHLkV1k_*Wv&1K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea53bd1c0b39c86e89eba3b2c32b5b4772bc19eb GIT binary patch literal 838 zcmV-M1G)T(P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0B*Vf0B*Vg*50uf00007bV*G`2iXY{ z023CQ-tOT500PEIL_t(|+NG0SNRwd{$N#Uct-Tw#IWsnC8nY&C?)Qq;m3uT`*41|PM7&QKeqPvI1pA~ zH~!$jb8(*kIsbDwI4Tqp;5ZHxMWL;&Et|*VT^0xgtlRB&+H5w~=kp;mGxPrfg@uL3 zi;Ii9mzS5XkpNB8P%4#>N~N~)@^Z^Tfkb!*kFv5dnk3FU9FFeE$w?i{vOcj`tjx*D zxk2Kg-EO}`KA#7`A&~@u_W-gEu`1T-bZ=T)TPHxMsj0zVXtmlB05lTNXf&q^3JS9S zvG};LvC$4fQc@E3p=2@{m6w-C4-E}%flyglSrLsyo^0>zr0__RP$Xi>Fzf5;>YjsO zG#abqa`|9KN5|K=K*IFJwY9awGcz;i#3?7Zj58W4%>IIB<{Ouuo<=F;a(9c>TC~2t z{?lMERP^@twj^#rSYKa1dF^F(4FyR2;*{mkpqKVNRt|F`b>Axui%) zuh(n(`ubdPBTY?BJq*LBs;jH8vMs^)z%C?9!eP^Z{SCqu8TGNKKWYw6v5827_7c?d^_% zfq_U|z+^Ikv~qK9ZjSOT_&J(mA-`}1ul#EmQ>u|FN&^${5CI7k3dR1$5Dtg0Ha9mv z0wLMua_z5dZF+jzL2TSA%vTF12B$co`ZgsxmH|5GLy??=IyW18dy)9SNf#WS&o?-o z&Zo&B%+AhYadB~Ze0=-`v&uv@D)HIfzz<<`#S8su0cXBzq$1H6LZJ}IZR`td^!NAc zHa9nY6b_-}y5VBOvj*+P)^?8HA4nm`^xNz8GDKvgtE=m^)oP7eEEXJ@KceF}5O#Zz Q)&Kwi07*qoM6N<$g3GCaPXGV_ literal 0 HcmV?d00001 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; }