? calendar-views.zip
? chrome
? chrome.manifest
? defaults
? install.rdf
? base/content/calendar-multiday-column.xml
? base/themes/common/calendar-day-label-back-vertical.png
? base/themes/common/calendar-day-label-back.png
? base/themes/winstripe/calendar-views-cj.css
? lightning/content/lightning-widgets.xml
Index: base/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/calendar/base/jar.mn,v
retrieving revision 1.1.2.59
diff -u -8 -p -r1.1.2.59 jar.mn
--- base/jar.mn 10 Jul 2008 11:05:55 -0000 1.1.2.59
+++ base/jar.mn 24 Jul 2008 07:41:53 -0000
@@ -122,24 +122,21 @@ calendar.jar:
skin/classic/calendar/calendar-readOnly.png (themes/common/calendar-readOnly.png)
skin/classic/calendar/event-grippy-bottom.png (themes/common/event-grippy-bottom.png)
skin/classic/calendar/event-grippy-left.png (themes/common/event-grippy-left.png)
skin/classic/calendar/event-grippy-right.png (themes/common/event-grippy-right.png)
skin/classic/calendar/event-grippy-top.png (themes/common/event-grippy-top.png)
skin/classic/calendar/gradient-overlay.png (themes/common/gradient-overlay.png)
skin/classic/calendar/calendar-overlay.png (themes/common/calendar-overlay.png)
skin/classic/calendar/category-overlay.png (themes/common/category-overlay.png)
- skin/classic/calendar/shadow-bottom.png (themes/common/shadow-bottom.png)
- skin/classic/calendar/shadow-edge-left.png (themes/common/shadow-edge-left.png)
- skin/classic/calendar/shadow-edge-right.png (themes/common/shadow-edge-right.png)
- skin/classic/calendar/shadow-left.png (themes/common/shadow-left.png)
- skin/classic/calendar/shadow-right.png (themes/common/shadow-right.png)
skin/classic/calendar/unifinder-images.png (themes/common/unifinder-images.png)
skin/classic/calendar/day-box-item-image.png (themes/common/day-box-item-image.png)
skin/classic/calendar/widgets/nav-buttons.png (themes/common/widgets/nav-buttons.png)
+ skin/classic/calendar/calendar-day-label-back.png (themes/common/calendar-day-label-back.png)
+ skin/classic/calendar/calendar-day-label-back-vertical.png (themes/common/calendar-day-label-back-vertical.png)
skin/classic/calendar/widgets/view-navigation.png (themes/common/widgets/view-navigation.png)
skin/classic/calendar/mini-day-background.png (themes/common/mini-day-background.png)
#expand skin/classic/calendar/sun-calendar-event-dialog.css (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog.css)
#expand skin/classic/calendar/sun-calendar-event-dialog-attendees.png (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog-attendees.png)
#expand skin/classic/calendar/sun-calendar-event-dialog-toolbar.png (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog-toolbar.png)
#expand skin/classic/calendar/sun-calendar-event-dialog.png (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog.png)
#expand skin/classic/calendar/timezone_0h.png (/calendar/prototypes/themes/__THEME__/timezone_0h.png)
#expand skin/classic/calendar/timezone_1h.png (/calendar/prototypes/themes/__THEME__/timezone_1h.png)
Index: base/content/calendar-month-view.xml
===================================================================
RCS file: /cvsroot/mozilla/calendar/base/content/calendar-month-view.xml,v
retrieving revision 1.5.2.108
diff -u -8 -p -r1.5.2.108 calendar-month-view.xml
--- base/content/calendar-month-view.xml 10 Jul 2008 11:10:24 -0000 1.5.2.108
+++ base/content/calendar-month-view.xml 24 Jul 2008 07:41:53 -0000
@@ -50,17 +50,16 @@
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
-
-
-
-
+
null
[]
null
Index: base/content/calendar-multiday-view.xml
===================================================================
RCS file: /cvsroot/mozilla/calendar/base/content/calendar-multiday-view.xml,v
retrieving revision 1.37.2.144
diff -u -8 -p -r1.37.2.144 calendar-multiday-view.xml
--- base/content/calendar-multiday-view.xml 10 Jul 2008 11:14:26 -0000 1.37.2.144
+++ base/content/calendar-multiday-view.xml 24 Jul 2008 07:41:54 -0000
@@ -137,17 +137,17 @@
if (!orient) orient = "horizontal";
if (orient == "vertical") otherorient = "horizontal";
//dump ("calendar-time-bar: orient: " + orient + " other: " + otherorient + "\n");
function makeTimeBox(timestr, size) {
var box = createXULElement("box");
box.setAttribute("orient", orient);
-
+
if (orient == "horizontal") {
box.setAttribute("width", size);
} else {
box.setAttribute("height", size);
}
var label = createXULElement("label");
label.setAttribute("class", "calendar-time-bar-label");
@@ -211,40 +211,35 @@
-
+
-
-
-
-
-
+
null
top
false
@@ -805,17 +800,16 @@
chunkBox.setAttribute("context", this.getAttribute("item-context") || this.getAttribute("context"));
chunkBox.setAttribute("orient", orient);
innerColumn.appendChild(chunkBox);
chunkBox.calendarView = this.calendarView;
chunkBox.occurrence = chunk.event;
chunkBox.parentColumn = this;
if (minHeight == 0) {
minHeight = getOptimalMinimumHeight(chunkBox.eventNameLabel) +
- getSummarizedStyleValues(document.getAnonymousElementByAttribute(chunkBox, "anonid", "shadow-bottom"), ["height"]) +
getSummarizedStyleValues(document.getAnonymousElementByAttribute(chunkBox, "anonid", "eventbox"), ["margin-bottom", "margin-top"]);
chunkBox.setAttribute("minheight", minHeight);
}
if (minWidth == 0) {
chunkBox.eventNameLabel.setAttribute("style", "min-width: 2em");
minWidth = getOptimalMinimumWidth(chunkBox.eventNameLabel);
chunkBox.setAttribute("minwidth", minWidth);
}
@@ -1945,35 +1939,18 @@
]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
null
@@ -2187,59 +2132,43 @@
if (this.calendarView && this.calendarView.controller) {
event.stopPropagation();
onMouseOverItem(event);
}
]]>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
0
null
[]
null
@@ -3338,52 +3260,48 @@
setUpDayHeaderBox(dayHeaderBox);
if (0 <= this.mDaysOffArray.indexOf(d.weekday)) {
dayEventsBox.dayOff = true;
dayHeaderBox.setAttribute("weekend", "true");
} else {
dayEventsBox.dayOff = false;
dayHeaderBox.removeAttribute("weekend");
+ }
+ var labelbox;
+ if (counter < labelboxkids.length) {
+ labelbox = labelboxkids[counter];
+ labelbox.date = d;
+ } else {
+ labelbox = createXULElement("calendar-day-label");
+ labelbox.setAttribute("orient", otherorient);
+ labeldaybox.appendChild(labelbox);
+ labelbox.date = d;
}
-
// Set attributes for date relations.
if (this.numVisibleDates > 1) {
switch (d.compare(today)) {
case -1:
dayHeaderBox.setAttribute("relation", "past");
dayEventsBox.setAttribute("relation", "past");
+ labelbox.setAttribute("relation", "past");
break;
case 0:
dayHeaderBox.setAttribute("relation", "today");
dayEventsBox.setAttribute("relation", "today");
+ labelbox.setAttribute("relation", "today");
break;
case 1:
dayHeaderBox.setAttribute("relation", "future");
dayEventsBox.setAttribute("relation", "future");
+ labelbox.setAttribute("relation", "future");
break;
}
}
-
- var labelbox;
-
- var df = Components.classes["@mozilla.org/calendar/datetime-formatter;1"].
- getService(Components.interfaces.calIDateTimeFormatter);
- if (counter < labelboxkids.length) {
- labelbox = labelboxkids[counter];
- labelbox.date = d;
- labelbox.shortWeekNames = false;
- } else {
- labelbox = createXULElement("calendar-day-label");
- labelbox.setAttribute("flex", "1");
- labeldaybox.appendChild(labelbox);
-
- labelbox.date = d;
- labelbox.shortWeekNames = false;
- }
+
maxDayWidth = Math.max(maxDayWidth, labelbox.longWeekdayPixels);
// We don't want to actually mess with our original dates, plus
// they're likely to be immutable.
var d2 = d.clone();
d2.isDate = true;
d2.makeImmutable();
this.mDateColumns.push ( { date: d2, column: dayEventsBox, header: dayHeaderBox } );
@@ -3421,16 +3339,32 @@
for each (var col in this.mDateColumns) {
if (col.date.compare(aDate) == 0)
return col;
}
return null;
]]>