From e17d43a24ea00c9eba7fe12d765bb40df0a6ab59 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 26 Apr 2007 01:15:26 +0000
Subject: [PATCH] Monotone-Parent: 029f7af5879a2c5f2514bdae82805853dc8624b0
 Monotone-Revision: 36c59ea6f5d3705bff60a615e113d6b9e7a7501e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-26T01:15:26
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/SchedulerUI/UIxCalInlineAptView.wox | 7 ++-----
 UI/Templates/SchedulerUI/UIxComponentEditor.wox  | 2 +-
 UI/WebServerResources/SchedulerUI.js             | 5 +++++
 UI/WebServerResources/UIxComponentEditor.js      | 9 ++++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
index 929a66ca5..7d769af30 100644
--- a/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalInlineAptView.wox
@@ -26,10 +26,7 @@
           ><img rsrc:src="alarm.png" class="gradient"
             /></var:if
           ></span
-        ><var:if condition="titleShouldBeHidden" const:negate="YES"
-        ><br
-          /><var:string value="appointment.title" const:escapeHTML="NO"
-          /></var:if
-        ></div>
+        ><br/><var:string value="appointment.title" const:escapeHTML="NO" />
+    </div>
   </div>
 </div>
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 48cb8e082..b80c661a2 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -20,7 +20,7 @@
           label:value="Public Event" /></li>
       <li onmouseup="onMenuSetClassification(event, 'CONFIDENTIAL');"><var:string
           label:value="Show Time and Date Only" /></li>
-      <li onmouseup="onMenuSetClassification(event, 'PRIVACY');"><var:string
+      <li onmouseup="onMenuSetClassification(event, 'PRIVATE');"><var:string
           label:value="Private Event" /></li>
     </ul>
   </div>
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index fec8322af..f84dcd5a4 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1054,6 +1054,7 @@ function appendCalendar(folderName, folder) {
    checkBox.type = "checkbox";
    checkBox.addEventListener("change", updateCalendarStatus, false);
    li.appendChild(checkBox);
+   li.appendChild(document.createTextNode(" "));
    var colorBox = document.createElement("div");
    colorBox.appendChild(document.createTextNode("OO"));
    colorBox.addClassName("colorBox");
@@ -1068,6 +1069,10 @@ function appendCalendar(folderName, folder) {
 
    var contactId = folder.split(":")[0];
    var styles = document.getElementsByTagName("style");
+
+   var url = URLForFolderID(folder) + "/canAccessContent";
+   triggerAjaxRequest(url, calendarEntryCallback, folder);
+
    styles[0].innerHTML += ('.ownerIs' + contactId + ' {'
 			   + ' background-color: '
 			   + color
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 525a9b1c6..8e2945d2f 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -78,9 +78,8 @@ function onChangeCalendar(event) {
    else
       ownerLogin = UserLogin;
    urlElems[urlElems.length-4] = ownerLogin;
-   
+
    form.setAttribute("action", urlElems.join("/"));
-   log ("after: " + form.getAttribute("action"));
 }
 
 function refreshAttendees() {
@@ -153,5 +152,9 @@ function onComponentEditorLoad(event) {
       initializeAttendeesHref();
    initializeDocumentHref();
    initializePrivacyMenu();
-   $("calendarList").addEventListener("change", onChangeCalendar, false);
+   var list = $("calendarList");
+   list.addEventListener("change", onChangeCalendar, false);
+   var onSelectionChangeEvent = document.createEvent("Event");
+   onSelectionChangeEvent.initEvent("change", false, false);
+   list.dispatchEvent(onSelectionChangeEvent);
 }