From d569bb86440092d817799a09bdcd0de1dd657bbb Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 20 May 2014 12:03:24 +0200 Subject: [PATCH] Adapt classic skin to new calendars listing --- plugins/calendar/skins/classic/calendar.css | 151 ++++++++++++++---- .../skins/classic/images/calendars.gif | Bin 1928 -> 2734 bytes .../skins/classic/images/calendars.png | Bin 2103 -> 1872 bytes .../skins/classic/templates/calendar.html | 9 +- 4 files changed, 132 insertions(+), 28 deletions(-) diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css index 40350fa7..0f3ba5fc 100644 --- a/plugins/calendar/skins/classic/calendar.css +++ b/plugins/calendar/skins/classic/calendar.css @@ -105,6 +105,14 @@ pre { overflow: hidden; } +#calendars .boxlistcontent { + top: 43px; +} + +#calendars .listsearchbox { + padding: 2px 4px; +} + #calendarslist { list-style: none; margin: 0; @@ -122,54 +130,143 @@ pre { cursor: default; } -#calendarslist li label { +#calendars .treelist li { + margin: 0; + padding: 0; + position: relative; +} + +#calendars .treelist ul li:last-child { + border-bottom: 0; +} + +#calendars .treelist li div.folder, +#calendars .treelist li div.calendar { + position: relative; + height: 22px; +} + +#calendars .treelist li span.calname { display: block; -} - -#calendarslist li span.handle { + padding: 0px 30px 2px 2px; + position: absolute; + top: 4px; + left: 38px; + right: 40px; cursor: default; - background: url(images/calendars.png) 0 -2px no-repeat; + background: url(images/calendars.png) right 20px no-repeat; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +#calendars .treelist li div.virtual > span.calname { + color: #aaa; + left: 20px; +} + +#calendars .treelist.flat li span.calname { + left: 24px; + right: 22px; +} + +#calendars .treelist li span.handle { display: inline-block; - width: 20px; + position: absolute; + top: 5px; + right: 6px; + padding: 0; + width: 12px; + height: 12px; + border-radius: 3px; + font-size: 0.8em; } -#calendarslist li input { - margin-right: 5px; +#calendars .treelist li a.subscribed { + display: inline-block; + position: absolute; + top: 2px; + right: 22px; + height: 16px; + width: 16px; + padding: 0; + background: url(images/calendars.png) -100px 0 no-repeat; + overflow: hidden; + text-indent: -5000px; + cursor: pointer; } -#calendarslist li.selected { +#calendars .treelist div:hover > a.subscribed { + background-position: 0 -126px; +} + +#calendars .treelist div.subscribed a.subscribed { + background-position: 0 -144px; +} + +#calendars .treelist li input { + position: absolute; + top: 1px; + left: 18px; +} + +#calendars .treelist li div.treetoggle { + top: -1px; + left: 1px !important; +} + +#calendars .treelist ul li div.treetoggle { + left: 17px !important; +} + +#calendars .treelist ul ul li div.treetoggle { + left: 33px !important; +} + +#calendars .treelist.flat li input { + left: 4px; +} + +#calendars .treelist ul li div.folder, +#calendars .treelist ul li div.calendar { + margin-left: 16px; +} + +#calendars .treelist ul ul li div.folder, +#calendars .treelist ul ul li div.calendar { + margin-left: 32px; +} + +#calendars .treelist ul ul ul li div.folder, +#calendars .treelist ul ul ul li div.calendar { + margin-left: 48px; +} + +#calendars .treelist li.selected { background-color: #ccc; - border-bottom: 1px solid #bbb; } -#calendarslist li.selected span { +#calendars .treelist li.selected > span.calname { font-weight: bold; } -#calendarslist li.readonly span.handle { - background-position: 0 -20px; +#calendars .treelist div.readonly span.calname { + background-position: right -20px; } -#calendarslist li.other span.handle { - background-position: 0 -38px; -} - -#calendarslist li.other.readonly span.handle { - background-position: 0 -56px; -} - -#calendarslist li.shared span.handle { - background-position: 0 -74px; -} - -#calendarslist li.shared.readonly span.handle { - background-position: 0 -92px; +#calendars .treelist li.user > div > span.calname { + background-position: right -38px; } #calendarslist li.virtual span.calname { color: #666; } +#calendars .searchresults .boxtitle { + border-top: 1px solid #aaa; + margin-bottom: 0; +} + #calfeedurl, #caldavurl { width: 98%; diff --git a/plugins/calendar/skins/classic/images/calendars.gif b/plugins/calendar/skins/classic/images/calendars.gif index cf12ebdf8469fe1250f7e84a0a703d7a9e4f891c..c560e7429ab4cbb9a64e30c07473d8fbdec98773 100644 GIT binary patch literal 2734 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 IM6N<$f(o~pmH+?% literal 2103 zcmV-72*~$|P)isxY1v#Ygf@rmRMzv1JR# z-41@x9CfB~pn|v27^pe!$wwFY6|9w3EbGR1M#V;@K~+i>S}NuYwG}1%$8@B7Ez3Mo6T67n1~h2mPrPE zot@AnB+NK?A|pe}EU~uCMk=iIOS}Y{X;{D zjfugoZQGRI*@w=0WNY-TvUWT+qYwAcvvb2?%8d&nKEk& zzk@&oJd42P@!(EhAKtF3!}_&rrE(xm(ZJ1=eGy3GCu0soe*|u7kZdrZZ0}yY|MACC zIglr476SjXw#-Hha=-_=!14%9Au|Y+_Z>JOmDx4W1<@ZpZ>N>0raARe7tCZ>Q(FtI zR*RA?TcpM;RUbPx(-n44No_@rQ#qJ}K~YRjEgJ}f zoz_yeT7CMz*@RBAVYb`@=fQ(_z<+v_N7r3xX;!&Cc-HNO%4)+$$y)48O^|`7M~qhq z*eZ&QNZ+U2NkqE5#y60@<+$mOsJ!qDUiAD`>?$Jad{&k5Q@R%e2s2Nr1!jmu#uAZe z9aM0QN92DN22o;G=yZa^hC3cPl4Ty~v@uw!F<_OfSaM(@BHi4-AL*w~!B|)bBGP$c zLNSZrv4Yp$(ZN1KF?|E4traSb5>O_f>9uq4*sKc^X{h5pC>1<7P7dps8_^mkw7Mw> zG$_+VpHM{NU2X_T89zZF0!{SjOa$U%(};fMFaJ4pw10m2=9_i&MDX3cqOfY72=0!` z;PF#xJ|gjFn+4^S8>a_z3v!b+>S=u0WF|)(CaIsXhLy;;eOn^ZsW;x3*`2)aMdNeu zNjJ8pK`bjjd#23oav`yB0PmhZkEe5TuqG=D3Z+sa(Y!=T2SyZtBVMmZYnL(%~Cl^qlpkHLZpaB`YtpQx6)T%W)g%~gn1T~nbgW#H8tq#>A_NZz%NKYY%myp zGs$r$!_r7E?%oYIb-`#f;`)^<_}z&UGuxRD)<_<|9%3n&K%)Z#II+JNKUiVF*IkJ? z^y+!Z#``TE_%%{Dg?Z%UN&GM~Q!29@udq@7Y4GSF?8?f_CU1F|8tJ)b3She00y}l1 z$JBx6f4)(&S)a~@N2J;|1uivS#EtfLTyAQDDu2IZ^OE*&3lpiM-wtigPAD!nVp)1R z+S}Xk)|ca$PR&h~rjaru(vg2S9M8Fk%E9Sc&jjB7Y!G>?jj)=&!lO}R=yB+v&wL6; zkN>H6VAQgQImmjL9Bsd&S9D4no zhLA+!*X(&+mzKHVp#;6g;^6OO_Why0J@r>5dbKz08}sP2<@WV2LOP%~R3csCL(stb z;F%cFNZ*x4nu|zGBTdR=;c29hL<&bEg(6Z|8Yw^|x6?U8q}~9L!qG?(B1MQ4(MbRI z=Sa(z>rs2|_b~N$!UZ=TPNIlt?{f+cJ*C*`O2Acah0np^R=2y#6LjpuG}4vP3+P|c z2P_exQmLR;tD%%B34cmVOpQCgYH4Z+sgVXJ1|?&=%?_8{1?Q9#FRXe2AC`WI_&BYK z?c{r1n5B`*tE(YWtx~SU=8VmV)5PKNq{lI4A45%Z4Wum~1fOL2iNwB7G3eb|w`1E<^Q8|^N*kVG2F6$^g+vs}IY zkpzX8y5}Sc*`{o8+MSpjm~eHy+kI_b9uQ1ok&Y4=P)gI3$UYRoW;t+mVVM5TgmS>9 zN#_Ue{M3qQq{unaLgz>gH^*_}x5c4}v~f8urNnXRb7`c{Daa-3QozM>^AbsZ%YygE z1`%`gO!K;=RojsAqav6lRM@cfdHmDT3fcEKiAXZG=4c7L@5 zMuJ}>Iqi02_;nH^l3Xo^LN1RGDMF-$6N_L`8i_d=kjd^}Bl(Z^?n@&XY4u7D7+vm1 zBYnYmuo#W>6q`Xd28+^22pq!rHBwk}AAGVs`y44$dg=N>w2rqUOZVixlWok>NTJeI za~pDUv(eJjBH38BLFcg*!_diEBnRx2 znh}Y8WX_dN<-aOjH=Qnm*=xZ=PAyW7PoJ|Es&-2b2(G>1oNSM7l&^MO;