merge of '8ec679acd7bba83b03f0f4bbf41999b1d7c4b065'

and 'eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3'

Monotone-Parent: 8ec679acd7bba83b03f0f4bbf41999b1d7c4b065
Monotone-Parent: eca223304213a13e4a7b9e29e6e5cc41c3b1cdb3
Monotone-Revision: 27ff1857cc937c28d83c101f077e83c119249cd6

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-06-30T13:15:34
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -253,7 +253,7 @@ function actionContactCallback(http) {
       var error = html.select("p").first().firstChild.nodeValue.trim();
       log("actionContactCallback failed: error " + http.status + " (" + error + ")");
       if (parseInt(http.status) == 403)
-				window.alert(labels["You don't have the required privileges to perform the operation."]);
+				window.alert(clabels["You don't have the required privileges to perform the operation."]);
       else if (error)
 				window.alert(labels[error]);
       refreshCurrentFolder();
@@ -777,6 +777,8 @@ function onAddressBookMenuPrepareVisibility() {
 					menuEntry.removeClassName("disabled");
       });
   }
+
+	return true;
 }
 
 function updateAddressBooksMenus() {
@@ -899,8 +901,7 @@ function onAddressBooksMenuPrepareVisibility() {
       sharingOption.addClassName("disabled");
     }
 
-    // disable the "remove" option when address book is public, otherwise
-    // enable it
+    // Disable the "remove" option when address book is public
     if (folderOwner == "nobody")
       removeOption.addClassName("disabled");
     else
@@ -914,7 +915,7 @@ function onAddressBooksMenuPrepareVisibility() {
 
 function onContactMenuPrepareVisibility() {
   var contactRows = document.menuTarget;
-  var selectedFolder = $("contactFolders").getSelectedNodes()[0];
+  var selectedFolder = $("contactFolders").getSelectedNodes().first();
   var options = { write: false,
                   aim: false };
 
@@ -925,9 +926,10 @@ function onContactMenuPrepareVisibility() {
   var moveOption = elements[7];
 
   $A(contactRows).each(function(contactRow) {
-      var emailCell = contactRow.down('td', 1);
+			var cells = contactRow.getElementsByTagName('td');
+			var emailCell = cells[1];
       options.write |= (emailCell.firstChild != null);
-      var aimCell = contactRow.down('td', 2);
+      var aimCell = cells[2];
       options.aim |= (aimCell.firstChild != null);
     });
 

UI/WebServerResources/SchedulerUI.js

@@ -390,7 +390,7 @@ function onViewEventCallback(http) {
 				div.down("P", 1).hide();
 
       if (data["description"].length) {
-				div.down("P", 2).update(data["description"]);
+				div.down("P", 2).update(data["description"].replace(/\r\n/g, "<BR/>"));
 				div.down("P", 2).show();
       } else
 				div.down("P", 2).hide();

UI/WebServerResources/UIxAppointmentEditor.css

@@ -54,19 +54,10 @@ SELECT
 { margin-left: 1px; }
 
 LABEL#commentArea
-{ height: 15em; }
+{ height: 17em; }
 
 LABEL#commentArea textarea
-{ padding-bottom: 0em;
-  top: 0px;
-  left: 8em;
-  width: 380px;
-  height: 15em;
-  vertical-align: bottom;
-  position: absolute;
-  padding: 0px;
-  margin: 0px;
-  margin-left: 1px; }
+{ height: 15.5em; }
 
 SPAN.checkBoxList#participantsCB
 { height: 7em; }
@@ -80,7 +71,7 @@ DIV#participants UL.contactList
 SPAN.checkBoxList SPAN.content LABEL
 { display: inline; }
 
-SPAN.content
+n0SPAN.content
 { position: absolute;
   line-height: 2em;
   top: -.25em;

UI/WebServerResources/UIxComponentEditor.css

@@ -9,3 +9,32 @@ SPAN.datePicker INPUT.textField
 
 SPAN.timeDateControl A.button
 { border: 0; }
+
+SPAN.content
+{ position: absolute;
+  line-height: 2em;
+  top: -.25em;
+  left: 8em;
+  right: 1em; }
+
+SPAN.content > INPUT.textField,
+LABEL#commentArea textarea
+{ width: 380px; }
+
+LABEL, SPAN.checkBoxList
+{ display: block;
+  position: relative;
+  line-height: 1.5em;
+  height: 1.5em;
+  margin-left: 0px;
+  margin-bottom: .5em;
+  width: 100%; }
+
+LABEL#commentArea textarea
+{ padding-bottom: 0em;
+  top: 0px;
+  left: 8em;
+  position: absolute;
+  padding: 0px;
+  margin: 0px;
+  margin-left: 1px; }

UI/WebServerResources/UIxComponentEditor.js

@@ -43,6 +43,7 @@ function onPopupUrlWindow(event) {
     }
     urlInput.value = newUrl;
   }
+	onWindowResize(event);
 
   return false;
 }
@@ -134,10 +135,31 @@ function onComponentEditorLoad(event) {
   $("repeatList").observe("change", onPopupRecurrenceWindow);
 	$("reminderHref").observe("click", onPopupReminderWindow);
 	$("reminderList").observe("change", onPopupReminderWindow);
+
+	Event.observe(window, "resize", onWindowResize);
+
   onPopupRecurrenceWindow(null);
 	onPopupReminderWindow(null);
 }
 
+function onWindowResize(event) {
+	var document = $("documentLabel");
+	var comment = $("commentArea");
+	var area = comment.select("textarea").first();
+	var offset = 6;
+	var height;
+
+	height = window.height() - comment.cumulativeOffset().top - offset;
+
+	if (document.visible())
+		height -= $("changeUrlButton").getHeight();
+	
+	area.setStyle({ height: (height - offset*2) + "px" });
+	comment.setStyle({ height: (height - offset) + "px" });
+	
+	return true;
+}
+
 function onPopupRecurrenceWindow(event) {
   if (event)
     preventDefault(event);

UI/WebServerResources/UIxTaskEditor.css

@@ -25,10 +25,7 @@ LABEL#commentArea
 { height: 15em; }
 
 LABEL#commentArea textarea
-{ padding: 0;
-  margin: 0;
-  width: 380px;
-  height: 15em; }
+{ height: 15em; }
 
 SPAN.checkBoxList#participantsCB
 { height: 7em; }