From 81c9b7f1adf7e68e20b16243342843bc8fcee3c2 Mon Sep 17 00:00:00 2001 From: "Aleksander Machniak (Kolab Systems)" Date: Tue, 30 Aug 2011 09:04:44 +0200 Subject: [PATCH 1/3] Removed quotes from css url() Fixed css bug (there's no 'middle' in background position) --- plugins/calendar/skins/default/calendar.css | 33 ++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css index 1b47b962..15e3b051 100644 --- a/plugins/calendar/skins/default/calendar.css +++ b/plugins/calendar/skins/default/calendar.css @@ -5,12 +5,12 @@ body.calendarmain { } #taskbar a.button-calendar { - background: url('images/calendar.png') 0px 1px no-repeat; + background: url(images/calendar.png) 0px 1px no-repeat; } /* hack for IE 6/7 */ * html #taskbar a.button-calendar { - background-image: url('images/calendar.gif'); + background-image: url(images/calendar.gif); } #main { @@ -64,7 +64,7 @@ body.calendarmain { width: 8px; top: 37px; bottom: 0; - background: url('images/toggle.gif') 0 48% no-repeat transparent; + background: url(images/toggle.gif) 0 48% no-repeat transparent; cursor: pointer; } @@ -125,7 +125,7 @@ pre { #calendarslist li span { cursor: default; - background: url('images/calendars.png') 0 -2px no-repeat; + background: url(images/calendars.png) 0 -2px no-repeat; padding-left: 18px; } @@ -210,7 +210,7 @@ pre { padding: 0; margin-right: 10px; overflow: hidden; - background: url('images/toolbar.png') 0 0 no-repeat transparent; + background: url(images/toolbar.png) 0 0 no-repeat transparent; opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */ } @@ -352,7 +352,7 @@ a.miniColors-trigger { #event-attendees span.attendee { padding-right: 18px; margin-right: 0.5em; - background: url('images/attendee-status.gif') right 0 no-repeat; + background: url(images/attendee-status.gif) right 0 no-repeat; } #event-attendees span.attendee a.mailtolink { @@ -571,7 +571,7 @@ td.topalign { } #edit-attendees-table thead td { - background: url('images/listheader.gif') top left repeat-x #CCC; + background: url(images/listheader.gif) top left repeat-x #CCC; } #edit-attendees-form { @@ -600,7 +600,7 @@ td.topalign { } .availability img.availabilityicon.loading { - background: url('images/loading-small.gif') middle middle no-repeat; + background: url(images/loading-small.gif) center no-repeat; } #schedule-freebusy-times td.unknown, @@ -631,7 +631,7 @@ td.topalign { #schedule-freebusy-times td.all-busy, #schedule-freebusy-times td.all-tentative, #schedule-freebusy-times td.all-out-of-office { - background-image: url('images/freebusy-colors.png'); + background-image: url(images/freebusy-colors.png); background-position: top right; background-repeat: no-repeat; } @@ -667,11 +667,10 @@ td.topalign { #edit-attendees-table td.confirmstate span { display: block; width: 20px; - background: url('images/attendee-status.gif') 5px 0 no-repeat; + background: url(images/attendee-status.gif) 5px 0 no-repeat; } #edit-attendees-table td.confirmstate span.needs-action { - } #edit-attendees-table td.confirmstate span.accepted { @@ -719,7 +718,7 @@ td.topalign { .attendees-list .attendee { padding: 3px 4px 3px 1px; - background: url('images/attendee-status.gif') 2px -97px no-repeat; + background: url(images/attendee-status.gif) 2px -97px no-repeat; white-space: nowrap; } @@ -752,7 +751,7 @@ td.topalign { } .attendees-list .loading { - background: url('images/loading-small.gif') 1px 50% no-repeat; + background: url(images/loading-small.gif) 1px 50% no-repeat; } .attendees-list .total { @@ -1024,7 +1023,7 @@ div.fc-event-location { display: inline-block; width: 11px; height: 11px; - background: url('images/eventicons.gif') 0 0 no-repeat; + background: url(images/eventicons.gif) 0 0 no-repeat; margin-left: 3px; line-height: 10px; } @@ -1099,7 +1098,7 @@ div.calendar-invitebox { margin: 5px 8px; padding: 3px 6px 6px 34px; border: 1px solid #C2D071; - background: url('images/calendar.png') 6px 5px no-repeat #F7FDCB; + background: url(images/calendar.png) 6px 5px no-repeat #F7FDCB; } div.calendar-invitebox td.ititle { @@ -1127,14 +1126,14 @@ div.calendar-invitebox input.button { div.calendar-invitebox .rsvp-status.loading { color: #666; padding: 1px 0 2px 24px; - background: url('images/loading-small.gif') top left no-repeat; + background: url(images/loading-small.gif) top left no-repeat; } div.calendar-invitebox .rsvp-status.declined, div.calendar-invitebox .rsvp-status.tentative, div.calendar-invitebox .rsvp-status.accepted { padding: 0 0 1px 22px; - background: url('images/attendee-status.gif') 2px -20px no-repeat; + background: url(images/attendee-status.gif) 2px -20px no-repeat; } div.calendar-invitebox .rsvp-status.declined { From 42232e4c0a9ce596bdcf80a34eb767f040908105 Mon Sep 17 00:00:00 2001 From: "Aleksander Machniak (Kolab Systems)" Date: Tue, 30 Aug 2011 09:37:59 +0200 Subject: [PATCH 2/3] Use nicer small loading icon (taken from core) --- plugins/calendar/skins/default/calendar.css | 6 +++--- .../skins/default/images/loading-small.gif | Bin 1849 -> 0 bytes .../skins/default/images/loading_blue.gif | Bin 0 -> 847 bytes 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 plugins/calendar/skins/default/images/loading-small.gif create mode 100644 plugins/calendar/skins/default/images/loading_blue.gif diff --git a/plugins/calendar/skins/default/calendar.css b/plugins/calendar/skins/default/calendar.css index 15e3b051..1645c868 100644 --- a/plugins/calendar/skins/default/calendar.css +++ b/plugins/calendar/skins/default/calendar.css @@ -600,7 +600,7 @@ td.topalign { } .availability img.availabilityicon.loading { - background: url(images/loading-small.gif) center no-repeat; + background: url(images/loading_blue.gif) center no-repeat; } #schedule-freebusy-times td.unknown, @@ -751,7 +751,7 @@ td.topalign { } .attendees-list .loading { - background: url(images/loading-small.gif) 1px 50% no-repeat; + background: url(images/loading_blue.gif) 1px 50% no-repeat; } .attendees-list .total { @@ -1126,7 +1126,7 @@ div.calendar-invitebox input.button { div.calendar-invitebox .rsvp-status.loading { color: #666; padding: 1px 0 2px 24px; - background: url(images/loading-small.gif) top left no-repeat; + background: url(images/loading_blue.gif) top left no-repeat; } div.calendar-invitebox .rsvp-status.declined, diff --git a/plugins/calendar/skins/default/images/loading-small.gif b/plugins/calendar/skins/default/images/loading-small.gif deleted file mode 100644 index d42f72c723644bbf8cf8d6e1b7ff0bea7ddd305a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1849 zcma*odr%wI9tZGc_iT2vk7P+x3@LU(2yGIQCcHvgYTblq0THkTesI znR7n#{hi;OjP2?A&1ME-pkE;9;lqaz1T8KudOV)_`T6wp^p=(uf2Fv%SSFK=kB@u3 zUZGGpJUk2l(CKv5)z$vpzrP~?FHUK&nD<(COPZ{Et0m?db93z;^X^U7=d1QWkq-bw z_z#PGNam*Pcq+w^mln54i-h<~s=yrqB!o6eBrwd4{B{&hHR9I{{bQLC?)mG!al!d3 z<_YADRELlGj+H!fNocrRe7`?$gk5?^y3^@6pC85jwesu>G6*{Wrto)mL5D?z)j-L++&!SNH!MDuhyZ1*)jGIdEgHH>qdP6}DTp>kJ!bZd!oke!Q0J5vRHHSl&=?=ft+HzcfBB?ZKg#rgtngf(C zDL)0I;%QR6Z_49x&crpS#vVCUpEoP)gxevZsOEytw5Vq|*bf39%i#K5VVMGzL^=13 zR-}G|UaU(m68*HWc{(R=BrQG$CK$N`HcDv@S=IAWm(o~Np>ZF8X|_V%3_!1*u`vm}?t+-#K2Qs= zlXouK&f(YJG|lD7kLqye?NcYji#s*HOSm|xQ~{R)Ao3VZxwQ7l4$VQO;kkhWM?7Tq zV7I5-(5BO!(yinIf+@AjEfNKCk>b~u*83@)>qu(a3nA*y_1a7za7?y8mYaN9Z=br4iilUPLeBE8>z7SjUY!R@qdmA$~nkLiZ z9qy{OsKf4~y1^q+D*!YY&=vr^tMUUJQrx*Do>dYDlPO!l`DoZR5vApf95=i4Lz;yXc(}m~6Zh#oS@fHF;-MHT+t;8_YoNLuk zSUE;16g_GThjJ{n2e=qnXWb70jIOhk#;lMy!K4=hr0tBKfB(rz4e z+1U)aJZHl#TYU{%(($JI!F!<+%Jp+Jdk!#Y(|CzO!nka;h@9x_wBI_{i{tgbHY(SI zVOYV2N)E%tOc-CGkW(0fy>Or+s~>c2t0?1P8+jRZNqDzxRf7dRy(%%W_#a<6{e3caEW8DdD|KsdZBw z(K6nRmw&K{D1uvtp&1a;%;nPiAvOlI0*Zq9*kdsS7JEd^O*1FLwTe{>9&A}oMlrlF z`pQPbaQ2zQZ_j_#qk8qy|9IetJFQG!>l{9_AvsafGtVRnQr)xR?bImN4qo-#?gP`}S)0UYaWY9t`6HQwY4B_($TWNu`l?!*nIBy_|7=pQc9cnFU zs%%oO^oje|8ddh7^1-E9_|T~KBxydL{KcW06CqFQ?Ym3~cb^|wPx?lUyCBD|_nRZU zsA}@ctKd0_^(q#G?{G;+$w=8-md|N>W6e5@3AT19SLRCCSyG z=oV%uMus5!Ry9PhrZMnpmb0lXJuACSOl2|krLXzwsrVsNe(8N);u`z?E#W-RKNi9E z;z;dGgCSKfqEhya^?xWt|DBmvWexQ%SfTtu(C0Mdv9@(g3WttPh3GsE1Niv~Ituk; zXltbvX7Jn^Z4>QMtd0~JELrW+CaT^$N~khm@~tceYLLGjk=3uK@XnOQ1!btG^Pus9 zYDnDM@%;wTR-(h+ec@l>g6c`Cs7=j$FkqTfajDLuzmAAh_qHK0!$~G+eL?P46^V2( gTVr?dnQ{(H{Ie1a9NS3OKPMyDfF?Qc5iPGj047fkWdHyG diff --git a/plugins/calendar/skins/default/images/loading_blue.gif b/plugins/calendar/skins/default/images/loading_blue.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ea6b19aed14632292e801472ce398460a0f0ca2 GIT binary patch literal 847 zcmZ?wbhEHb6krfw_`<;O|Nno1()~Yv{c)LmrhCtQ(TW4cohNR*__Fr=3zdc=bzAP_ zuetH`{r7pto}9e@A$azMgvD1FNCArfx&2&2f}I@$T#fV$m>Ge375_;&7o{eaq^2m8 zXO?6rBxWU6otbEINafjWLRY2!70|NW6iz~gEtaOk8&Zmh)doe~~B7us%UunTmtm@p|k*U*tz=BAkF!4MHVgQGFmbjeo6 zBo~h@Yz(V*CMM}{^{F-#7>gwzQQn~bgZGURyNQ{3fSOi>euG9&uL@R6z+soy%IayL(jn0+=WV`;*F%T>V5e?LvsP2HtCWbqlEbVA#nav0=JHKcBOC28X^OOB!p8W_OR8B7-$3d4d4|tKba{ literal 0 HcmV?d00001 From abee674da6ef1abf10c1fbf736e86c583de8b3cf Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 31 Aug 2011 15:57:12 +0200 Subject: [PATCH 3/3] Improve invitation RSV display --- plugins/calendar/calendar.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index de652bae..4ce7ab84 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -632,7 +632,7 @@ class calendar extends rcube_plugin } } } - else + else if ($status != 'NEEDS-ACTION') $action = 'import'; if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED'))) { @@ -1646,7 +1646,7 @@ class calendar extends rcube_plugin )); // check my status - $status = 'NEEDS-ACTION'; + $status = 'unknown'; foreach ($event['attendees'] as $i => $attendee) { if ($attendee['email'] && in_array($attendee['email'], $emails)) { $status = strtoupper($attendee['status']);