merge of '1cad98827a66e18891a4b93bbab5ccce88c61795'

and 'fa7e03f29012a5aa53494584d9d660effeab890f'

Monotone-Parent: 1cad98827a66e18891a4b93bbab5ccce88c61795
Monotone-Parent: fa7e03f29012a5aa53494584d9d660effeab890f
Monotone-Revision: fc65404103126a45384bce022216f93bcfda9947

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-12T15:40:14
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -85,7 +85,7 @@ function contactsListCallback(http) {
     configureSortableTableHeaders();
   }
   else
-    log ("ajax fuckage 1");
+    log ("ajax problem 1");
 }
 
 function onContactFoldersContextMenu(event) {
@@ -186,7 +186,7 @@ function contactLoadCallback(http) {
     div.innerHTML = content;
   }
   else
-    log ("ajax fuckage 2: " + http.status);
+    log ("ajax problem 2: " + http.status);
 }
 
 var rowSelectionCount = 0;
@@ -336,11 +336,13 @@ function onHeaderClick(event) {
     document.contactsListAjaxRequest.aborted = true;
     document.contactsListAjaxRequest.abort();
   }
-  url = URLForFolderID(currentContactFolder) + "/" + this.link;
-  if (!this.link.match(/noframe=/))
-    url += "&noframe=1";
+  url = URLForFolderID(currentContactFolder);
+// //   log("url: " + url);
+//   var url = "" + this.href;
+  if (url.indexOf("noframe=", 0) == -1)
+     url += "&noframe=1";
   document.contactsListAjaxRequest
-    = triggerAjaxRequest(url, contactsListCallback);
+     = triggerAjaxRequest(url, contactsListCallback);
 
   event.preventDefault();
 }
@@ -451,7 +453,7 @@ function newAbCallback(http) {
      appendAddressBook(name, "/" + name);
   }
   else
-    log ("ajax fuckage 4:" + http.status);
+    log ("ajax problem 4:" + http.status);
 }
 
 function newUserFolderCallback(folderData) {
@@ -531,7 +533,7 @@ function deletePersonalAddressBookCallback(http) {
      document.deletePersonalABAjaxRequest = null;
   }
   else
-     log ("ajax fuckage");
+     log ("ajax problem");
 }
 
 function configureDragHandles() {

UI/WebServerResources/SchedulerUI.css

@@ -4,7 +4,7 @@ DIV#leftPanel
   position: absolute;
   top: 5.5em;
   left: 0px;
-  width: 18.5em;
+  width: 19.25em;
   bottom: 0px;
   overflow: hidden;
 }
@@ -15,13 +15,13 @@ DIV#schedulerTabs
   top: 0.5em;
   left: .2em;
   right: .2em;
-  height: 17em;
+  height: 14em;
 }
 
 DIV#tasksListView
 {
   position: absolute;
-  top: 20em;
+  top: 17em;
   bottom: 0px;
   left: .2em;
   right: .7em;
@@ -84,7 +84,7 @@ UL#calendarList LI
 UL#tasksList
 { position: absolute;
   width: 100%;
-  top: 3em;
+  top: 2em;
   left: .25em;
   right: .25em;
   bottom: .25em; }
@@ -126,7 +126,7 @@ UL#tasksList LI[class~="_selected"].duelater
 DIV#rightPanel
 { position: absolute;
   top: 5.5em;
-  left: 18.5em;
+  left: 19.25em;
   right: 0px;
   bottom: 0px;
   margin: 0px;
@@ -143,7 +143,8 @@ DIV#eventsListView
   left: 0px;
   right: 0px;
   height: 15.5em;
-  overflow: auto; }
+  overflow: hidden;
+  overflow-y: auto; }
 
 DIV#calendarView
 { position: absolute;
@@ -163,7 +164,7 @@ DIV#calendarView A
 #verticalDragHandle
 { cursor: e-resize;
   top: 7.5em;
-  left: 18.5em;
+  left: 19.25em;
   width: 5px;
   bottom: 0px; }
 

UI/WebServerResources/generic.js

@@ -1197,7 +1197,10 @@ function configureSortableTableHeaders() {
   var headers = document.getElementsByClassName("sortableTableHeader");
   for (var i = 0; i < headers.length; i++) {
      var header = headers[i];
-     Event.observe(header, "click", onHeaderClick.bindAsEventListener(header));
+     var anchor = $(header).childNodesWithTag("a")[0];
+     if (anchor)
+	Event.observe(anchor, "click",
+		      onHeaderClick.bindAsEventListener(anchor));
   }
 }