From 96b00f426c659d1f1f4ee177b897987319dc40ec Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 6 Nov 2007 22:34:42 +0000
Subject: [PATCH] Monotone-Parent: d20b6efa6a8c415c1db8ca849c311e740a312646
 Monotone-Revision: 5d08c3e624999be469da2fd6046209e122529287

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-06T22:34:42
Monotone-Branch: ca.inverse.sogo
---
 .../ContactsUI/UIxContactsFilterPanel.wox     |  3 ++
 UI/WebServerResources/ContactsUI.js           |  5 ++-
 UI/WebServerResources/SchedulerUI.js          | 39 ++++++++-----------
 UI/WebServerResources/generic.css             |  3 ++
 UI/WebServerResources/generic.js              |  2 +-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
index 8f771deda..046ae8599 100644
--- a/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
+++ b/UI/Templates/ContactsUI/UIxContactsFilterPanel.wox
@@ -5,6 +5,9 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
+    <span id="toolbar">
+    </span>
+
     <div class="menu" id="searchMenu">
       <ul id="searchOptions" class="choiceMenu">
         <li id="name_or_address"><var:string
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index dc2a9a021..e5c3d160c 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -333,6 +333,9 @@ function onToolbarWriteToSelectedContacts(event) {
   var rows = contactsList.getSelectedRowsId();
   var rowsWithEmail = 0;
 
+  if (rows.length == 0)
+    return false;
+
   for (var i = 0; i < rows.length; i++) {
     var emailCell = $(rows[i]).down('td', 1);
     if (emailCell.firstChild) { // .nodeValue is the contact email address
@@ -341,7 +344,7 @@ function onToolbarWriteToSelectedContacts(event) {
 			    + "/" + rows[i] + "/write");
     }
   }
-  
+
   if (rowsWithEmail == 0) {
     window.alert(labels["The selected contact has no email address."]);
   }
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 361c0708d..f06a601e0 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1485,28 +1485,23 @@ function appendCalendar(folderName, folderPath) {
     
     // Update CSS for events color
     if (!document.styleSheets) return;
-    var theRules = new Array();
-    var lastSheet = document.styleSheets[document.styleSheets.length - 1];
-    if (lastSheet.insertRule) { // Mozilla
-      lastSheet.insertRule('.calendarFolder' + folderPath.substr(1) + ' {'
-			   + ' background-color: '
-			   + color
-			   + ' !important; }', 0);
-      lastSheet.insertRule('div.colorBox.calendarFolder' + folderPath.substr(1) + ' {'
-			   + ' color: '
-			   + color
-			   + ' !important; }', 0);
-    }
-    else { // IE
-      lastSheet.addRule('.calendarFolder' + folderPath.substr(1),
-			' background-color: '
-			+ color
-			+ ' !important; }');
-      lastSheet.addRule('div.colorBox.calendarFolder' + folderPath.substr(1),
-			' color: '
-			+ color
-			+ ' !important; }');
-    }
+    
+    var styleElement = document.createElement("style");
+    styleElement.type = "text/css";
+    var selectors = [
+		     '.calendarFolder' + folderPath.substr(1),
+		     'div.colorBox.calendarFolder' + folderPath.substr(1)
+		     ];
+    var rules = [
+		 ' { background-color: ' + color + ' !important; }',
+		 ' { color: ' + color + ' !important; }'
+		 ];
+    for (var i = 0; i < rules.length; i++)
+      if (styleElement.styleSheet && styleElement.styleSheet.addRule)
+	styleElement.styleSheet.addRule(selectors[i], rules[i]); // IE
+      else
+	styleElement.appendChild(document.createTextNode(selectors[i] + rules[i])); // Mozilla _+ Safari
+    document.getElementsByTagName("head")[0].appendChild(styleElement);
   }
 }
 
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 39dc38ddb..2f742cacf 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -33,6 +33,9 @@ IMG#progressIndicator
   margin-top: 1.5em;
   margin-right: 1em; }
 
+SPAN#toolbar IMG#progressIndicator
+{ margin-top: 0.75em; }
+
 DIV#pageContent
 { clear: both; }
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 5103916e3..197ecf544 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -284,7 +284,7 @@ function triggerAjaxRequest(url, callback, userdata) {
   var http = createHTTPClient();
 
   activeAjaxRequests += 1;
-  document.animTimer = setTimeout("checkAjaxRequestsState();", 200);
+  document.animTimer = setTimeout("checkAjaxRequestsState();", 50);
   //url = appendDifferentiator(url);
 
   if (http) {