diff --git a/calendar/resources/content/unifinderToDo.js b/calendar/resources/content/unifinderToDo.js index 9f0788a449b..c4bd14032ed 100644 --- a/calendar/resources/content/unifinderToDo.js +++ b/calendar/resources/content/unifinderToDo.js @@ -25,6 +25,7 @@ * ArentJan Banck * Curtis Jewell * Eric Belhaire + * Mark Swaffer * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -256,7 +257,7 @@ function checkboxClick( ThisToDo, completed ) /* This function return the progress state of a ToDo task : -completed, overdue, duetoday, inprogress +completed, overdue, duetoday, inprogress, future */ function ToDoProgressAtom( calendarToDo ) { @@ -284,7 +285,12 @@ function ToDoProgressAtom( calendarToDo ) dueDate.getDate() == now.getDate() ) { return("duetoday"); + } else + if( tonightMidnight.getTime() < startDate.getTime() ) + { + return("future"); } + else { return("inprogress"); diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn index 843723be707..edc4e978d83 100644 --- a/calendar/resources/jar.mn +++ b/calendar/resources/jar.mn @@ -12,7 +12,6 @@ calendar.jar: content/calendar/calendarOverlay.js (content/calendarOverlay.js) content/calendar/calendarOverlay.xul (content/calendarOverlay.xul) content/calendar/calendarSelection.js (content/calendarSelection.js) - content/calendar/calendarService.js (content/calendarService.js) content/calendar/calendarWindow.js (content/calendarWindow.js) content/calendar/clipboard.js (content/clipboard.js) content/calendar/contents.rdf (content/contents.rdf) @@ -25,19 +24,12 @@ calendar.jar: content/calendar/importDuplicatesDialog.js (content/importDuplicatesDialog.js) content/calendar/importDuplicatesDialog.xul (content/importDuplicatesDialog.xul) content/calendar/importExport.js (content/importExport.js) - content/calendar/importDuplicatesDialog.js (content/importDuplicatesDialog.js) - content/calendar/importDuplicatesDialog.xul (content/importDuplicatesDialog.xul) - content/calendar/importExport.js (content/importExport.js) - content/calendar/localCalDialog.js (content/localCalDialog.js) - content/calendar/localCalDialog.xul (content/localCalDialog.xul) content/calendar/menuOverlay.xul (content/menuOverlay.xul) content/calendar/monthView.js (content/monthView.js) content/calendar/monthView.xul (content/monthView.xul) content/calendar/publish.js (content/publish.js) content/calendar/publishDialog.js (content/publishDialog.js) content/calendar/publishDialog.xul (content/publishDialog.xul) - content/calendar/repeatOverlay.js (content/repeatOverlay.js) - content/calendar/repeatOverlay.xul (content/repeatOverlay.xul) content/calendar/selectAddressesDialog.js (content/selectAddressesDialog.js) content/calendar/serverDialog.js (content/serverDialog.js) content/calendar/serverDialog.xul (content/serverDialog.xul) @@ -61,11 +53,6 @@ calendar.jar: content/calendar/datepicker/calendar.xml (content/datepicker/calendar.xml) content/calendar/datepicker/datepicker.css (content/datepicker/datepicker.css) content/calendar/datepicker/datepicker.xml (content/datepicker/datepicker.xml) - content/calendar/datepicker/image/down-arrow.gif (content/datepicker/image/down-arrow.gif) - content/calendar/datepicker/image/left-arrow-hover.gif (content/datepicker/image/left-arrow-hover.gif) - content/calendar/datepicker/image/left-arrow.gif (content/datepicker/image/left-arrow.gif) - content/calendar/datepicker/image/right-arrow-hover.gif (content/datepicker/image/right-arrow-hover.gif) - content/calendar/datepicker/image/right-arrow.gif (content/datepicker/image/right-arrow.gif) content/calendar/jslib/jslib.js (content/jslib/jslib.js) content/calendar/jslib/io/dir.js (content/jslib/io/dir.js) content/calendar/jslib/io/dirUtils.js (content/jslib/io/dirUtils.js) @@ -78,12 +65,10 @@ calendar.jar: content/calendar/jslib/rdf/rdfContainer.js (content/jslib/rdf/rdfContainer.js) content/calendar/jslib/rdf/rdfFile.js (content/jslib/rdf/rdfFile.js) content/calendar/jslib/rdf/rdfResource.js (content/jslib/rdf/rdfResource.js) - content/calendar/pref/alarmPrefs.xul (content/pref/alarmPrefs.xul) content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul) content/calendar/pref/prefOverlay.xul (content/pref/prefOverlay.xul) content/calendar/pref/publishPrefs.xul (content/pref/publishPrefs.xul) content/calendar/pref/rootCalendarPref.js (content/pref/rootCalendarPref.js) - content/calendar/pref/viewPrefs.xul (content/pref/viewPrefs.xul) content/calendar/timepicker/timepicker-overlay.xul (content/timepicker/timepicker-overlay.xul) content/calendar/timepicker/timepicker.js (content/timepicker/timepicker.js) locale/en-US/calendar/calendar.dtd (locale/en-US/calendar.dtd) diff --git a/calendar/resources/skin/classic/calendar.css b/calendar/resources/skin/classic/calendar.css index 20cf82209cc..a513101f1a6 100644 --- a/calendar/resources/skin/classic/calendar.css +++ b/calendar/resources/skin/classic/calendar.css @@ -23,6 +23,7 @@ * Karl Guertin * Colin Phillips * ArentJan Banck + * Mark Swaffer * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -1070,6 +1071,15 @@ treechildren:-moz-tree-row(duetoday,selected) background-color : blue; } +treechildren:-moz-tree-cell-text(future) +{ + color : gray; +} +treechildren:-moz-tree-row(future,selected) +{ + background-color : gray; +} + treechildren:-moz-tree-cell-text(completed) { text-decoration : line-through; diff --git a/calendar/resources/skin/modern/calendar.css b/calendar/resources/skin/modern/calendar.css index 15b4e5cb352..17321d428d5 100644 --- a/calendar/resources/skin/modern/calendar.css +++ b/calendar/resources/skin/modern/calendar.css @@ -23,6 +23,7 @@ * Karl Guertin * Colin Phillips * ArentJan Banck + * Mark Swaffer * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -1072,6 +1073,15 @@ treechildren:-moz-tree-row(duetoday,selected) background-color : blue; } +treechildren:-moz-tree-cell-text(future) +{ + color : gray; +} +treechildren:-moz-tree-row(future,selected) +{ + background-color : gray; +} + treechildren:-moz-tree-cell-text(completed) { text-decoration : line-through;