Monotone-Parent: 3a8c861a24282c4e8828e312e58b52573eb971e6

Monotone-Revision: a48e56be9dc4f4c17d6374ea074196e8073e8842

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-12-19T20:59:17
Monotone-Branch: ca.inverse.sogo

UI/Contacts/French.lproj/Localizable.strings

@@ -17,7 +17,7 @@
 "Name"              = "Nom";
 "OfficePhone"       = "Bureau";
 "Organisation"      = "Société";
-"Phone"             = "Téléphone"  
+"Phone"             = "Téléphone";
 "Phones"            = "Téléphones";
 "Postal"            = "Professionnelle";
 "Save"              = "Sauvegarder";

UI/WebServerResources/SchedulerUI.css

@@ -61,8 +61,9 @@ UL#uixselector-calendarsList-display
   margin: 0px; }
 
 UL#uixselector-calendarsList-display LI.denied
-{ background: #f00;
-  color: #000; }
+{ background: #fefefe;
+  font-style: italic;
+  color: #f33; }
 
 UL#tasksList
 { position: absolute;

UI/WebServerResources/SchedulerUI.js

@@ -923,6 +923,28 @@ function updateCalendarsList(method)
 
     if (method == "removal")
       updateCalendarStatus();
+
+    http = createHTTPClient();
+    http.url = ApplicationBaseURL + "checkRights";
+    http.open("GET", http.url, false /* not async */);
+    http.send("");
+    if (http.status == 200
+        && http.responseText.length > 0) {
+      rights = http.responseText.split(",");
+      var list = $("uixselector-calendarsList-display").childNodesWithTag("li");
+      for (var i = 0; i < list.length; i++) {
+        var input = list[i].childNodesWithTag("input")[0];
+        if (rights[i] == "1") {
+          list[i].removeClassName("denied");
+          input.disabled = false;
+        }
+        else {
+          input.checked = false;
+          input.disabled = true;
+          list[i].addClassName("denied");
+        }
+      }
+    }
   }
 }
 
@@ -940,23 +962,27 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
             uids.value += ',' + contactId;
           else
             uids.value = contactId;
-          var names = $('uixselector-calendarsList-display');
+          var names = $("uixselector-calendarsList-display");
           names.innerHTML += ('<li onmousedown="return false;"'
-                              + ' uid="' + contactId + '"'
-                              + ' onclick="onRowClick(event);">'
-                              + ' <span class="colorBox"'
-                              + ' style="background-color: '
-                              + colorDef + ';"></span>'
+                              + ' uid="' + contactId + '">'
+                              + ' <span class="colorBox"></span>'
                               + ' <input class="checkBox" type="checkbox" />'
                               + contactName + '</li>');
           var listElems = names.childNodesWithTag("li");
-          var input = listElems.childNodesWithTag("input")[0];
+          var i = (listElems.length - 1);
+          var colorDef = indexColor(i);
+          log("colorDef: " + colorDef);
+          var input = listElems[i].childNodesWithTag("input")[0];
+          listElems[i].addEventListener("click", onRowClick, false);
+          var colorBox = listElems[i].childNodesWithTag("span")[0];
+          log("colorBox: " + colorBox);
+          colorBox.style.backgroundColor = colorDef + ";";
           input.addEventListener("change", updateCalendarStatus, false);
 
           var styles = document.getElementsByTagName("style");
           styles[0].innerHTML += ('.ownerIs' + contactId + ' {'
                                   + ' background-color: '
-                                  + indexColor(listElems.length - 1)
+                                  + colorDef
                                   + ' !important; }');
         }
     }
@@ -1042,35 +1068,10 @@ function initCalendarContactsSelector() {
   updateCalendarStatus();
   selector.changeNotification = updateCalendarsList;
 
-  var rights;
-  var http = createHTTPClient();
-  if (http) {
-//     log ("url: " + url);
-    // TODO: add parameter to signal that we are only interested in OK
-    http.url = ApplicationBaseURL + "checkRights";
-    http.open("GET", http.url, false /* not async */);
-    http.send("");
-    if (http.status == 200
-        && http.responseText.length > 0)
-      rights = http.responseText.split(",");
-  }
-
   var list = $("uixselector-calendarsList-display").childNodesWithTag("li");
   for (var i = 0; i < list.length; i++) {
     var input = list[i].childNodesWithTag("input")[0];
-    if (rights) {
-      if (rights[i] == "1") {
-        input.addEventListener("change", updateCalendarStatus, false);
-        list[i].removeClassName("denied");
-      }
-      else {
-        input.checked = false;
-        input.disabled = true;
-        list[i].addClassName("denied");
-      }
-    } else {
-      input.addEventListener("change", updateCalendarStatus, false);
-    }
+    input.addEventListener("change", updateCalendarStatus, false);
   }
 }