Merge to 2.0.3 (again)

ChangeLog

@@ -1,3 +1,40 @@
+commit 99669f2d5c1c32c4753a47edf12de9c6a5beb94f
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Dec 6 13:05:54 2012 -0500
+
+    Fix dynamic CSS in IE8
+    
+    When adding a calendar or subscribing to a calendar, the dynamic CSS was
+    not properly applied in IE8. This new technique seems to fix all cases.
+
+M	UI/WebServerResources/SchedulerUI.js
+
+commit 128368f66c979e7a59ffaba8519d93f45338a7ab
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Dec 6 13:03:10 2012 -0500
+
+    Fix search when accessing users folders
+
+M	UI/WebServerResources/UIxContactsUserFolders.css
+M	UI/WebServerResources/UIxContactsUserFolders.js
+
+commit 7c7989065c095efe14486856b70d51b61cae88d2
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Dec 6 13:02:06 2012 -0500
+
+    prototype.js: Fix handling of opacity in IE
+
+M	UI/WebServerResources/prototype.js
+
+commit f1413121957f66d546e29c709507d14a5a809e9d
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Dec 6 10:36:11 2012 -0500
+
+    Update ChangeLog
+
+M	ChangeLog
+M	NEWS
+
 commit 2a5e0aeaa96920752ba88be91f31eab4a92dafe9
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Thu Dec 6 10:32:31 2012 -0500

UI/WebServerResources/SchedulerUI.js

@@ -3096,21 +3096,15 @@ function appendStyleElement(folderPath, color) {
         var fgColor = getContrastingTextColor(color);
         var styleElement = document.createElement("style");
         styleElement.type = "text/css";
-        var selectors = [
-                         'DIV.calendarFolder' + folderPath.substr(1),
-                         'LI.calendarFolder' + folderPath.substr(1),
-                         'UL#calendarList DIV.calendarFolder' + folderPath.substr(1)
-                         ];
-        var rules = [
-                     ' { background-color: ' + color + ' !important;' + ' color: ' + fgColor + ' !important; }',
-                     ' { background-color: ' + color + ' !important;' + ' color: ' + fgColor + ' !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
+
+        var styles = ' .calendarFolder' + folderPath.substr(1)
+            + ' { background-color: ' + color + ' !important;' + ' color: ' + fgColor + ' !important; }'
+            + ' div.colorBox.calendarFolder' + folderPath.substr(1)
+            + ' { color: ' + color + ' !important; }';
+
+        if (styleElement.styleSheet) styleElement.styleSheet.cssText = styles; // IE
+        else styleElement.appendChild(document.createTextNode(styles));        // Mozilla + Webkit
+
         document.getElementsByTagName("head")[0].appendChild(styleElement);
     }
 }

UI/WebServerResources/UIxContactsUserFolders.css

@@ -1,4 +1,4 @@
-DIV#filterPanel
+DIV.filterPanel
 { position: absolute;
   text-align: center;
   width: auto;

UI/WebServerResources/UIxContactsUserFolders.js

@@ -1,7 +1,7 @@
 var d;
 
-function onSearchFormSubmit() {
-    var searchValue = $("searchValue");
+function onSearchFormSubmit(filterPanel) {
+    var searchValue = filterPanel.down('[name="search"]');
     var encodedValue = encodeURI(searchValue.value);
 
     if (encodedValue.blank()) {
@@ -15,7 +15,7 @@ function onSearchFormSubmit() {
             document.userFoldersRequest.abort();
         }
 	if (encodedValue.trim().length > minimumSearchLength) {
-	    startAnimation($("pageContent"), $("filterPanel"));
+	    startAnimation($("pageContent"), filterPanel);
             document.userFoldersRequest
                 = triggerAjaxRequest(url, usersSearchCallback);
 	}
@@ -93,14 +93,14 @@ function buildUsersTree(treeDiv, response) {
         for (var i = 0; i < response.length; i++) {
             if (!isUserDialog) {
                 var toggle = $("tgd" + (1 + i * 2));
-                toggle.observe ("click", onUserNodeToggle);
+                toggle.on("click", onUserNodeToggle);
             }
             var sd = $("sd" + (1 + i * multiplier));
-            sd.observe("click", onTreeItemClick);
+            sd.on("click", onTreeItemClick);
         }
     }
     else {
-        $("searchValue").addClassName("notfound");
+        $$('[name="searchValue"]').first().addClassName("notfound");
     }
 }
 
@@ -160,14 +160,14 @@ function foldersSearchCallback(http) {
             //dd.update(str);
             for (var i = 1; i < folders.length; i++) {
                 var sd = $("sd" + (nodeId + i));
-                sd.observe("click", onTreeItemClick);
+                sd.on("click", onTreeItemClick);
             }
         }
         else {
             dd.innerHTML = '';
             dd.appendChild(addFolderNotFoundNode (d, nodeId, null));
             var sd = $("sd" + (nodeId + 1));
-            sd.observe("click", onTreeItemClick);
+            sd.on("click", onTreeItemClick);
         }
 
         d.aIndent.pop();
@@ -241,7 +241,7 @@ function onConfirmFolderSelection(event) {
 function onFolderSearchKeyDown(event) {
     if (event.keyCode == Event.KEY_BACKSPACE
         || IsCharacterKey(event.keyCode)) {
-        $("searchValue").removeClassName("notfound");
+        $(this).removeClassName("notfound");
         var div = $("folders");
         if (!div.clean) {
             var oldD = $("d"); // the folders tree
@@ -256,11 +256,11 @@ function onFolderSearchKeyDown(event) {
 }
 
 function initUserFoldersWindow() {
-    var searchValue = $("searchValue");
-    searchValue.observe("keydown", onFolderSearchKeyDown);
+    var searchValue = $$('[name="search"]').first();
+    searchValue.on("keydown", onFolderSearchKeyDown);
 
-    $("addButton").observe("click", onConfirmFolderSelection);
-    $("doneButton").observe("click", onCloseButtonClick);
+    $("addButton").on("click", onConfirmFolderSelection);
+    $("doneButton").on("click", onCloseButtonClick);
 
     searchValue.focus();
 }

UI/WebServerResources/prototype.js

@@ -3157,7 +3157,7 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
     var filter = Element.getStyle(element, 'filter');
     if (filter.length === 0) return 1.0;
     var match = (filter || '').match(/alpha\(opacity=(.*)\)/);
-    if (match[1]) return parseFloat(match[1]) / 100;
+    if (match && match[1]) return parseFloat(match[1]) / 100;
     return 1.0;
   }