From 149dcbaa1ac71c2a8c50399baed7aec3ca12e6ec Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 11 Mar 2014 11:36:58 +0100 Subject: [PATCH] Get classic calendar skin up to speed with the new features --- plugins/calendar/skins/classic/calendar.css | 188 +++++++++++++++--- .../skins/classic/images/attendee-status.gif | Bin 3302 -> 3487 bytes .../skins/classic/templates/calendar.html | 43 +++- .../skins/classic/templates/eventedit.html | 9 +- 4 files changed, 200 insertions(+), 40 deletions(-) diff --git a/plugins/calendar/skins/classic/calendar.css b/plugins/calendar/skins/classic/calendar.css index 9138b132..07917c35 100644 --- a/plugins/calendar/skins/classic/calendar.css +++ b/plugins/calendar/skins/classic/calendar.css @@ -16,7 +16,7 @@ body.calendarmain { #main { position: absolute; clear: both; - top: 90px; + top: 72px; left: 0; right: 0; bottom: 10px; @@ -24,13 +24,15 @@ body.calendarmain { #calendarsidebar { position: absolute; - top: 37px; + top: 0px; left: 10px; bottom: 0; width: 230px; } #datepicker { + position: relative; + top: 42px; width: 100%; } @@ -62,7 +64,7 @@ body.calendarmain { position: absolute; left: 244px; width: 8px; - top: 37px; + top: 4px; bottom: 0; background: url(images/toggle.gif) 0 48% no-repeat transparent; cursor: pointer; @@ -78,7 +80,7 @@ div.sidebarclosed { #calendar { position: absolute; - top: 0; + top: 4px; left: 256px; right: 10px; bottom: 0; @@ -94,7 +96,7 @@ pre { #calendars { position: absolute; - top: 220px; + top: 228px; left: 0; bottom: 0; right: 0; @@ -207,8 +209,8 @@ pre { #calendartoolbar { position: absolute; - top: 45px; - left: 256px; + top: 0px; + left: 0px; height: 35px; } @@ -269,7 +271,8 @@ pre { background-position: -128px -32px; } -#quicksearchbar { +.calendarmain #quicksearchbar { + top: 82px; right: 4px; } @@ -410,7 +413,7 @@ a.miniColors-trigger { } .event-attendees span.delegated { - background-position: right -160px; + background-position: right -180px; } .event-attendees span.organizer { @@ -599,7 +602,7 @@ td.topalign { border: 1px solid #C2D071; } -#edit-attendees-table { +.edit-attendees-table { width: 100%; display: table; table-layout: fixed; @@ -607,49 +610,51 @@ td.topalign { border: 1px solid #ccc; } -#edit-attendees-table td { +.edit-attendees-table td { padding: 3px; border-bottom: 1px solid #ccc; } -#edit-attendees-table td.role { +.edit-attendees-table td.role { width: 8em; } -#edit-attendees-table td.availability, -#edit-attendees-table td.confirmstate { +.edit-attendees-table td.availability, +.edit-attendees-table td.confirmstate { width: 4em; } -#edit-attendees-table td.options { +.edit-attendees-table td.options { width: 3em; text-align: right; padding-right: 4px; } -#edit-attendees-table td.name { +.edit-attendees-table td.name { width: auto; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } -#edit-attendees-table thead td { +.edit-attendees-table thead td { background: url(images/listheader.gif) top left repeat-x #CCC; } -#edit-attendees-form { +#edit-attendees-form, +#edit-resources-form { position: relative; margin-top: 1em; } -#edit-attendees-form #edit-attendee-schedule { +#edit-attendees-form #edit-attendee-schedule, +#edit-resources-form #edit-resource-find { position: absolute; top: 0; right: 0; } -#edit-attendees-table select.edit-attendee-role { +.edit-attendees-table select.edit-attendee-role { border: 0; padding: 2px; background: white; @@ -722,35 +727,35 @@ td.topalign { vertical-align: middle; } -#edit-attendees-table tbody td.confirmstate { +.edit-attendees-table tbody td.confirmstate { overflow: hidden; white-space: nowrap; text-indent: -2000%; } -#edit-attendees-table td.confirmstate span { +.edit-attendees-table td.confirmstate span { display: block; width: 20px; background: url(images/attendee-status.gif) 5px 0 no-repeat; } -#edit-attendees-table td.confirmstate span.needs-action { +.edit-attendees-table td.confirmstate span.needs-action { } -#edit-attendees-table td.confirmstate span.accepted { +.edit-attendees-table td.confirmstate span.accepted { background-position: 5px -20px; } -#edit-attendees-table td.confirmstate span.declined { +.edit-attendees-table td.confirmstate span.declined { background-position: 5px -40px; } -#edit-attendees-table td.confirmstate span.tentative { +.edit-attendees-table td.confirmstate span.tentative { background-position: 5px -60px; } -#edit-attendees-table td.confirmstate span.delegated { - background-position: 5px -160px; +.edit-attendees-table td.confirmstate span.delegated { + background-position: 5px -180px; } #attendees-freebusy-table { @@ -814,10 +819,14 @@ td.topalign { background-position: 2px -117px; } -.attendees-list .chair { +.attendees-list .non-participant { background-position: 2px -137px; } +.attendees-list .chair { + background-position: 2px -157px; +} + .attendees-list .loading { background: url(images/loading_blue.gif) 1px 50% no-repeat; } @@ -1063,12 +1072,124 @@ span.spacer { padding-right: 10px; } +#resource-dialog-right { + position: absolute; + top: 10px; + left: 300px; + right: 8px; + bottom: 10px; +} + +#resource-info, +#resource-availability { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 56%; + border: 1px solid #999; + background-color: #F9F9F9; + overflow: auto; +} + +#resource-availability { + top: auto; + bottom: 0; + height: 41%; +} + +#resource-info .boxtitle, +#resource-availability .boxtitle { + margin-top: 0; +} + +#resources-list div.treetoggle { + left: 3px !important; + top: -2px; +} + +#resources-list li ul li a { + padding-left: 35px; +} + +#resource-selection { + position: absolute; + top: 10px; + bottom: 10px; + left: 8px; + width: 280px; + border: 1px solid #999999; + background-color: #F9F9F9; + overflow: hidden; +} + +#resource-selection .boxlistcontent { + top: 25px; + border-top: 1px solid #eee; +} + +#resourcequicksearch { + position: absolute; + top: 3px; + left: 7px; + right: 4px; + height: 17px; + background: #fff; + border: 1px solid #888; + border-radius: 10px; + -webkit-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3); + box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3); +} + +#resourcesearchbox { + position: absolute; + top: 1px; + left: 24px; + width: 140px; + height: 15px; + font-size: 11px; + padding: 0px; + border: none; + outline: none; + background: #fff; +} + +#resourcesearchreset { + position: absolute; + top: 2px; + right: 2px; + text-decoration: none; +} + +#resource-details, +#resource-details-owner { + margin: 8px; +} + +#resource-details td.title, +#resource-details-owner td.title { + color: #666; + padding-right: 10px; + min-width: 10em; +} + +#resource-details-owner thead td { + color: #333; + font-size: 13px; + font-weight: bold; +} /* fullcalendar style overrides */ +#calendar .fc-header-right { + padding-right: 200px; + padding-top: 4px; +} + .rcube-fc-content { position: absolute !important; - top: 37px; + top: 38px; left: 0; right: 0; bottom: 0; @@ -1147,7 +1268,7 @@ div.fc-event-location { .fc-view-list div.fc-list-header, .fc-view-table td.fc-list-header, -#edit-attendees-table thead td { +.edit-attendees-table thead td { padding: 3px; background: #dddddd; background-image: -moz-linear-gradient(center top, #f4f4f4, #d2d2d2); @@ -1251,6 +1372,7 @@ div.calendar-invitebox .rsvp-status.loading { div.calendar-invitebox .rsvp-status.declined, div.calendar-invitebox .rsvp-status.tentative, +div.calendar-invitebox .rsvp-status.delegated, div.calendar-invitebox .rsvp-status.accepted { padding: 0 0 1px 22px; background: url(images/attendee-status.gif) 2px -20px no-repeat; @@ -1264,6 +1386,10 @@ div.calendar-invitebox .rsvp-status.tentative { background-position: 2px -60px; } +div.calendar-invitebox .rsvp-status.delegated { + background-position: 2px -180px; +} + /* iTIP attend reply page */ .calendaritipattend .centerbox { diff --git a/plugins/calendar/skins/classic/images/attendee-status.gif b/plugins/calendar/skins/classic/images/attendee-status.gif index 4c561e4bd22df1babd59014a1953d737dcd52b27..fd3b92665ae31c674732dfd35406aa87f56d9f3c 100644 GIT binary patch delta 2490 zcmZ{keLT~N1INF6-fV1GMRuBpqI7rL$fmfyvuON;)b+4i-4>U+D@XPcclvF^W}z&( zq#`t_^neI=JM13XNTdn9yr-wP<(e=fBg6O^nlwZ4@$r$@J$^~$ z?aHBg-ZEd~@opSIjjDe*e=2rJuOFV6s?HNFEG*nbp_)gbuId;!H@6pWd;jk2)Rh0x z+4x`)f{vY%jp?rM-u-=@M%y(wVK$ow1_tC8t}vObvb&X2;%?1Gzrg9K>EIut7UyPa zYHBpe|E_(~_>oK=Hq8{I9PHQEG&eWb-@ewVZ(dWfR8dj+mf`tomE9}Dkd{ndHh*4P zGEcs!l4dIB@c5XRUqeH~APAZU0H|XVEOXR_;WGvRK=$;~bH<|94H^rA-m>;xc7*i4 z2Z~*nATjhw;~1r)p+(Qe?^E?(wB~O^b8UVS{eC%V)9bq-_4V~o$M%egqfh`QVz;?CRq+YF=7$&)W1UHbTN%dGyun}#cT zPtQqB1nEE_)EPd}RjB6ipzgTG(LlF~+Ir{Y_{aYg{OH)(-EL}cA8m@Bp83SPpyo)3 zy6b5Jub$k~v_#*cy&L_YIYHD>sZD3lZCT{@E52{9ae7t3lU--#KF!}c>Rc92RZywv zVh(UV6tz~`_=BuuXbp94&z@?-a!pO$qly}vD@zRp{GLA}jcoy%>M}#0;WHZDb~}3J z{ris;%0SQSW>rX2b8DMU(?1QF7iQlZjlJEkuU6KLHZZ&HDX*p-edq^vjzc$O;Jdy1 zb5wUO+^js&v=sg832BS@-SFt+KOYMYk`9=ws(#D*<2l>^727|cYWcne0t2T8asp`H zUfygro$gPk2Y9kL46i_jCzBDlZBu}cH}gClMfo4(^M9e^C;^qmVA1GwrWcLLpn0?C zbhamp&Dloh_%N7E#wLdU{RvbyOsoR{?3es-6mCTkxZVS~`=+x%#uo9_Q5Wl!_&=o) zb-SCXAonRjR!1O5pt4Bb?r+H(b_Xaxm|G~>Mk&QPtg{crlCUGlRWh4nl}<_UED-k{ zO48qOScbf4gB&sMS6FU7%MXo8T-d!{uL{EigS@5<+Dc@>gL$=hj)TWp;VokSN+@gi zD{*?Px3%`(yCh4M1M z@*;?4yd`U6V=T%EPg8CueMs`aBdwJ?=53Mb0DDFZTS>ffQM6 zQ&XQ1L~10YG(E3EDoU`m5XoeT>xV0!Z&0~=W_)8R%GrS!&-wB~q-2{E=Tf78Fk)W* zdy5;5IAl{x#>Aom6hB` z9Dg-+TDw6>Yhk(6c7k6+0o21i4RZcJ>gPi3s#L;WsV zq3EmPRSt)9?Rf5v_>$HOY+<( zRdi=Mvr}l24OUd_dk>x8kQDgJ2*9R53^ACg^l%j-j`V;w4Dbv<8p5%;*Jw5p8Gba9 zx~@)xt|Fx+3Um(6pVLW~lxdhW1gAd{M53$UUUh>Uvnl0kg)S8)HV9VRX;N0);yztV zC_?n9!?&8~@{Jb-0Hl-J(Q?rqRM74Sg#&PsifR07xkqz{w`z(cdlDv5YQkZ_7L;R( zBJBe@QW<&s0ngZC$3S<9S6R?=F;{3G!Y{F}THiE237|o&8(}D#L<1UdMx_6W4>{T7 zx~>8gjVp%r1+^!xbcNYUG%%|QNcK(7PuPVXH*!l{UQERxAzT7yPUU%$_fH~BLYX0tS2n@ zBVBI`Ekoa+>=XLauEJ;6^oNXD=qgfFV)=R8Oo(*TZ-O&7VoERXd)eyj`?n%6@sKro zXNqf|3GJhk-p&cvfFjx+pCg7lt6Al)=qg3k<5~Q7^ZxvIz$9G=`^bY!4@4oKz v9R#HHsaOyGa0g}^CB)kLt`V_+(O|JnP)WV4l%qCMEngp=t%Gn_V9S32hBAmB delta 2277 zcmZ|FeISzw0|4;HHv2F_Ts~qRMx3P0k`=w4XFeLQYFyXVQf*O@>khAr>S{Lfm1Ch& zK0>TwX`~L-+2*57^YNlPY3}ADtXIO23eUa&ynnvGzkjzkPFV4F2L;l1aMuA1z()j7 zR~h>siGHt2>%7Aq811}y^X7QljR?`^m=rcOEHUkR@xpJ`-{gVik2`49E5FJ+?j6zp zkNofo0QB|s)zs9C&nzmnNPoi*{bTRHAP8`6b>Q{z>gq~~;HYi+>f++!oA--406_k$ z*Yh0!=v~qB$R0a9gZHZfZ)aZu)6ewe{JvXEK?ruC8wS5r`=R8|lTJ{#K&ngkkz6hUJ zaMd7)%v38&OV84Q3)Sq>PHjDxo0XOIP*EC^zEN9RI^Uf*$>q*98azGk%&r-;&v{c` zUXJwc<_hb5qAX$_cyj9|1rNCiSC8F&QaV4;HO6MIz2dyOLDIgTeA~3IrR30{teDQ? zg-564c5Ad%DZa1AwQK5Az6Uth&V6^I`qA>IPbs+ti>f0?V&aEq-mjkDVxRtAMWfBh z!#XO%K5L3U^!yxELv1Vw?h_x%j0tXiaQzOOjSR(gXPegofC2>1XJ1SA12iummp42; z;{o&y^>n`(JAAp~-Rz`tU`Ti|ntff$(+>B%?=Kx49o4_F`uU^IFWGpkr$-)dtPrKn z_Vk>*zjaTB4Ip4^Hbt_(i& z(97gVX?3*2-G6~4$4L2m^_}>w%4FA`VxN__Wv?_7lh4^7|GM_;wa};e?58)s9p??T zzWcL10|a%?&4Bz*FCQf8bULJu)mFllmz*8_y=ABpTwD3vH;v4FLEcRCYh_*wlauP^ zh;H#IUVh2Sr^S1hp?2lVYDxWIezDg{5IPI4pLTz#3!eh)HMavuQh1are|i+ zLLH*5S{e|J=#Y0y$W(Vg?i~|xeEVv_-G^m$zaEaiRNW+dWPrw@KpLGE=;h(*x5En# zq*4QDbU%tmfT!2Cz(AN5NTGPF9D{Oky%7=ORT~Sjt@5B(|@kOdoWYi+qj4{CWSg@b5kFB^D+#BS=(HaG4R}2 z`jv++*iq>m?~eX~oEU;@kgh6u7I%^))14EX3ykQU`TmXp`}e}QboGO8VyHqZ)VDEP~1?5M0I(_WvFmkF@|$F&U5J9 zvhD1>$V^AIgK&d?!NCZ;e-u?{5!%eGvcNnTZFlnjp4sMfRD4{xp}^nF$msxMYN9As zZgu%92A&&Wj#b75SP?;f8|p;3Jr4eksS_A)7He9Gec@E$*C(Dy^ zF0<}e*)2;T42r;SGic{`%6SG%yuEPyT?XPjj2E9Kvm8ruq_$NRfetJZz^vX}wfPwU zkWmwTm3E9j)X_eRpM` zyL@{VMik8mMDAWUdy>DKq?(p1+}?uq-F7QW!hj9kV1EjkcU6TV?8LXmFv+2KNw$52 z4>!O*%~8xGqoTyj7m4N-O!=YduzCF)%6yxx>3+4Ju@e!@F&C=DD*ctPl#pFcAEZog z+Exb66IpOrN9v~Zr<;c@=n+Vx3-kMM3!LIO`iP5;YHPbf%W}-a^vQ-|aO*Q1?-XqQ zs7|%wak95OvDDQziI)+N4$I#p^FC@2`ae`Q3&w;?*&~HlYvkirj_$3$QAXNk!{uN7XQhixeyN7jEauW z_S|7OCnx%ibGoRv@D1(u)crp`Up&l2czcZ0iGN*OLJ|bIhT}JmU2;ZMm92fAuG#nT zOUl3HvhCxs;2?T0{VLPJc!kV>DKh{DyRzr9Hc4(1o+#Sge~1IU9r3she2WKT zO78+Q0>QLm;APl^WS(u57s`(ui+QGm4`7Sr`iRyb8)Nt}L17 za5A5-Xuajy3%Ih%_0BYN!6Q-;cAG|zm{eBmR5+2~+szV0i~G?IjW{1sXoP@<#~8WB zLcw7bIp@k?u$={aZ;=`mL_&71E@==mRPa;%H<+c^WNa{Gz~839Z&-wU{=Cm8Z{vV5 qbOv2{sGBV2gBuT`DLJuSWFW$5BZY~Et|nuWM=Mo^?}|_;!254(A~25t diff --git a/plugins/calendar/skins/classic/templates/calendar.html b/plugins/calendar/skins/classic/templates/calendar.html index da779993..b6012e70 100644 --- a/plugins/calendar/skins/classic/templates/calendar.html +++ b/plugins/calendar/skins/classic/templates/calendar.html @@ -13,6 +13,14 @@
+
+ + + + + +
+
@@ -159,14 +194,6 @@
-
- - - - - -
-
diff --git a/plugins/calendar/skins/classic/templates/eventedit.html b/plugins/calendar/skins/classic/templates/eventedit.html index 1bc1a123..e05a55cc 100644 --- a/plugins/calendar/skins/classic/templates/eventedit.html +++ b/plugins/calendar/skins/classic/templates/eventedit.html @@ -4,6 +4,7 @@
    • +
    • @@ -87,10 +88,16 @@
    - +
    + +
    + + + +