From 20f23f60bb30916bedea91bdf2556c9b58380730 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Sat, 13 Feb 2010 16:57:39 +0000
Subject: [PATCH] Monotone-Parent: c7902ca79ab1fa5240ba208b293adef99e330d88
 Monotone-Revision: 6e5e04b64e7ab43a669ba1a00625f1cc6919f00e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-13T16:57:39
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                             |  7 +++++
 UI/WebServerResources/SchedulerUI.css | 39 +++++++++++++++------------
 UI/WebServerResources/SchedulerUI.js  | 20 +++++++-------
 UI/WebServerResources/iefixes.css     |  7 -----
 4 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aeef50ee1..840d53d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js (attachDragControllers): we
+	only attach handlers to subnodes of #calendarHeader DIV.days, not
+	..DIV.dayLabels.
+	(adjustCalendarHeaderDIV): adapted for IE.
+
 2010-02-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalMonthView.m (-currentDayId): new method.
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 9c6d0a8bc..255f46373 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -59,8 +59,8 @@ UL#tasksList, UL#calendarList
   background-color: #CCDDEC;
   list-style-type: none;
   list-style-image: none;
-  overflow: auto;
-  overflow-x: hidden; }
+  overflow: hidden;
+  overflow-y: auto; }
 
 UL#calendarList
 { clear: left;
@@ -478,11 +478,28 @@ DIV.eventView
 
 /* new draggable presentation */
 
-DIV#daysView DIV.days
+DIV#daysView DIV.hours
 { position: absolute;
   top: 0px;
-  left: 50px;
-  right: 0px; }
+  left: 0px;
+  height: 960px;
+  width: 50px; }
+
+DIV#daysView DIV.hour
+{ position: relative;
+  left: 0px;
+  top: 0px;
+  padding-top: 2px;
+  padding-right: 2px;
+  text-align: right;
+  right: 0px;
+  height: 37px;
+  font-weight: bold;
+  border-bottom: 1px solid #ccc; }
+
+DIV#daysView DIV.days
+{ position: relative;
+  margin-left: 50px; }
 
 DIV.multicolumnDayView DIV.lastDayUser
 { border-right: 1px solid #ccc; }
@@ -669,18 +686,6 @@ DIV.monthView DIV.day6,
 DIV.daysViewFor7Days DIV.day6
 { left: 85.7142%; }
 
-DIV#daysView DIV.hour
-{ position: relative;
-  left: 0px;
-  top: 0px;
-  padding-top: 2px;
-  padding-right: 2px;
-  text-align: right;
-  width: 48px;
-  height: 37px;
-  font-weight: bold;
-  border-bottom: 1px solid #ccc; }
-
 /* "left" and "width" for #daysView DIV.event are computed in JS code */
 #daysView DIV.event
 { cursor: default;
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 9933f80b9..ab4d516d1 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1376,7 +1376,7 @@ function newMonthEventDIV(eventRep, event) {
 }
 
 function attachDragControllers(contentView) {
-    var dayNodes = contentView.select("DIV.day");
+    var dayNodes = contentView.select("DIV.days DIV.day");
     for (var j = 0; j < dayNodes.length; j++) {
         var dayNode = dayNodes[j];
         if (dayNode.hasClassName("day")) {
@@ -1397,11 +1397,16 @@ function adjustCalendarHeaderDIV() {
         var delta = ch.clientWidth - dv.clientWidth - 1;
         var styleElement = document.createElement("style");
         styleElement.type = "text/css";
-        var styleText = ("DIV#calendarHeader DIV.dayLabels,"
-                         + " DIV#calendarHeader DIV.days"
-                         + " { "
-                         + "right: " + delta + "px; }");
-        styleElement.appendChild(document.createTextNode(styleText));
+        var selectors = ["DIV#calendarHeader DIV.dayLabels",
+                         "DIV#calendarHeader DIV.days"];
+        var rule = ("{ right: " + delta + "px; }");
+        if (styleElement.styleSheet && styleElement.styleSheet.addRule) {
+            styleElement.styleSheet.addRule(selectors[0], rule);
+            styleElement.styleSheet.addRule(selectors[1], rule);
+        } else {
+            var styleText = selectors.join(",") + " " + rule;
+            styleElement.appendChild(document.createTextNode(styleText));
+        }
         document.getElementsByTagName("head")[0].appendChild(styleElement);
         calendarHeaderAdjusted = true;
     }
@@ -2531,9 +2536,6 @@ function initCalendars() {
         $("uploadOK").observe("click", hideImportResults);
     }
 
-    if (Prototype.Browser.IE)
-        calendarHeaderAdjusted = true;
-
     onWindowResize.defer();
     Event.observe(window, "resize", onWindowResize);
 }
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 2453e6326..41b672816 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -58,13 +58,6 @@ TD.mailer_fieldname
 
 /* SchedulerUI */
 
-DIV#calendarHeader DIV.dayLabels,
-DIV#calendarHeader DIV.days
-{ right: 16px; /* the width of the scrollbar on Windows */ }
-
-DIV#daysView DIV.days
-{ margin-right: 17px; }
-
 DIV.event > DIV.eventInside
 { filter: alpha(opacity=100); }