merge of '1a11794c7fbd8ad9ba3eff5fdc2d1716a84efb62'

and '50142b417b19ad36d3c63bd36b61105185f0efc0'

Monotone-Parent: 1a11794c7fbd8ad9ba3eff5fdc2d1716a84efb62
Monotone-Parent: 50142b417b19ad36d3c63bd36b61105185f0efc0
Monotone-Revision: 5b2bc8f17ae0dbc785abcc143ebf3cd49d100698

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2011-02-17T20:05:14
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,4 @@
+<<<<<<< variant A
 2011-02-15  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
@@ -6,6 +7,15 @@
 	SOGoEnableEMailAlarms was set to YES prior doing this.
 	This fixes bug #1079.
 
+>>>>>>> variant B
+2011-02-16  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow):
+	fixed a bug with IE8 that would not set the "checked" attribute
+	properly on a checkbox.
+
+####### Ancestor
+======= end
 2011-02-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxDatePicker.m

UI/WebServerResources/UIxPreferences.js

@@ -220,9 +220,9 @@ function appendSieveFilterRow(filterTable, number, filter) {
 
     var activeColumn = createElement("td", null, "activeColumn");
     var cb = createElement("input", null, "checkBox",
-                           { checked: filter.active,
-                             type: "checkbox" },
+                           { type: "checkbox" },
                            null, activeColumn);
+    cb.checked = filter.active;
     var bound = onScriptActiveCheck.bindAsEventListener(cb);
     cb.observe("click", bound);
     row.appendChild(activeColumn);

UI/WebServerResources/iefixes.css

@@ -189,3 +189,10 @@ DIV#uploadResults P
 { margin: 5px;
   padding: 0; }
 
+/* UIxPreferences */
+
+DIV#filtersListWrapper
+{ overflow-x: hidden; }
+
+TABLE#filtersList
+{ width: auto; }