Monotone-Parent: c7902ca79ab1fa5240ba208b293adef99e330d88

Monotone-Revision: 6e5e04b64e7ab43a669ba1a00625f1cc6919f00e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-13T16:57:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-02-13 16:57:39 +00:00
parent 91337107be
commit 20f23f60bb
4 changed files with 40 additions and 33 deletions
+7
View File
@@ -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.
+22 -17
View File
@@ -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;
+11 -9
View File
@@ -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);
}
-7
View File
@@ -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); }