merge of 'b94a205a2235d5b995faf01f91a8cccfff28235d'

and 'e480078fda9240a929b3ea04d2ddecdf26c20630'

Monotone-Parent: b94a205a2235d5b995faf01f91a8cccfff28235d
Monotone-Parent: e480078fda9240a929b3ea04d2ddecdf26c20630
Monotone-Revision: ebea63a163ebf08fba3b02873febbe9dcaaaeb2c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-09-18T14:47:18
Monotone-Branch: ca.inverse.sogo

NEWS

@@ -10,6 +10,7 @@
 - added tooltips for toolbar buttons (English and French);
 - added checkmarks in live search options popup menus;
 - initial support for resizable columns in tables;
+- improved IE7 and Safari support: attendees selector;
 - countless bugfixes;
 
 0.9.0-20070824

UI/MainUI/SOGoUserHomePage.m

@@ -221,6 +221,11 @@ static NSString *defaultModule = nil;
   date = [NSCalendarDate calendarDate];
   [cookie setExpires: [date yesterday]];
   [response addCookie: cookie];
+  
+  [response setHeader: date forKey: @"Last-Modified"];
+  [response setHeader: @"no-store, no-cache, must-revalidate, max-age=0" forKey: @"Cache-Control"];
+  [response setHeader: @"post-check=0, pre-check=0" forKey: @"Cache-Control"];
+  [response setHeader: @"no-cache" forKey: @"Pragma"];
 
   return response;
 }

UI/Templates/ContactsUI/UIxContactView.wox

@@ -20,7 +20,6 @@
           /><var:string value="primaryEmail" escapeHTML="NO"
           /><var:string value="secondaryEmail" escapeHTML="NO"
           /><var:string value="screenName" escapeHTML="NO"
-          /><var:string value="preferredTel" escapeHTML="NO"
           /><var:string value="preferredAddress" escapeHTML="NO"
           /></div
         

UI/WebServerResources/ContactsUI.css

@@ -214,7 +214,8 @@ DIV#contactView A
 
 DIV#contactView H3.contactCardTitle
 { display: block;
-  margin: .2em 0px;
+  margin: 0px;
+  padding: .2em 0px;
   font-size: large;
   font-weight: bold;
   width: 100%;

UI/WebServerResources/ContactsUI.js

@@ -614,6 +614,7 @@ function configureDragHandles() {
     handle.addInterface(SOGoDragHandlesInterface);
     handle.leftBlock=$("contactFoldersList");
     handle.rightBlock=$("rightPanel");
+    handle.leftMargin = 100;
   }
 
   handle = $("rightDragHandle");

UI/WebServerResources/MailerUI.css

@@ -33,8 +33,7 @@ DIV#leftPanel
 }
 
 DIV#rightPanel
-{ 
-  position: absolute;
+{ position: absolute;
   top: 5.5em;
   left: 15em;
   right: 0px;
@@ -42,8 +41,7 @@ DIV#rightPanel
   margin: 0px;
   margin-left: 5px;
   padding: 0px;
-  overflow: hidden;
-}
+  overflow: hidden; }
 
 /* top list */
 DIV#mailboxContent
@@ -54,8 +52,8 @@ DIV#mailboxContent
   left: 0px;
   right: 0px;
   height: 15.5em;
-  overflow: hidden;
-  overflow-y: auto; }
+  overflow: scroll;
+  overflow-x: hidden; }
 
 DIV#messageContent
 { position: absolute;

UI/WebServerResources/UIxAttendeesEditor.css

@@ -20,6 +20,13 @@ DIV#freeBusyView
   -moz-border-top-colors: #9c9a94 #000;
   -moz-border-left-colors: #9c9a94 #000; }
 
+TABLE#freeBusy
+{ border-collapse: collapse;
+  table-layout: auto; }
+
+TABLE#freeBusy THEAD TH
+{ white-space: nowrap; }
+
 TABLE#freeBusy TD,
 TABLE#freeBusy TH
 { padding: 0px;
@@ -56,14 +63,14 @@ TABLE#freeBusy TR.freeBusyHeader2 TH,
 TABLE#freeBusy TR.freeBusyHeader3 TH
 { text-align: left;
   color: #777;
-  background: #fff;
-  border-collapse: collapse; }
+  background: #fff; }
 
 TABLE#freeBusy TR.freeBusyHeader2 TH
-{ width: 6em; }
+{ padding-right: 2em; }
 
 TABLE#freeBusy TR.freeBusyHeader3 TH
-{ border-bottom: 1px solid #cecbff; }
+{ border-left: 1px solid #fff;
+  border-bottom: 1px solid #cecbff; }
 
 TABLE#freeBusy TR.attendeeModel
 { display: none; }
@@ -84,6 +91,7 @@ TABLE#freeBusy TD.noFreeBusy
 SPAN.freeBusyZoneElement
 { display: block;
   float: left;
+  clear: right;
   width: 25%;
   margin: 0px;
   padding: 0px;

UI/WebServerResources/UIxAttendeesEditor.js

@@ -268,9 +268,9 @@ function setSlot(tds, nbr, status) {
     var td = tds[i];
     var spans = $(td).childNodesWithTag("span");
     if (status == '2')
-      spans[spannbr].addClassName("maybe-busy");
+      $(spans[spannbr]).addClassName("maybe-busy");
     else
-      spans[spannbr].addClassName("busy");
+      $(spans[spannbr]).addClassName("busy");
   }
 }
 
@@ -282,7 +282,7 @@ function updateFreeBusyData(http) {
       var tds = node.parentNode.parentNode.cells;
       for (var i = 0; i < slots.length; i++) {
         if (slots[i] != '0')
-          setSlot(tds, i, slots[i]);
+	  setSlot(tds, i, slots[i]);
       }
     }
     document.contactFreeBusyAjaxRequest = null;
@@ -502,14 +502,14 @@ function prepareAttendees() {
       for (var i = 0; i < attendeesNames.length; i++) {
 	 var tr = body.insertRow(i);
 	 var td = document.createElement("td");
-	 td.addClassName("attendees");
+	 $(td).addClassName("attendees");
 	 var input = document.createElement("input");
 	 var value = "";
 	 if (attendeesNames[i].length > 0)
 	    value += attendeesNames[i] + " ";
 	 value += "<" + attendeesEmails[i] + ">";
 	 input.value = value;
-	 input.addClassName("textField");
+	 $(input).addClassName("textField");
 	 input.setAttribute("modified", "0");
 	 tr.appendChild(td);
 	 td.appendChild(input);