diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/content/today-pane.js ./mozilla/calendar/base/content/today-pane.js
--- ./mozilla_ref/calendar/base/content/today-pane.js 2007-07-19 19:19:27.040829000 +0200
+++ ./mozilla/calendar/base/content/today-pane.js 2007-07-27 15:15:34.866052000 +0200
@@ -60,18 +60,18 @@ var TodayPane = {
if (addToolbarbutton) {
var currentSetString = mailToolbar.getAttribute("currentset");
if (currentSetString.indexOf(this.stodaypaneButton) == -1) {
this.addButtonToToolbarset();
}
todaypanebox.setAttribute("addtoolbarbutton", "false");
}
- var agendaPanel = document.getElementById("agenda-groupbox");
- var todoPanel = document.getElementById("todo-groupbox");
+ var agendaPanel = document.getElementById("agenda-box");
+ var todoPanel = document.getElementById("todo-box");
if (agendaPanel.hasAttribute("collapsed")) {
if (!todoPanel.hasAttribute("collapsed")) {
this.CurrentPaneView = 1;
}
else{
dump("Cannot display todaypane with both subpanes collapsed");
}
}
@@ -93,25 +93,30 @@ var TodayPane = {
todayMenuItem.setAttribute("key", "todaypanekey");
todayMenuItem.setAttribute("persist", "checked");
todayMenuItem.setAttribute("label", todaylabel);
todayMenuItem.setAttribute("checked", false);
var messagePaneMenu = document.getElementById("menu_MessagePaneLayout");
var messagePanePopupMenu = messagePaneMenu.firstChild;
messagePanePopupMenu.appendChild(todayMenuItem);
updateTodayPaneDisplay();
- var todayPaneCommand = document.getElementById('cmd_toggleTodayPane')
var bchecked = !todaypanebox.hasAttribute("collapsedinMailMode");
todayMenuItem.setAttribute("checked", bchecked);
var toolbar = document.getElementById(this.stodaypaneButton);
if (toolbar != null) {
toolbar.setAttribute("checked", bchecked);
}
+ PanePeriod.init();
+ var date = createDateTime();
+ date.jsDate = new Date();
+ date.isDate = true;
+ date = date.getInTimezone(calendarDefaultTimezone());
+ scheduleMidnightUpdate(refreshUIBits);
},
-
+
addButtonToDefaultset: function(toolbarSetString)
{
var mailToolbar = getMailBar();
var elementcount = mailToolbar.childNodes.length;
var buttonisWithinSet = false;
// by default the todaypane-button is to be placed before the first
// separator of the toolbar
for (var i = 0; i < elementcount; i++) {
@@ -173,18 +178,18 @@ var TodayPane = {
this.CurrentPaneView = this.CurrentPaneView + aCycleForward;
var nViewLen = this.paneViews.length;
if (this.CurrentPaneView >= nViewLen) {
this.CurrentPaneView = 0;
}
else if (this.CurrentPaneView == -1) {
this.CurrentPaneView = nViewLen -1;
}
- var agendapanel = document.getElementById("agenda-groupbox");
- var todopanel = document.getElementById("todo-groupbox");
+ var agendapanel = document.getElementById("agenda-box");
+ var todopanel = document.getElementById("todo-box");
var todayheader = document.getElementById("today-header");
todayheader.setAttribute("value", this.paneViews[this.CurrentPaneView]);
switch (this.CurrentPaneView) {
case 0:
_collapsePanel(agendapanel, false);
_collapsePanel(todopanel, false);
document.getElementById("today-pane-splitter").removeAttribute("hidden");
break;
@@ -194,25 +199,50 @@ var TodayPane = {
document.getElementById("today-pane-splitter").setAttribute("hidden", "true");
break;
case 2:
_collapsePanel(agendapanel, false);
_collapsePanel(todopanel, true);
document.getElementById("today-pane-splitter").setAttribute("hidden", "true");
break;
}
+ },
+
+ setDay: function(date)
+ {
+ var daylabel = document.getElementById("lbldateValue");
+ daylabel.value = date.day;
+
+ var weekdaylabel = document.getElementById("weekdayNameContainer");
+ weekdaylabel.selectedIndex = date.weekday;
+
+ var monthnamedeck = document.getElementById("monthNameContainer");
+ monthnamedeck.selectedIndex = date.month;
+
+ var selMonthPanel = monthnamedeck.selectedPanel;
+ selMonthPanel.setAttribute("year", date.year);
+ selMonthPanel.setAttribute("calweek", Math.ceil(date.yearday/7));
+ selMonthPanel.update();
}
+
};
function loadTodayPane() {
TodayPane.onLoad();
}
window.addEventListener("load", loadTodayPane, false);
+function createNewEvent()
+{
+ var index = document.getElementById("calendarTree").currentIndex;
+ var calendar = getCalendars()[index];
+ createEventWithDialog(calendar, PanePeriod.start, PanePeriod.start);
+}
+
function updateTodayPaneDisplay() {
var deck = document.getElementById("displayDeck");
var id = null;
try { id = deck.selectedPanel.id } catch (e) { }
if (id == "calendar-view-box") {
// we collapse the todaypane but don't not affect the
// attribute "collapsedinMailMode". Therefor this function is only to be used
@@ -233,8 +263,62 @@ function updateTodayPaneDisplay() {
document.getElementById('cmd_toggleTodayPane').removeAttribute("disabled");
}
}
document.getElementById("displayDeck").
addEventListener("select", updateTodayPaneDisplay, true);
+
+// Called at midnight to tell us to redraw the panes
+function refreshUIBits() {
+ PanePeriod.advance(1);
+}
+
+
+var PanePeriod = {
+ start: null,
+ end: null,
+};
+
+
+PanePeriod.init =
+function init(newdate)
+{
+ var d = new CalDateTime();
+ if (newdate != null) {
+ if (newdate instanceof Date) {
+ d.jsDate = newdate;
+ }
+ }
+ else{
+ // get the current time
+ d.jsDate = new Date();
+ }
+ d = d.getInTimezone(calendarDefaultTimezone());
+ d.hour = d.minute = d.second = 0;
+ this.start = d.clone();
+ d.hour = d.minute = d.second = 0;
+ d.day++;
+ d.normalize();
+ this.end = d.clone();
+ this.start.normalize();
+ this.end.normalize();
+ TodayPane.setDay(this.start);
+}
+
+PanePeriod.advance =
+function advance(dir)
+{
+ this.start.day += dir;
+ this.end.day += dir;
+ this.start.normalize();
+ this.end.normalize();
+ TodayPane.setDay(this.start);
+}
+
+
+PanePeriod.dateToMinimonth =
+function dateToMinimonth()
+{
+ document.getElementById("todayMinimonth").update(PanePeriod.start.jsDate);
+}
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/content/today-pane.xml ./mozilla/calendar/base/content/today-pane.xml
--- ./mozilla_ref/calendar/base/content/today-pane.xml 1970-01-01 01:00:00.000000000 +0100
+++ ./mozilla/calendar/base/content/today-pane.xml 2007-07-26 01:29:45.432850000 +0200
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ calGetString("calendar", "shortcalendarweek")
+
+
+
+
+
+
+
+
+
+
+
+
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/content/today-pane.xul ./mozilla/calendar/base/content/today-pane.xul
--- ./mozilla_ref/calendar/base/content/today-pane.xul 2007-07-19 19:19:32.512646000 +0200
+++ ./mozilla/calendar/base/content/today-pane.xul 2007-07-27 15:26:37.627974000 +0200
@@ -38,49 +38,108 @@
-->
%dtd1;
%dtd2;
%dtd3;
%dtd4;
+ %dtd5;
]>
-
+
-
-
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/jar.mn ./mozilla/calendar/base/jar.mn
--- ./mozilla_ref/calendar/base/jar.mn 2007-07-19 19:19:52.548404000 +0200
+++ ./mozilla/calendar/base/jar.mn 2007-07-25 17:04:40.911664000 +0200
@@ -18,16 +18,17 @@ calendar.jar:
content/calendar/calendar-dialog-utils.js (content/calendar-dialog-utils.js)
content/calendar/calendar-event-dialog.css (content/calendar-event-dialog.css)
content/calendar/calendar-event-dialog.js (content/calendar-event-dialog.js)
content/calendar/calendar-event-dialog.xul (content/calendar-event-dialog.xul)
content/calendar/calendar-item-editing.js (content/calendar-item-editing.js)
content/calendar/calendar-month-view.xml (content/calendar-month-view.xml)
content/calendar/calendar-multiday-view.xml (content/calendar-multiday-view.xml)
content/calendar/today-pane.xul (content/today-pane.xul)
+ content/calendar/today-pane.xml (content/today-pane.xml)
content/calendar/today-pane.js (content/today-pane.js)
content/calendar/calendar-minimonth-busy.js (content/calendar-minimonth-busy.js)
content/calendar/calendar-recurrence-dialog.js (content/calendar-recurrence-dialog.js)
content/calendar/calendar-recurrence-dialog.xul (content/calendar-recurrence-dialog.xul)
content/calendar/calendar-view-bindings.css (content/calendar-view-bindings.css)
content/calendar/calendar-view-core.xml (content/calendar-view-core.xml)
content/calendar/calendar-views.js (content/calendar-views.js)
content/calendar/calUtils.js (src/calUtils.js)
@@ -51,18 +52,22 @@ calendar.jar:
% skin calendar classic/1.0 %skin/classic/calendar/
#expand skin/classic/calendar/cal-icon32.png (themes/__THEME__/cal-icon32.png)
#expand skin/classic/calendar/calendar-toolbar.css (themes/__THEME__/calendar-toolbar.css)
#expand skin/classic/calendar/today-pane.css (themes/__THEME__/today-pane.css)
#expand skin/classic/calendar/calendar-views.css (themes/__THEME__/calendar-views.css)
#expand skin/classic/calendar/toolbar-large.png (themes/__THEME__/toolbar-large.png)
#expand skin/classic/calendar/toolbar-small.png (themes/__THEME__/toolbar-small.png)
#expand skin/classic/calendar/mode-switch-icons.png (themes/__THEME__/mode-switch-icons.png)
+#expand skin/classic/calendar/today-toolbar-large.png (themes/__THEME__/today-toolbar-large.png)
+#expand skin/classic/calendar/today-toolbar-small.png (themes/__THEME__/today-toolbar-small.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/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/mini-day-nav-buttons.png (themes/common/mini-day-nav-buttons.png)
+ skin/classic/calendar/mini-day-background.png (themes/common/mini-day-background.png)
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/themes/pinstripe/calendar-toolbar.css ./mozilla/calendar/base/themes/pinstripe/calendar-toolbar.css
--- ./mozilla_ref/calendar/base/themes/pinstripe/calendar-toolbar.css 2007-07-19 19:20:03.206208000 +0200
+++ ./mozilla/calendar/base/themes/pinstripe/calendar-toolbar.css 2007-07-23 15:03:54.690121000 +0200
@@ -164,33 +164,35 @@ toolbar[iconsize="small"] #calendar-go-t
/*--------------------------------------------------------------------
* Show Today-Pane button
*-------------------------------------------------------------------*/
#calendar-show-todaypane-button {
- -moz-image-region: rect(0px 544px 32px 512px);
+ list-style-image: url("chrome://calendar/skin/today-toolbar-large.png");
+ -moz-image-region: rect(0px 32px 32px 0px);
}
#calendar-show-todaypane-button:active {
- -moz-image-region: rect(32px 544px 64px 512px);
+ -moz-image-region: rect(32px 32px 64px 0px);
}
#calendar-show-todaypane-button[disabled="true"] {
- -moz-image-region: rect(64px 544px 96px 512px);
+ -moz-image-region: rect(64px 32px 96px 0px);
}
toolbar[iconsize="small"] #calendar-show-todaypane-button {
- -moz-image-region: rect(0px 408px 24px 384px);
+ list-style-image: url("chrome://calendar/skin/today-toolbar-small.png");
+ -moz-image-region: rect(0px 24px 24px 0px);
}
toolbar[iconsize="small"] #calendar-show-todaypane-button:active {
- -moz-image-region: rect(24px 408px 48px 384px);
+ -moz-image-region: rect(24px 24px 48px 0px);
}
toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"] {
- -moz-image-region: rect(48px 408px 72px 384px);
+ -moz-image-region: rect(48px 24px 72px 0px);
}
/*--------------------------------------------------------------------
* Button: "Choose Date"
*-------------------------------------------------------------------*/
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/themes/pinstripe/today-pane.css ./mozilla/calendar/base/themes/pinstripe/today-pane.css
--- ./mozilla_ref/calendar/base/themes/pinstripe/today-pane.css 2007-07-19 19:20:16.888951000 +0200
+++ ./mozilla/calendar/base/themes/pinstripe/today-pane.css 2007-07-27 16:05:25.572277000 +0200
@@ -29,16 +29,108 @@
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
+.miniday-monthdisplay {
+ -moz-binding: url("chrome://calendar/content/today-pane.xml#miniday-monthdisplay");
+}
+
+.today-subpane {
+ padding:0px;
+ border: 1px solid ThreeDShadow;
+ margin: 5px;
+}
+
+.today-header {
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
+#agenda-label {
+ vertical-align: middle;
+}
+
#today-pane-box {
background-color: -moz-Dialog;
border-left: 1px solid ThreeDShadow;
}
-.today-groupbox {
- -moz-border-radius: 0px !important;
+#mini-day-image {
+ list-style-image: url("chrome://calendar/skin/mini-day-background.png");
+}
+
+#mini-day-box {
+ background-color: white;
+}
+
+#weekdayNameContainer {
+ font-family: Trebuchet MS, Lucida Grande, Arial, Helvetica;
+ padding-top: 4px;
+ font-weight: bold;
+ font-size: 18px;
+}
+
+#miniday-dropdown-button {
+ margin: 2px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+#monthlabel {
+ margin-right: 0px;
+}
+
+.dateValue {
+ font-family: Arial, Helvetica, Trebuchet MS, Lucida Grande, sans-serif;
+ margin-top: 0px;
+ padding-top: 0px;
+ font-size: 36px;
+ font-weight: bold;
}
+
+.miniday-nav-buttons {
+ margin: 2px;
+ list-style-image: url("chrome://calendar/skin/mini-day-nav-buttons.png");
+}
+
+.miniday-nav-buttons > .previous-day-button {
+ -moz-image-region: rect(0px 5px 13px 0px);
+}
+
+.miniday-nav-buttons > .previous-day-button:hover,
+.miniday-nav-buttons > .previous-day-button:hover:active {
+ -moz-image-region: rect(13px 5px 26px 0px);
+}
+
+.miniday-nav-buttons > .previous-day-button[disabled] {
+ -moz-image-region: rect(26px 5px 39px 0px);
+}
+
+.miniday-nav-buttons > .today-button {
+ -moz-image-region: rect(0px 16px 13px 5px);
+}
+
+.miniday-nav-buttons > .today-button:hover,
+.miniday-nav-buttons > .today-button:hover:active {
+ -moz-image-region: rect(13px 16px 26px 5px);
+}
+
+.miniday-nav-buttons > .today-button[disabled] {
+ -moz-image-region: rect(26px 16px 39px 5px);
+}
+
+.miniday-nav-buttons > .next-day-button {
+ -moz-image-region: rect(0px 21px 13px 16px);
+}
+.miniday-nav-buttons > .next-day-button:hover,
+.miniday-nav-buttons > .next-day-button:hover:active {
+ -moz-image-region: rect(13px 21px 26px 16px);
+}
+
+.miniday-nav-buttons > .next-day-button[disabled] {
+ -moz-image-region: rect(26px 21px 39px 16px);
+}
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/themes/winstripe/calendar-toolbar.css ./mozilla/calendar/base/themes/winstripe/calendar-toolbar.css
--- ./mozilla_ref/calendar/base/themes/winstripe/calendar-toolbar.css 2007-07-19 19:20:27.044083000 +0200
+++ ./mozilla/calendar/base/themes/winstripe/calendar-toolbar.css 2007-07-24 12:54:28.045302000 +0200
@@ -211,43 +211,49 @@ toolbar[iconsize="small"] #calendar-go-t
}
/*--------------------------------------------------------------------
* Show TodayPane button
*-------------------------------------------------------------------*/
#calendar-show-todaypane-button {
- -moz-image-region: rect(0px 408px 24px 384px);
+ list-style-image: url("chrome://calendar/skin/today-toolbar-large.png");
+ -moz-image-region: rect(0px 24px 24px 0px);
}
+
+#calendar-show-todaypane-button:hover {
+ -moz-image-region: rect(24px 24px 48px 0px);
+}
+
#calendar-show-todaypane-button[disabled="true"],
#calendar-show-todaypane-button[disabled="true"]:hover,
#calendar-show-todaypane-button[disabled="true"]:hover:active {
- -moz-image-region: rect(48px 408px 72px 384px);
-}
-#calendar-show-todaypane-button:hover {
- -moz-image-region: rect(24px 408px 48px 384px);
+ -moz-image-region: rect(48px 24px 72px 0px);
}
#calendar-show-todaypane-button:hover:active {
}
/*--------------------------------------------------------------------
* Show TodayPane button - small
*-------------------------------------------------------------------*/
toolbar[iconsize="small"] #calendar-show-todaypane-button {
- -moz-image-region: rect(0px 272px 16px 256px);
+ list-style-image: url("chrome://calendar/skin/today-toolbar-small.png");
+ -moz-image-region: rect(0px 16px 16px 0px);
+}
+toolbar[iconsize="small"] #calendar-show-todaypane-button:hover {
+ list-style-image: url("chrome://calendar/skin/today-toolbar-small.png");
+ -moz-image-region: rect(16px 16px 32px 0px);
}
toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"],
toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"]:hover,
toolbar[iconsize="small"] #calendar-show-todaypane-button[disabled="true"]:hover:active {
- -moz-image-region: rect(32px 272px 48px 256px);
-}
-toolbar[iconsize="small"] #calendar-show-todaypane-button:hover {
- -moz-image-region: rect(16px 272px 32px 256px);
+ list-style-image: url("chrome://calendar/skin/today-toolbar-small.png");
+ -moz-image-region: rect(32px 16px 48px 0px);
}
toolbar[iconsize="small"] #calendar-show-todaypane-button:hover:active {
}
/*--------------------------------------------------------------------
* Choose date button
diff -a -U 8 -pN -r ./mozilla_ref/calendar/base/themes/winstripe/today-pane.css ./mozilla/calendar/base/themes/winstripe/today-pane.css
--- ./mozilla_ref/calendar/base/themes/winstripe/today-pane.css 2007-07-19 19:20:34.445317000 +0200
+++ ./mozilla/calendar/base/themes/winstripe/today-pane.css 2007-07-27 15:25:49.336536000 +0200
@@ -30,17 +30,107 @@
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+.miniday-monthdisplay {
+ -moz-binding: url("chrome://calendar/content/today-pane.xml#miniday-monthdisplay");
+}
+
+.today-subpane {
+ padding:0px;
+ border: 1px solid ThreeDShadow;
+ margin: 5px;
+}
+
+.today-header {
+ margin-left: 5px;
+ margin-right: 5px;
+}
+
+#agenda-label {
+ vertical-align: middle;
+}
+
#today-pane-box {
background-color: -moz-Dialog;
border-left: 1px solid ThreeDShadow;
}
-.today-groupbox {
- -moz-border-radius: 0px !important;
+#mini-day-image {
+ list-style-image: url("chrome://calendar/skin/mini-day-background.png");
+}
+
+#mini-day-box {
+ background-color: white;
+}
+
+#weekdayNameContainer {
+ font-family: Trebuchet MS, Lucida Grande, Arial, Helvetica;
+ padding-top: 4px;
+ font-weight: bold;
+ font-size: 18px;
+}
+
+#miniday-dropdown-button {
+ margin: 2px;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+
+#monthlabel {
+ margin-right: 0px;
+}
+
+.dateValue {
+ font-family: Arial, Helvetica, Trebuchet MS, Lucida Grande, sans-serif;
+ margin-top: 0px;
+ padding-top: 0px;
+ font-size: 36px;
+ font-weight: bold;
+}
+
+.miniday-nav-buttons {
+ margin: 2px;
+ list-style-image: url("chrome://calendar/skin/mini-day-nav-buttons.png");
+}
+
+.miniday-nav-buttons > .previous-day-button {
+ -moz-image-region: rect(0px 5px 13px 0px);
+}
+
+.miniday-nav-buttons > .previous-day-button:hover,
+.miniday-nav-buttons > .previous-day-button:hover:active {
+ -moz-image-region: rect(13px 5px 26px 0px);
+}
+
+.miniday-nav-buttons > .previous-day-button[disabled] {
+ -moz-image-region: rect(26px 5px 39px 0px);
+}
+
+.miniday-nav-buttons > .today-button {
+ -moz-image-region: rect(0px 16px 13px 5px);
+}
+
+.miniday-nav-buttons > .today-button:hover,
+.miniday-nav-buttons > .today-button:hover:active {
+ -moz-image-region: rect(13px 16px 26px 5px);
+}
+
+.miniday-nav-buttons > .today-button[disabled] {
+ -moz-image-region: rect(26px 16px 39px 5px);
+}
+
+.miniday-nav-buttons > .next-day-button {
+ -moz-image-region: rect(0px 21px 13px 16px);
+}
+.miniday-nav-buttons > .next-day-button:hover,
+.miniday-nav-buttons > .next-day-button:hover:active {
+ -moz-image-region: rect(13px 21px 26px 16px);
}
+.miniday-nav-buttons > .next-day-button[disabled] {
+ -moz-image-region: rect(26px 21px 39px 16px);
+}
diff -a -U 8 -pN -r ./mozilla_ref/calendar/lightning/chrome.manifest ./mozilla/calendar/lightning/chrome.manifest
--- ./mozilla_ref/calendar/lightning/chrome.manifest 2007-07-19 19:20:37.526002000 +0200
+++ ./mozilla/calendar/lightning/chrome.manifest 2007-07-27 15:32:20.368298000 +0200
@@ -7,18 +7,18 @@ overlay chrome://lightning/content/messe
overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/alarms.xul
overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/categories.xul
overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/general.xul
overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/timezones.xul
overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/views.xul
overlay chrome://messenger/content/mailWindowOverlay.xul chrome://lightning/content/messenger-overlay-toolbar.xul
overlay chrome://global/content/customizeToolbar.xul chrome://lightning/content/customize-toolbar.xul
-overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/todo-list-overlay.xul
overlay chrome://lightning/content/lightning-standalone.xul chrome://lightning/content/messenger-overlay-sidebar.xul
overlay chrome://global/content/customizeToolbar.xul chrome://lightning/content/toolkit-overlay-custombar.xul
skin lightning classic/1.0 jar:chrome/lightning.jar!/skin/classic/lightning/
# shared pieces for chrome://calendar/
content calendar jar:chrome/calendar.jar!/content/calendar/
locale calendar en-US jar:chrome/calendar-en-US.jar!/locale/en-US/calendar/
skin calendar classic/1.0 jar:chrome/calendar.jar!/skin/classic/calendar/
overlay chrome://messenger/content/messenger.xul chrome://calendar/content/today-pane.xul
overlay chrome://calendar/content/today-pane.xul chrome://lightning/content/agenda-tree-overlay.xul
+overlay chrome://calendar/content/today-pane.xul chrome://lightning/content/todo-list-overlay.xul
diff -a -U 8 -pN -r ./mozilla_ref/calendar/lightning/content/agenda-tree-overlay.xul ./mozilla/calendar/lightning/content/agenda-tree-overlay.xul
--- ./mozilla_ref/calendar/lightning/content/agenda-tree-overlay.xul 2007-07-17 12:10:48.942130000 +0200
+++ ./mozilla/calendar/lightning/content/agenda-tree-overlay.xul 2007-07-27 14:54:44.787847000 +0200
@@ -33,26 +33,44 @@
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
-
+ %dtd1;
+ %dtd2;
+]>
+
+
+
-
+