From 7e408b8b18eead1cb4c54738ff0638f3faff8c9d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 21 Jul 2016 08:56:30 -0400 Subject: [PATCH] T1365: Localize Confidential/Private/Cancelled badge in event info dialog --- plugins/calendar/calendar_ui.js | 8 ++- plugins/calendar/skins/classic/calendar.css | 50 +++++++++++++---- plugins/calendar/skins/classic/iehacks.css | 8 --- .../skins/classic/images/badge_cancelled.png | Bin 1707 -> 0 bytes .../classic/images/badge_confidential.gif | Bin 1325 -> 0 bytes .../classic/images/badge_confidential.png | Bin 3441 -> 0 bytes .../skins/classic/images/badge_private.gif | Bin 1221 -> 0 bytes .../skins/classic/images/badge_private.png | Bin 3359 -> 0 bytes .../skins/classic/templates/calendar.html | 3 +- plugins/calendar/skins/larry/calendar.css | 53 +++++++++++++----- plugins/calendar/skins/larry/images/badge.png | Bin 0 -> 746 bytes .../skins/larry/images/badge_cancelled.png | Bin 924 -> 0 bytes .../skins/larry/images/badge_confidential.png | Bin 1522 -> 0 bytes .../skins/larry/images/badge_private.png | Bin 1346 -> 0 bytes .../skins/larry/templates/calendar.html | 1 + 15 files changed, 87 insertions(+), 36 deletions(-) delete mode 100644 plugins/calendar/skins/classic/images/badge_cancelled.png delete mode 100644 plugins/calendar/skins/classic/images/badge_confidential.gif delete mode 100644 plugins/calendar/skins/classic/images/badge_confidential.png delete mode 100644 plugins/calendar/skins/classic/images/badge_private.gif delete mode 100644 plugins/calendar/skins/classic/images/badge_private.png create mode 100644 plugins/calendar/skins/larry/images/badge.png delete mode 100644 plugins/calendar/skins/larry/images/badge_cancelled.png delete mode 100644 plugins/calendar/skins/larry/images/badge_confidential.png delete mode 100644 plugins/calendar/skins/larry/images/badge_private.png diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js index af4cec5a..ca567cdc 100644 --- a/plugins/calendar/calendar_ui.js +++ b/plugins/calendar/calendar_ui.js @@ -423,7 +423,7 @@ function rcube_calendar_ui(settings) if ($dialog.is(':ui-dialog')) $dialog.dialog('close'); - // remove status-* classes + // remove status-* and sensitivity-* classes $dialog.removeClass(function(i, oldclass) { var oldies = String(oldclass).split(' '); return $.grep(oldies, function(cls) { return cls.indexOf('status-') === 0 || cls.indexOf('sensitivity-') === 0 }).join(' '); @@ -471,11 +471,13 @@ function rcube_calendar_ui(settings) if (event.status) { var status_lc = String(event.status).toLowerCase(); - $('#event-status').show().children('.event-text').html(Q(rcmail.gettext('status-'+status_lc,'calendar'))); + $('#event-status').show().children('.event-text').text(rcmail.gettext('status-'+status_lc,'calendar')); + $('#event-status-badge > span').text(rcmail.gettext('status-'+status_lc,'calendar')); $dialog.addClass('status-'+status_lc); } if (event.sensitivity && event.sensitivity != 'public') { - $('#event-sensitivity').show().children('.event-text').html(Q(sensitivitylabels[event.sensitivity])); + $('#event-sensitivity').show().children('.event-text').text(sensitivitylabels[event.sensitivity]); + $('#event-status-badge > span').text(sensitivitylabels[event.sensitivity]); $dialog.addClass('sensitivity-'+event.sensitivity); } if (event.created || event.changed) { diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css index c511ff02..cff93c28 100644 --- a/plugins/calendar/skins/classic/calendar.css +++ b/plugins/calendar/skins/classic/calendar.css @@ -548,24 +548,54 @@ a.miniColors-trigger { margin: 0 -0.2em; } -#eventshow.status-cancelled { - background: url(images/badge_cancelled.png) top right no-repeat; +#event-status-badge { + width: 100px; + height: 100px; + position: absolute; + top: 0; + right: 0; + overflow: hidden; } -#eventshow.sensitivity-private { - background: url(images/badge_private.png) top right no-repeat; +#event-status-badge span { + display: none; + text-transform: uppercase; + width: 150px; + height: 20px; + line-height: 20px; + display: block; + position: absolute; + left: -20px; + top: 35px; + padding-left: 10px; + text-align: center; + font-weight: bold; + font-size: 12px; + color: #fff; + box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } -#eventshow.sensitivity-confidential { - background: url(images/badge_confidential.png) top right no-repeat; +#eventshow.status-cancelled #event-status-badge span { + background: url(images/badge.png) 26px -24px no-repeat #cc0000; } -.sensitivity-private #event-title { - margin-right: 50px; +#eventshow.sensitivity-private #event-status-badge span { + background: url(images/badge.png) 40px -52px no-repeat #0066ff; } -.sensitivity-confidential #event-title { - margin-right: 60px; +#eventshow.sensitivity-confidential #event-status-badge span { + background: url(images/badge.png) 20px 2px no-repeat #cc0000; +} + +#eventshow.status-cancelled #event-title, +#eventshow.sensitivity-private #event-title, +#eventshow.sensitivity-confidential #event-title { + margin-right: 80px; } #eventshow div.event-line { diff --git a/plugins/calendar/skins/classic/iehacks.css b/plugins/calendar/skins/classic/iehacks.css index 42bd7361..08ceaa48 100644 --- a/plugins/calendar/skins/classic/iehacks.css +++ b/plugins/calendar/skins/classic/iehacks.css @@ -44,14 +44,6 @@ html #calendartoolbar a.buttonPas { width: 102%; } -#eventshow.sensitivity-private { - background-image: url(images/badge_private.gif); -} - -#eventshow.sensitivity-confidential { - background-image: url(images/badge_confidential.gif); -} - .fc-day-content { cursor: default; } diff --git a/plugins/calendar/skins/classic/images/badge_cancelled.png b/plugins/calendar/skins/classic/images/badge_cancelled.png deleted file mode 100644 index b89029e0d760d673435e3e6acc5e48b5234c1f27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1707 zcmV;c22}ZpP)#HgRS`}9cby*M$f{F`E1l=ig8L*3P1Rq#i!AEy4UAlAYM%}om zHfi2BH;bo*+*ML?8kYh(H9A1>^)kegwz>lGTpr5lHbMqfd1N z3-28d*1rEP`1{6kBltD@cuXK|0;#`vI9UDW>maW27{>^tS&)YTavu_wGDe^72v)z1 zhu8$c7>;#6+w+h>as}Zsqi8nm{suG`oRshar#*AT^w>-b`_7%P}0A216hj zK&D_8|Kjt;*ZzDK z=LFIkNSdfWcPRLC@zVdQXT9f414$rl0%5WZ;-6bQzcffTT05rx5O;S$A!yGT|+QG1L)3IHL*Ra|Shi6;oFgZ*|fs68YH zkPiWJ4j>~)R#eo&vnWHbikNb)(&w?M+xSaB`We?Mar5;HBs+*DoXK_@L0kxHtQvt7 z1mcF9bbcL$bQ$|g(i{TG3B(f520|b?R)~dv3&kJ^=3b*L<2reAM#O#sI&CT3Dws7pfv#yQaGr@NA4DJ_5W{~*BGaTP_^q<{A=6 zHV`J>eGX!$wg%!t2&7FQyq84;R?2lOO{@yPB3w9u6ue});a3Ea2;_orX%k4nAbv&I zzT$##)90)0D*|Z|WDp=@NLF0@5hkA%Fo|R{tdFlY&iYpY7B|;0Kt2;l>mYveT@XvW zJBDb}I87Ev8$qIu5#j=ttE5U3NX{U)aJJPdgg|lx`4zWBnDn#|ZWRfnNsyBO83M>S zZ-c}{Jpv+W9QT&Exkdz%4W#bvA$*@SrtwTY223CYgZL1aajlY6X#yz-q!kE(cAoiW_LvYMo_zOI2Ryk22g&aT#!Ph7V z8@Cev0QNF|Oh_07f-n}|?23h8tcSmYD2$vyMgUUhy{L$o@%9kDw_{hFikZhU6*q@6 zUm(aLs^zBhdxflyxX%isV2~|;=n@cawFo0mkVgUX0FoFJ*KlP{00x(-q_Gytc7Y(x zhB93u5M?6 znot%?1fmR<2t?T{5r{HZA`oS*L?Fsoi9nRC5`idFw;7}ckQqSC2%}se%20_wl%4W` zyrayN2c%P3DG$g&Wu!bH_bMCZ0l8C|C=bZ4e*uFuXYT-qgL?n~002ovPDHLkV1np~ B_G|zE diff --git a/plugins/calendar/skins/classic/images/badge_confidential.gif b/plugins/calendar/skins/classic/images/badge_confidential.gif deleted file mode 100644 index ce6b2a064e70f9e10b20cb0fc3d2cfa1dcc9e2cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1325 zcmV+|1=9LQNk%w1VPpVg0K^{v_0Z7CrKIYzu+kF%#1a6%5&+5*0QmU$*ETHTf`In+ z_SGmE?4h639t`J_kNoiP!JV7cMLy$WUdtW~+hbqw!N9>C3*A&szMY)-;NatOZ^s-4 z)g1xX6afGK|NsC0A^8LW0018VEC2ui0Av7U000I5;3tlUU=?VpuIy?B$0*NqZQpoK zAHmuFEkc3tis_EXB=Ugq0iP*hQAw>(*I_<{%J-It44#F+ho*KU4r~ z5&D#X(uP0z7BY1B@SnO;l>Tg>6ak~geEYEfb<~69SV#|~7a?fJ1QjX>Fbc>)R;?h&!ib$Az0uc=%1Q68S z99`hs_iw_%g_}NWAi`&O_pAco(0jmhrqQKOpuRvi2gSbYBJj>0cz9J9#-C-dJ$-#f z4qms1{vN*ktQ;ss86yk~5E*;kHNap0e>=oSU3UZ;_<$e?4xk`-4A#KJf0XIdVT7#R zQ{jafiYH)m68uphYr8eZ9fBm5h{FL8$k!od1+8e_0J3OMp@j>|_yLVJHa7qT61wPJ zNdi>Z0gxC9DFTs3I#-^O-pP`{lk7d&L5xy1IDvlbL9(591$nT*01{9*fR|u~DFcz+ zc?U@b3CJ=Fo2?<><&$yBIc0o54j@h-67boGh#kNgq>Oa_h=2wXteIjY9rV@cn_oU! zVx)yC`iBIWHqz*yfeH$0g_kmLX`(iDu)wK}rYh&EWd_1Q2bcPpsUWm=8l{vpHc+UU zyGr0dqgQDVtgwR4z=W|*BI~99YQ6?*YnYL8`J|c50`fqk7i3$jrx_O8rI!wndXxqp z2*7I~&u&XB1l0cdW?#NgIw}XV(rT}e>Uzm31Hg836{!FKD=@kY794EAQ;}M#!>0}m zDZYQwTGFVrc7yS`!xGH#v#-*6={?#)++VTJW@>SxtsYgc%kRM)^Qo;i+HScmm%MQU zJI@P>%7Fx&G0x%X9Bea3^Q>ab8h?6nunaJObktNc9i7uV_e`tOBu6{v)hJKhC1waeC~z=9Ww@*)f(c+(-JoC+$ zPlER`t8YH~jk^Cn`tr|De*Np8A3pxb-_QT}|Fhrg0+>JU5iolMlor|&sKCTAP+9@# j+XEp;vwS(-!W!) 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 diff --git a/plugins/calendar/skins/classic/images/badge_private.gif b/plugins/calendar/skins/classic/images/badge_private.gif deleted file mode 100644 index 900ed73389ad823f514ed73f928fb00e98fe7110..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1221 zcmV;$1UmaiNk%w1VO#)Q0K^{vq{QhFWyC9X%;DkTr?$uxX~PLv#M9&TON!NzqPF(- z_K36N9c;r4T*SfF@DE_bbf?~BoZImB{267#2v@}8?Dsf-&lX?94PL|=X2>CF%KQBO z3tGe1^f>MB0qkoX!Vo!BgMkoZZzL6z~UEt^MNFIa4ByUFJ`HZ7%w z*>0pv&TrD!VMalDV|#svIe$PxgpC|>Vrb%J>a2M!u}kdl#qc7tsK2o(qm2b*t( zo|1}fgM$DY6&6OQ8XN|?kF2eTbc}fb9v&MJZ4L-V9L>E-zrd6$!^OqN2AH|KyUm@^ za%q-E83)$axNXkO4d38r;&~e8=N=L31`X`qzVC7IZsyekz-yhs3H|(;0mw~YF#!6y z8RXDFA3|sf;dLP-5F)pA83gR3crjzRjogg?Xjq_cVmS#G^vP^c(xk=*!8;7B~=t__Qljj8dHxbxF?yK?EKgRK$S6 ztI)7wH?GrXPC^6;9uDB;DuAuuuW+-ZnFzoq&%7Bh6t>Xz@7usj1{)OcvjGAGY>9dB z`SgM3$B=bMb~dxJW(S)SWAMxtbZ8udD?4qV8G_=x4_4>?9QC!0G(Rb}t*99>26G5@ zd*%(+_YL5c+iH$Ltipm~7M5#&;MzG2=#6RH!w}(|1J4VxZ}0A11o*}=A6#D$A^B|y z+nKjd)aB{lr>I4++;jq{ryYCkaWTRFa24f-S8@+b7a>gB1%RM;3jURu2cAhN0CxF3 zkU?+zW$0IK$w?StTKNUw83QCHn81Q3K2V-Lo_**6gxUq*VgN8Ux1W16>c$!X0;0#_ z0|+=k;g1gh86$=>hWO%xP4)yqlszx z%mS2F>Sl?IMk!yU0O-g-02b7OXrGD_IYEUGAkaZwX8A~_o_oR?tAchy8NjXBbx90N zuUhIGoRnVY0Gl@=+pDs#aj~lZsa--^r;j&6DlMD7Dr)VI#!kxZLjf%2V*v%M8?K+g z?uo#;x%wzT2M+KWK)VIJ3+A|p-UtAj#KP3>zU+2DZD;_qxfQ{<8qDs*{=S*Os(Wth zBe4~9aI6Ir^II{g7*k4YF%cAStNC; zZ8pMMvrV?!M6Nn<+;UG$x7T@(y|>wYxBYkBfeSwP2i6uI^5K)LtvKU+7Y=#jk55jd z<9S<7dEc6EE_dgi`wjX+<)4pEy6C1Oo&e@^r>;8ddb@sl>#}nJyX@bsPCM?lFOGZe jj{m;s+QR=yK-0z700q~{(@;Y5HS7%i^wd{RLkIvn)r3V1 diff --git a/plugins/calendar/skins/classic/images/badge_private.png b/plugins/calendar/skins/classic/images/badge_private.png deleted file mode 100644 index acf32070c598dc80b0b896336f7824c38814936c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3359 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 diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html index d8d27acb..8ed9c1b6 100644 --- a/plugins/calendar/skins/classic/templates/calendar.html +++ b/plugins/calendar/skins/classic/templates/calendar.html @@ -51,7 +51,7 @@
    • -
    • +
    • @@ -62,6 +62,7 @@

    Event Title

    +
    Location
    From-To
    diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css index f2087fe4..76e60cd1 100644 --- a/plugins/calendar/skins/larry/calendar.css +++ b/plugins/calendar/skins/larry/calendar.css @@ -771,24 +771,54 @@ a.miniColors-trigger { margin: 0 -0.2em; } -.calendarmain .eventdialog.status-cancelled { - background: url(images/badge_cancelled.png) top right no-repeat; +#event-status-badge { + width: 100px; + height: 100px; + position: absolute; + top: 0; + right: 0; + overflow: hidden; } -.calendarmain .eventdialog.sensitivity-private { - background: url(images/badge_private.png) top right no-repeat; +#event-status-badge span { + display: none; + text-transform: uppercase; + width: 150px; + height: 20px; + line-height: 20px; + display: block; + position: absolute; + left: -20px; + top: 35px; + padding-left: 10px; + text-align: center; + font-weight: bold; + font-size: 12px; + color: #fff; + box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } -.calendarmain .eventdialog.sensitivity-confidential { - background: url(images/badge_confidential.png) top right no-repeat; +.eventdialog.status-cancelled #event-status-badge span { + background: url(images/badge.png) 26px -24px no-repeat #cc0000; } -.calendarmain .sensitivity-private #event-title { - margin-right: 50px; +.eventdialog.sensitivity-private #event-status-badge span { + background: url(images/badge.png) 40px -52px no-repeat #0066ff; } +.eventdialog.sensitivity-confidential #event-status-badge span { + background: url(images/badge.png) 20px 2px no-repeat #cc0000; +} + +.calendarmain .status-cancelled #event-title, +.calendarmain .sensitivity-private #event-title, .calendarmain .sensitivity-confidential #event-title { - margin-right: 60px; + margin-right: 80px; } .calendarmain .eventdialog div.event-line { @@ -805,11 +835,6 @@ a.miniColors-trigger { margin-left: 2em; } -.calendarmain .eventdialog #event-rsvp-comment, -.calendarmain .eventdialog #event-created-changed { - margin-top: 0.6em; -} - .eventdialog .event-text-old, .eventdialog .event-text-new, .eventdialog .event-text-diff { diff --git a/plugins/calendar/skins/larry/images/badge.png b/plugins/calendar/skins/larry/images/badge.png new file mode 100644 index 0000000000000000000000000000000000000000..a3fd135062358f020c76083c0d0b259318e9ede3 GIT binary patch literal 746 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA+!3-o%d}uuhq@D!$gt!9f|NsB*-n}140>PzA zSApc-y$8WO6yndHzYwW^|Nfy!z&H?Lpe&F9#DD($`St5JO!EJiFJHlee}Uw$U%!Cj zKm$Qa!Qk7s?|=XP{r>$2P#0VagmLoZSqKAY8c-t;0CoNR2{Pg5&!0eDKrT=t#3(rX z?b~;c9z6l7`ThHMS=qT*pg+Azg8YIR{;{MaF-_%U|9)%M-pSE{yias~etLF&o`#&H z(7j9N_bkp$54B|b_4v`v6U(P(r>Dh*+uP{t3GwrOe|Goek^S2@t)J6ZUt4Bxq_Vmu zUHYJHb5Cqqo8FX}bN>IIujRG*=FEND_}^B3_;F{V zPBqV&eOGg~@fD;@*4wqt^v$ujbNh9rdCTXncWC+cNs6Uo?Q?Yo&W?+}RV|l!r>{D9 z@WEpy&c#8WEiXvVtyYoSV;!$Py`(&5pPS6|*Rt{!0o`RQLr&eX`K86qAUAggUlX6@ z;(3bK*c=1;r*IdTEj}3+RIv5-%#N=s(p&!~JY3E7?c(FvVZq&kXD6RYUBAlvVnSVd zIIHKR2l<6|rkf*!Z`Wm>ayqzRTGIa1`Y8jp|W{N|n&4zsuM z&Db(YgR6Cmu0xoM=Zlt)x*gFemU$O5RF4}xao+y$MwvyJ-lrQIR1R{k&r{F){=+cp zk45{OlNPLpH7q25Okb0Gc!PQ8?isUvigtAEon@@e@H8q<-tzB^A{ip={A#wH&KhL_5fD?iY|Ns9#BgAk;nBkHz!!==si^2@&gcwc>F`N=) z_UH!~cR3<=@Ta?@ug$@^-?)@8^EjDJbd3J^LXpWz-NMcuQrk z!uj(}U)K25nAN;|^gUaK#YJ@c91*v5yh24k_ura4;qb6xb`=R|+!d(y@VmgvE$OB{X;z@$9=}CX zRrFM37tf6F2sdpC)QWWzYI^XNSMHWIXW-$7{4Zz39}{$Wy=2v`Z5Bc2JD1D3ObEW4 zH0|jcgQkeg*KTeCzOj=hSX`T-sLR6bsL&uWd57kt2`gN-EZVqKy)uTkTT^Y~KDjkt zbXd%@G?yIaRaX48d2EJJmK!UgxjJ&<0LMAXU;5r%%--eJI=7B^@q=f z3Bf0hEHwD^^ke2ppEbM7EVcU1%v~eR8ROEaY$r6)XM=#aSW{<-*N1NZ`fmHr-Q_?D zyBNh~6(1)w$mk0sbBW)Nc3rl7f?zP)&2uxmj~~w8?ry1{?%$i%g1)^ z<_n(h{|b7WNt{UKVO%J=b8`H3!x|Pgc?eMgWHmavUr|uHiG~ssU6hp}sBK!0M3hm| jiNGTpm_g{n=AXEs#}WW{B_g~M0BRr|Z6F2p`QYI9;o#qbfZkJ1@UgGxf`7^= z9MdQn`QhN~va!ny-ctB+| zli2_O1gA+vK~!ko?blg*lRy*(U~FAdt97e&=YPu`g>l~5Z!|8vj3uL9(!a>+Gpn~K2O zha;+3qegDF+wG0-ODnj3-D6CMp7s#o6+>!cvlvq0`+g7zE0=cQpO>137|4+3@=8^M zi|8dT|BV*DQ37!V%$9N=nQx}XkXKN|pK_BMc9!#LAg}NN@%@7I22QXgqI4Q`gKk$+ z>G^y(mRn7m-7+QGXzXN05@Cg*<&7WYq{jh13mC|`sKQ8qA5GgJ=q`zj(N6@G*D&ny zAX;MNbAu$^L{zz8fo(l)@OtlWE)@v_+M!T`lb1F>PQBrdm%1gLb?9Mp8+j#Mo3r;vQHu z(vx-@jBFR2K`OeUQsl)=CnV;Jp;)~tA* zq_Tokj?j3O245fs;LL`i4SRStt_ z!Bv`2BBOXPP{(DX0VU!tkukJ#cW~sDDDtBG3Wi?LwVRO!fi;s>5H?18T3iub%}Pc@ zyF^yO#&Qb^VYn%N6`uZ?7b(OoU6+Ur7p27Kauz{}B3I4X;0gsRN?1`qTsPu*;L-}; z^2&=d7?Hv{nI160(Cjg3MY%TCP;P#;8!7P>Gl!!x?6)qJ^z=dSYh-#{GNX*4Vjo5I@kdV++F^YqTt(fAu>>0{@Bgz9&kTM1?p+2q%I zG7{RIrHmwF{C*!(R>bhs)K}^zSTJb6skrNu@@bRO-iXW6H;~ z#+ua1r{^!5LTcss@rRdAbFm7T4^ER|<o%Aulg4CQW%fJUl-?KR-V|K|w(jXTTC=z#>R(4qm_uSivDd zZ6QT%30A-iTfh)uz#&3zC@3f*L~a^Ri#9ekBO@a(FE1-AD3tYoT zh}Gil`Gv6KDt64m*zy`>$lB)jRFBuP&hC`D=5(ju_xb)*e}pUm001F$QchC<0R;;p zG!;s23L`cY^z?u9^nZW!^z?rde^f35Kp=Q{@u9$=000CHNklid6WXlU)AtdShKUL3+1m^2yJ&Y9_a`AJ%BUveRH(T6X-P5e@Psji3 z%f;>6_p|9l{m)FMv&GAsFN4On;mhjk;@yAi6D0rn>VkDovOVZu#^}=*uWx_+8uZgv zuvTNT17Ey+_2!$`2iVX37=1#~p??~B|K|rpbq`bd99>w4>}mPzBzwBqY%3X^cXf5b zmrc9x9xB1??DDdI+H$p$)VXgStFx-t16}35-NDfE`V?E(41Vs9{TG5019B^9-`}b?$n80jx0h9{rOXfwgn;H|ETsO`RZBBX$T_C&RvD(>jk8MpcahwWd z|44Rd_AWQ>Ta*GiPE&#GP7e#V5xhxb#-;QSV=Qc(nr)gk+q{fvMD*}56*jinYMno` zoyM1=_0I=A?sQIcSEbZTmZh1L9>-y>wQdW*S#Qgfa1k9emIa+6HCNMTG|8nv?=c1{ z-HH~pZk?S-WdE9i#b4j$RE^bL!g`cNBF*ptf1=bD=eEGve3{YF+GmS&RSh$8QHC5_Dd=z z$!wc&Zkt$+zQmHqj#`p5X}ldJef3DZkRGS>=CDl%k&aGD$(L)1W?*CNV3UqH>S|Oo zNk&J-+ihjNerQIiaoHot&epnELhm`c%dW=gA1;%Kb=aF{)-5MruQ|I?qq0MXA9Y&y zOYH0(G6(10Z`F96#_CPAEYP^u-L5J@Jt8#nIzG-7W@PV-FG**4h`v^8e0I>dEN~{- z=BH9J+0h3`g8hvyC8L8wcoKbj9wnn6YhF9qJ(Q4+;0`@Lper#Q!y-Ri|4LZrbtp)Q z>2puxVxMb~%g*?5UzdbSX7{-d*_EgcdiVk0()#IJs^oQFJC+jHp$;#Rv`#FC2QIIB z*(aCReJ|=fI`clc{F!l`pHT;XE*+OTm+opgV|H~e{r4RBx%3|wbJTJs{r1((T%7j$ z;`Ps$H}bUCUn~|2dD-jJ*=!~cdwp^@y_0tbU!8US0)X&Iwe;Gv>;M1&07*qoM6N<$ Eg5w*DU;qFB diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html index 64c84738..adb291c6 100644 --- a/plugins/calendar/skins/larry/templates/calendar.html +++ b/plugins/calendar/skins/larry/templates/calendar.html @@ -82,6 +82,7 @@