From b692d9f5fd6761a60d154a87a3492f1e84cc47ae Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 27 Aug 2010 20:16:35 +0000 Subject: [PATCH] See Changelog. Monotone-Parent: 25abdbcb35808945aa88d8503c67e9f53776cf62 Monotone-Revision: 5a2b6de6c5d7b96b025f1f993abff2993dc73fcc Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-08-27T20:16:35 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SchedulerUI.css | 8 +++----- UI/WebServerResources/SchedulerUI.js | 22 ++++++++++++++++++---- UI/WebServerResources/alarm.png | Bin 514 -> 264 bytes UI/WebServerResources/confidential.png | Bin 0 -> 176 bytes UI/WebServerResources/private.png | Bin 0 -> 186 bytes 5 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 UI/WebServerResources/confidential.png create mode 100644 UI/WebServerResources/private.png diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index 653555b5c..f2838c1df 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -1318,6 +1318,9 @@ DIV.gradient > IMG min-height: 15px; /* for 15-minute events */ width: 100%; } +DIV.text SPAN IMG +{ vertical-align: middle; } + DIV#calendarHeader DIV.event, DIV.monthView DIV.event { position: relative; @@ -1329,11 +1332,6 @@ DIV.monthView DIV.event white-space: nowrap; height: 20px; } -DIV.event.alarm DIV.text -{ background-image: url("alarm.png"); - background-repeat: no-repeat; - background-position: top right; } - DIV.eventInside.tentative, DIV.eventInside.needs-action { -moz-opacity: 0.7; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 095d8a5a9..da6262c95 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1378,7 +1378,7 @@ function newBaseEventDIV(eventRep, event, eventText) { // log ("5 end = " + event[5]); // log ("6 location = " + event[6]); // log ("7 isallday = " + event[7]); - // log ("8 classification = " + event[8]); + // log ("8 classification = " + event[8]); // 0 = public, 1 = private, 2 = confidential // log ("9 category = " + event[9]); // log ("10 participants emails = " + event[10]); // log ("11 participants states = " + event[11]); @@ -1394,6 +1394,10 @@ function newBaseEventDIV(eventRep, event, eventText) { var eventCell = createElement("div"); eventCell.cname = event[0]; eventCell.calendar = event[1]; +// if (event[8] == 1) +// eventCell.addClassName("private"); +// else if (event[8] == 2) +// eventCell.addClassName("confidential"); if (eventRep.recurrenceTime) eventCell.recurrenceTime = eventRep.recurrenceTime; //eventCell.owner = event[12]; @@ -1402,8 +1406,8 @@ function newBaseEventDIV(eventRep, event, eventText) { eventCell.erasable = event[18]; eventCell.ownerIsOrganizer = event[19]; eventCell.addClassName("event"); - if (event[14] > 0) - eventCell.addClassName("alarm"); +// if (event[14] > 0) +// eventCell.addClassName("alarm"); var innerDiv = createElement("div"); eventCell.appendChild(innerDiv); @@ -1423,7 +1427,17 @@ function newBaseEventDIV(eventRep, event, eventText) { var textDiv = createElement("div"); innerDiv.appendChild(textDiv); textDiv.addClassName("text"); - textDiv.update(eventText.replace(/(\\r)?\\n/g, "
")); + var iconSpan = createElement("span"); + textDiv.appendChild(iconSpan); + textDiv.appendChild(document.createTextNode(eventText.replace(/(\\r)?\\n/g, "
"))); + + // Add alarm and classification icons + if (event[8] == 1) + createElement("img", null, null, {src: ResourcesURL + "/private.png"}, null, iconSpan); + else if (event[8] == 2) + createElement("img", null, null, {src: ResourcesURL + "/confidential.png"}, null, iconSpan); + if (event[14] > 0) + createElement("img", null, null, {src: ResourcesURL + "/alarm.png"}, null, iconSpan); if (event[9] != null) { var categoryStyle = categoriesStyles.get(event[9]); diff --git a/UI/WebServerResources/alarm.png b/UI/WebServerResources/alarm.png index 81b44d927e0f7e40332a1616e08ffa6a277d4eca..e8676dfdef9a4c80de44d4d56a9521f342543d87 100644 GIT binary patch delta 235 zcmV9ts-r+@)t-a|zB}WGXt}{Z zxXl53w?hUrD6VgD{ei?0)hlFiBL{Q4GJ0x0000DNk~Le0000E0000B2nGNE08fRyVgLXD1ZP1_ zK>z@+$TtOw>5(BPe*u(9L_t(|+Eh}zN&`U@J+qJOZj2DMvXEdvVWap!f{H~zL=i0n zTdlPcOVK7jAtGoa7S?`&S_Ew@#CIVoXpDldh-Ten#ygwrnp`+=XYM)oF?W~{0!M2M zfeCaN5p7!u$GU`@gPZ?4DU~n-hBKeiKQEx6)^ydxmOZ-Je`7>j!5^1Uc+T`(Utr5| zFhFtFCn{bM9$-SNi}e}}ZE$ZFP<+k6s3QVHFLg3OfCpcwsAZTIrbG2{CcdvAoEtC7 zDWRs5lwq3DnXxKi#Tq$7pFO+^o<9VBKV>DallBA=74%6?O{-*0^hV?H@p?Pd?smv=H2jUY*5Ed~`UE!**zdtg~eogZh{<$?S;c~^-A dAK*`b0RRT4kD-ow7TN#+002ovPDHLkV1koT$l?G1 diff --git a/UI/WebServerResources/confidential.png b/UI/WebServerResources/confidential.png new file mode 100644 index 0000000000000000000000000000000000000000..8af82f011f642760c92c31d9d2f3a8e44c4b1e7e GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1GL7py-Ar-fl1bT8Y7;+e2;{PpJyUCgRTR@bekDp?p_)JY6 zH$jF+@7CwcxTzH7C2X_NcJI#3QK2>qotpe4%ng-x@ZIIxZ?!)%0E-JnZa_$QG8iK)830)wy^B@ z{o=t155dmp181@qc-gq_(3l^S8*o*XZ`rMcG{d){;vZkQf9EZis^tip=O(;V@%4Xg h#=HL8h5Z=W7;4j0ey6BB_y@Fy!PC{xWt~$(69DM`L0

literal 0 HcmV?d00001