From df343ef8838f54778b89fe73408d7744db3eec12 Mon Sep 17 00:00:00 2001 From: "colinp%oeone.com" Date: Thu, 28 Mar 2002 19:47:17 +0000 Subject: [PATCH] Changed day / week views titles to act like the month view's title. Removed the extra years in the month view as it was just too confusing. also added my name in the contributors list where it wasn't already :) git-svn-id: svn://10.0.0.236/trunk@117680 18797224-902f-48f8-a5cc-f745e15eee43 --- .../resources/content/alertDialog.xul | 1 + .../resources/content/calendarDayView.js | 84 ++++++- .../resources/content/calendarDayView.xul | 46 +++- .../content/calendarEventAlertDialog.xul | 1 + .../resources/content/calendarEventDialog.js | 1 + .../resources/content/calendarEventDialog.xul | 1 + .../resources/content/calendarMonthView.js | 14 +- .../resources/content/calendarMonthView.xul | 9 +- .../resources/content/calendarWeekView.js | 1 + .../resources/content/calendarWeekView.xul | 29 ++- mozilla/calendar/resources/content/dayView.js | 84 ++++++- .../calendar/resources/content/dayView.xul | 46 +++- .../calendar/resources/content/eventDialog.js | 1 + .../resources/content/eventDialog.xul | 1 + .../calendar/resources/content/monthView.js | 14 +- .../calendar/resources/content/monthView.xul | 9 +- .../calendar/resources/content/weekView.js | 1 + .../calendar/resources/content/weekView.xul | 29 ++- .../resources/skin/modern/arrow_left.png | Bin 257 -> 0 bytes .../resources/skin/modern/arrow_left_down.png | Bin 303 -> 0 bytes .../skin/modern/arrow_left_hover.png | Bin 304 -> 0 bytes .../resources/skin/modern/arrow_right.png | Bin 266 -> 0 bytes .../skin/modern/arrow_right_down.png | Bin 296 -> 0 bytes .../skin/modern/arrow_right_hover.png | Bin 298 -> 0 bytes .../resources/skin/modern/calendar.css | 214 +++++++++++------- 25 files changed, 398 insertions(+), 188 deletions(-) delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_left.png delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_left_down.png delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_left_hover.png delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_right.png delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_right_down.png delete mode 100644 mozilla/calendar/resources/skin/modern/arrow_right_hover.png diff --git a/mozilla/calendar/resources/content/alertDialog.xul b/mozilla/calendar/resources/content/alertDialog.xul index e9db4d8361a..64a15cd5289 100644 --- a/mozilla/calendar/resources/content/alertDialog.xul +++ b/mozilla/calendar/resources/content/alertDialog.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 diff --git a/mozilla/calendar/resources/content/calendarDayView.js b/mozilla/calendar/resources/content/calendarDayView.js index 76a96e9346a..c4f8503f0f4 100644 --- a/mozilla/calendar/resources/content/calendarDayView.js +++ b/mozilla/calendar/resources/content/calendarDayView.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * * 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 @@ -395,14 +396,59 @@ DayView.prototype.switchTo = function( ) DayView.prototype.refreshDisplay = function( ) { // update the title - var dayName = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() ); + if (this.calendarWindow.getSelectedDate().getDay() < 2) + { + if (this.calendarWindow.getSelectedDate().getDay() == 0) + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 6 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 ); + } + else + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 ); + } + } + else + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 2 ); + } + if (this.calendarWindow.getSelectedDate().getDay() > 4) + { + if (this.calendarWindow.getSelectedDate().getDay() == 6) + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 6); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5); + } + else + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5); + } + } + else + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 2); + } var monthName = this.calendarWindow.dateFormater.getMonthName( this.calendarWindow.getSelectedDate().getMonth() ); - var dateString = dayName + ", " + monthName + " " + this.calendarWindow.getSelectedDate().getDate() + " " + this.calendarWindow.getSelectedDate().getFullYear(); + var dateString = monthName + " " + this.calendarWindow.getSelectedDate().getDate() + " " + this.calendarWindow.getSelectedDate().getFullYear(); - var dayTextItem = document.getElementById( "day-title-text" ); - dayTextItem.setAttribute( "value" , dateString ); + var dayTextItemPrev2 = document.getElementById( "-2-day-title" ); + var dayTextItemPrev1 = document.getElementById( "-1-day-title" ); + var dayTextItem = document.getElementById( "0-day-title" ); + var dayTextItemNext1 = document.getElementById( "1-day-title" ); + var dayTextItemNext2 = document.getElementById( "2-day-title" ); + var daySpecificTextItem = document.getElementById( "0-day-specific-title" ); + dayTextItemPrev2.setAttribute( "value" , dayNamePrev2 ); + dayTextItemPrev1.setAttribute( "value" , dayNamePrev1 ); + dayTextItem.setAttribute( "value" , dayName ); + dayTextItemNext1.setAttribute( "value" , dayNameNext1 ); + dayTextItemNext2.setAttribute( "value" , dayNameNext2 ); + daySpecificTextItem.setAttribute( "value" , dateString ); } @@ -475,11 +521,18 @@ DayView.prototype.getNewEventDate = function( ) * Go to the next day. */ -DayView.prototype.goToNext = function() +DayView.prototype.goToNext = function(goDays) { - var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 ); - - this.goToDay( nextDay ); + if (goDays) + { + var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + goDays ); + this.goToDay( nextDay ); + } + else + { + var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 ); + this.goToDay( nextDay ); + } } @@ -488,11 +541,18 @@ DayView.prototype.goToNext = function() * Go to the previous day. */ -DayView.prototype.goToPrevious = function() +DayView.prototype.goToPrevious = function( goDays ) { - var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 ); - - this.goToDay( prevDay ); + if (goDays) + { + var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - goDays ); + this.goToDay( prevDay ); + } + else + { + var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 ); + this.goToDay( prevDay ); + } } diff --git a/mozilla/calendar/resources/content/calendarDayView.xul b/mozilla/calendar/resources/content/calendarDayView.xul index f5012129762..10c6cc2a8bd 100644 --- a/mozilla/calendar/resources/content/calendarDayView.xul +++ b/mozilla/calendar/resources/content/calendarDayView.xul @@ -22,6 +22,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 @@ -60,20 +61,41 @@ - - - - + + + - - - + + diff --git a/mozilla/calendar/resources/content/calendarEventAlertDialog.xul b/mozilla/calendar/resources/content/calendarEventAlertDialog.xul index e9db4d8361a..64a15cd5289 100644 --- a/mozilla/calendar/resources/content/calendarEventAlertDialog.xul +++ b/mozilla/calendar/resources/content/calendarEventAlertDialog.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 diff --git a/mozilla/calendar/resources/content/calendarEventDialog.js b/mozilla/calendar/resources/content/calendarEventDialog.js index 1aee5eedaca..8e445da19e8 100644 --- a/mozilla/calendar/resources/content/calendarEventDialog.js +++ b/mozilla/calendar/resources/content/calendarEventDialog.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * Chris Charabaruk * * Alternatively, the contents of this file may be used under the terms of diff --git a/mozilla/calendar/resources/content/calendarEventDialog.xul b/mozilla/calendar/resources/content/calendarEventDialog.xul index 17f74680ba7..5890e38ae65 100644 --- a/mozilla/calendar/resources/content/calendarEventDialog.xul +++ b/mozilla/calendar/resources/content/calendarEventDialog.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 diff --git a/mozilla/calendar/resources/content/calendarMonthView.js b/mozilla/calendar/resources/content/calendarMonthView.js index d8f326022eb..c60b91c1702 100644 --- a/mozilla/calendar/resources/content/calendarMonthView.js +++ b/mozilla/calendar/resources/content/calendarMonthView.js @@ -21,6 +21,7 @@ * Contributor(s): Garth Smedley * Mike Potter * Karl Guertin + * Colin Phillips * * 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 @@ -396,18 +397,7 @@ MonthView.prototype.refreshDisplay = function( ShowEvent ) alert(errorObj); } } - for (var i = -1; i < 2; i++){ - titleYearArray[i] = newYear + i; - try{ - var idName = i + "-year-title"; - document.getElementById( idName ).setAttribute( "value" , titleYearArray[i] ); - }catch(errorObj){ - alert(errorObj); - } - - } - - + document.getElementById( "0-year-title" ).setAttribute( "value" , newYear ); // Write in all the day numbers and create the dayBoxItemByDateArray, see notes above diff --git a/mozilla/calendar/resources/content/calendarMonthView.xul b/mozilla/calendar/resources/content/calendarMonthView.xul index f0aba9fa8ce..09170ae3c24 100644 --- a/mozilla/calendar/resources/content/calendarMonthView.xul +++ b/mozilla/calendar/resources/content/calendarMonthView.xul @@ -22,6 +22,7 @@ - Contributor(s): Garth Smedley - Mike Potter - Karl Guertin + - Colin Phillips - - 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 @@ -82,13 +83,7 @@ - - - - - diff --git a/mozilla/calendar/resources/content/calendarWeekView.js b/mozilla/calendar/resources/content/calendarWeekView.js index 672684154bf..c9c6e52db56 100644 --- a/mozilla/calendar/resources/content/calendarWeekView.js +++ b/mozilla/calendar/resources/content/calendarWeekView.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * * 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 diff --git a/mozilla/calendar/resources/content/calendarWeekView.xul b/mozilla/calendar/resources/content/calendarWeekView.xul index 0c5ff5eb1ad..43063b65d5c 100644 --- a/mozilla/calendar/resources/content/calendarWeekView.xul +++ b/mozilla/calendar/resources/content/calendarWeekView.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 @@ -56,19 +57,25 @@ - - - - + + + - + + + + + + + + + + + + + diff --git a/mozilla/calendar/resources/content/dayView.js b/mozilla/calendar/resources/content/dayView.js index 76a96e9346a..c4f8503f0f4 100644 --- a/mozilla/calendar/resources/content/dayView.js +++ b/mozilla/calendar/resources/content/dayView.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * * 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 @@ -395,14 +396,59 @@ DayView.prototype.switchTo = function( ) DayView.prototype.refreshDisplay = function( ) { // update the title - var dayName = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() ); + if (this.calendarWindow.getSelectedDate().getDay() < 2) + { + if (this.calendarWindow.getSelectedDate().getDay() == 0) + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 6 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 ); + } + else + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 5 ); + } + } + else + { + var dayNamePrev1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 1 ); + var dayNamePrev2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 2 ); + } + if (this.calendarWindow.getSelectedDate().getDay() > 4) + { + if (this.calendarWindow.getSelectedDate().getDay() == 6) + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 6); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5); + } + else + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() - 5); + } + } + else + { + var dayNameNext1 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 1); + var dayNameNext2 = this.calendarWindow.dateFormater.getDayName( this.calendarWindow.getSelectedDate().getDay() + 2); + } var monthName = this.calendarWindow.dateFormater.getMonthName( this.calendarWindow.getSelectedDate().getMonth() ); - var dateString = dayName + ", " + monthName + " " + this.calendarWindow.getSelectedDate().getDate() + " " + this.calendarWindow.getSelectedDate().getFullYear(); + var dateString = monthName + " " + this.calendarWindow.getSelectedDate().getDate() + " " + this.calendarWindow.getSelectedDate().getFullYear(); - var dayTextItem = document.getElementById( "day-title-text" ); - dayTextItem.setAttribute( "value" , dateString ); + var dayTextItemPrev2 = document.getElementById( "-2-day-title" ); + var dayTextItemPrev1 = document.getElementById( "-1-day-title" ); + var dayTextItem = document.getElementById( "0-day-title" ); + var dayTextItemNext1 = document.getElementById( "1-day-title" ); + var dayTextItemNext2 = document.getElementById( "2-day-title" ); + var daySpecificTextItem = document.getElementById( "0-day-specific-title" ); + dayTextItemPrev2.setAttribute( "value" , dayNamePrev2 ); + dayTextItemPrev1.setAttribute( "value" , dayNamePrev1 ); + dayTextItem.setAttribute( "value" , dayName ); + dayTextItemNext1.setAttribute( "value" , dayNameNext1 ); + dayTextItemNext2.setAttribute( "value" , dayNameNext2 ); + daySpecificTextItem.setAttribute( "value" , dateString ); } @@ -475,11 +521,18 @@ DayView.prototype.getNewEventDate = function( ) * Go to the next day. */ -DayView.prototype.goToNext = function() +DayView.prototype.goToNext = function(goDays) { - var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 ); - - this.goToDay( nextDay ); + if (goDays) + { + var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + goDays ); + this.goToDay( nextDay ); + } + else + { + var nextDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() + 1 ); + this.goToDay( nextDay ); + } } @@ -488,11 +541,18 @@ DayView.prototype.goToNext = function() * Go to the previous day. */ -DayView.prototype.goToPrevious = function() +DayView.prototype.goToPrevious = function( goDays ) { - var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 ); - - this.goToDay( prevDay ); + if (goDays) + { + var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - goDays ); + this.goToDay( prevDay ); + } + else + { + var prevDay = new Date( this.calendarWindow.selectedDate.getFullYear(), this.calendarWindow.selectedDate.getMonth(), this.calendarWindow.selectedDate.getDate() - 1 ); + this.goToDay( prevDay ); + } } diff --git a/mozilla/calendar/resources/content/dayView.xul b/mozilla/calendar/resources/content/dayView.xul index f5012129762..10c6cc2a8bd 100644 --- a/mozilla/calendar/resources/content/dayView.xul +++ b/mozilla/calendar/resources/content/dayView.xul @@ -22,6 +22,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 @@ -60,20 +61,41 @@ - - - - + + + - - - + + diff --git a/mozilla/calendar/resources/content/eventDialog.js b/mozilla/calendar/resources/content/eventDialog.js index 1aee5eedaca..8e445da19e8 100644 --- a/mozilla/calendar/resources/content/eventDialog.js +++ b/mozilla/calendar/resources/content/eventDialog.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * Chris Charabaruk * * Alternatively, the contents of this file may be used under the terms of diff --git a/mozilla/calendar/resources/content/eventDialog.xul b/mozilla/calendar/resources/content/eventDialog.xul index 17f74680ba7..5890e38ae65 100644 --- a/mozilla/calendar/resources/content/eventDialog.xul +++ b/mozilla/calendar/resources/content/eventDialog.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 diff --git a/mozilla/calendar/resources/content/monthView.js b/mozilla/calendar/resources/content/monthView.js index d8f326022eb..c60b91c1702 100644 --- a/mozilla/calendar/resources/content/monthView.js +++ b/mozilla/calendar/resources/content/monthView.js @@ -21,6 +21,7 @@ * Contributor(s): Garth Smedley * Mike Potter * Karl Guertin + * Colin Phillips * * 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 @@ -396,18 +397,7 @@ MonthView.prototype.refreshDisplay = function( ShowEvent ) alert(errorObj); } } - for (var i = -1; i < 2; i++){ - titleYearArray[i] = newYear + i; - try{ - var idName = i + "-year-title"; - document.getElementById( idName ).setAttribute( "value" , titleYearArray[i] ); - }catch(errorObj){ - alert(errorObj); - } - - } - - + document.getElementById( "0-year-title" ).setAttribute( "value" , newYear ); // Write in all the day numbers and create the dayBoxItemByDateArray, see notes above diff --git a/mozilla/calendar/resources/content/monthView.xul b/mozilla/calendar/resources/content/monthView.xul index f0aba9fa8ce..09170ae3c24 100644 --- a/mozilla/calendar/resources/content/monthView.xul +++ b/mozilla/calendar/resources/content/monthView.xul @@ -22,6 +22,7 @@ - Contributor(s): Garth Smedley - Mike Potter - Karl Guertin + - Colin Phillips - - 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 @@ -82,13 +83,7 @@ - - - - - diff --git a/mozilla/calendar/resources/content/weekView.js b/mozilla/calendar/resources/content/weekView.js index 672684154bf..c9c6e52db56 100644 --- a/mozilla/calendar/resources/content/weekView.js +++ b/mozilla/calendar/resources/content/weekView.js @@ -20,6 +20,7 @@ * * Contributor(s): Garth Smedley * Mike Potter + * Colin Phillips * * 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 diff --git a/mozilla/calendar/resources/content/weekView.xul b/mozilla/calendar/resources/content/weekView.xul index 0c5ff5eb1ad..43063b65d5c 100644 --- a/mozilla/calendar/resources/content/weekView.xul +++ b/mozilla/calendar/resources/content/weekView.xul @@ -21,6 +21,7 @@ - - Contributor(s): Garth Smedley - Mike Potter + - Colin Phillips - - 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 @@ -56,19 +57,25 @@ - - - - + + + - + + + + + + + + + + + + + diff --git a/mozilla/calendar/resources/skin/modern/arrow_left.png b/mozilla/calendar/resources/skin/modern/arrow_left.png deleted file mode 100644 index e5a54804606a32be4909162ed0df0734ca0f5336..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP)>d*2Fa=#ge!ze3Mw@2-E%y10=riaDm20*g&zrIRXuxm z7L?}_ek8%91{E5;F;3Hu;I(~#2@S$e2$K}Wt#Jarz_Mwv^%-{i!z#dzH?%yRkZ^^v zY5xQ59PS61Dzm92@UDaQ~falZY_bW6pFt+%A?!RB}cdw@C$*;q<)88?g zCTlTpDCo?3Z&Sbh`=!_gha09b$aWqtX<%r|`uE{0`w?k}_Pswow0i7kU=cVy+yDNv zcb3-W=PlVTF*-09Iyp(_eLlFFzu}nRN=bzV3B$#&o?SL~2=4f343vG;neLGxzvCA} uhS;?WY#a)1O2VAiDnJacAPI*CMuy;osXJVY)iwe>!{F)a=d#Wzp$Pz$G;sU? diff --git a/mozilla/calendar/resources/skin/modern/arrow_left_hover.png b/mozilla/calendar/resources/skin/modern/arrow_left_hover.png deleted file mode 100644 index 0d1ca70e5a10dbb2ab683773c270ad51151260eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W|!2~2fWLtqaEa{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5ing_>FQfB*7td3fjad-eIX z%vr}m7z7+5OzeMskzOISg7<~Z0_Bf0_yimR&d#s@%Uu2VcI$Nedo}-^m&7wLbv!-X zzyEb!ZB+SZW#*R*3Jns93wgKyJk$N&;c>?m9s!4*8G&CPJl0P*AoMuBfg$OL@c9WB y>^?t|zM!*aAumwcMNMeUN07QHOAHzqm>CRo=X!)MQE3DEhQZU-&t;ucLK6UrZhV~p diff --git a/mozilla/calendar/resources/skin/modern/arrow_right.png b/mozilla/calendar/resources/skin/modern/arrow_right.png deleted file mode 100644 index 2d7a9e95748bd6e77b1d89031a59b40db8bd29a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmV+l0rmcgP)p@^oMj+c6iQU`*h9nHAq(DhmNPNU)zvl?7$#+f#w~S9J6#B7!t4Z@Z>JYV$Ws$vyfN7 pfrHcNkt9$@L!Y8`DJ diff --git a/mozilla/calendar/resources/skin/modern/arrow_right_hover.png b/mozilla/calendar/resources/skin/modern/arrow_right_hover.png deleted file mode 100644 index ab316370291601fcc0225bc942f22d15e5a344ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^B0$W|!2~2fWLtqaEa{HEjtmUzPnffIy#(?lOI#yL zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>p@pN$vskoKI6IXaLWKytyk8}8x z=GM-MjUo&J4n4<=&pSlKtnsN@B*XS-j>G07J0m+T@(4I^oISy?;$}?OX%CqvN@i(u z&M|T*yqWco;f3IW@&-4Cvy&btyG~~1P+*!hv5`Z)yV0V3rHc3koj5bK1so0x6BkHI zvaI~fzVag@ivagWDHe+vzA6?IbJ;)|9@eqBH8R;t&(d*VNW9L&le-{Gm{af1LSB%q nDMySQ7&bD * Mike Potter * Karl Guertin + * Colin Phillips * * 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 @@ -266,7 +267,7 @@ button.calendar-management-button:hover:active #month-controls-box{ -moz-box-align:center; -moz-box-pack:center; - margin:0px 15px 0px 15px; + margin:0px 15px; } #month-view-box{ -moz-box-align: center; @@ -277,31 +278,39 @@ button.calendar-management-button:hover:active /* Month title Stuff */ -#month-title-container{ +#month-title-container +{ -moz-box-align: center; -mox-box-pack: center; margin: 0px 15px 0px 15px; } -#2-month-title, #-2-month-title{ + +#2-month-title, #-2-month-title +{ font-size:1.2em; color: #9FBEC8; margin:0px; padding:0px; cursor:pointer; } -#1-month-title, #-1-month-title, #1-year-title, #-1-year-title{ +#1-month-title, #-1-month-title +{ font-size:1.5em; color: #9FBEC8; cursor:pointer; } -#0-month-title, #0-year-title{ + +#0-month-title, #0-year-title +{ font-size:2.0em; color: #3f7d91; font-weight:bold; margin:0px; padding:0px; } -.month-title-label-box{ + +.month-title-label-box +{ width: 10em !important; -moz-box-align: center; -moz-box-pack: end; @@ -525,6 +534,7 @@ button.calendar-management-button:hover:active #day-view-box { + background-color : white; padding-top :10px; } @@ -535,73 +545,99 @@ button.calendar-management-button:hover:active #day-controls-box { - -moz-box-pack : center; - -moz-box-align : center; - margin-bottom : 10px; + -moz-box-align:center; + -moz-box-pack:center; + margin:0px 15px; } -/*-------------------------------------------------------------------- - * Box for title: make it big enough for the largest string - * in any of the views for two reasons: - * 1. Next, Prev buttons appear in the same place - * 2. Redraw problems when replacing a longer string - * with a shorter one. - *-------------------------------------------------------------------*/ - -#day-title-box +#day-specific-title-box { - width : 400px; -} - - -/*-------------------------------------------------------------------- - * Day title text. - *-------------------------------------------------------------------*/ - -#day-title-text -{ - font-size : 18pt; - font-family : Arial, Helvetica; - color : #3f7d91; + -moz-box-align:center; + -moz-box-pack:center; } /*-------------------------------------------------------------------- * Next and Previous buttons. *-------------------------------------------------------------------*/ -#day-previous-button -{ - list-style-image : url("chrome://calendar/skin/arrow_left.png"); -} - -#day-previous-button:hover -{ - list-style-image : url("chrome://calendar/skin/arrow_left_hover.png"); -} - -#day-previous-button:hover:active -{ - list-style-image : url("chrome://calendar/skin/arrow_left_down.png"); -} - #day-next-button { - list-style-image : url("chrome://calendar/skin/arrow_right.png"); + -moz-box-align:right; + -moz-image-region: rect(33px 20px 66px 0); + cursor:pointer; } #day-next-button:hover { - list-style-image : url("chrome://calendar/skin/arrow_right_hover.png"); + -moz-image-region: rect(33px 40px 66px 20px); } #day-next-button:hover:active { - list-style-image : url("chrome://calendar/skin/arrow_right_down.png"); + -moz-image-region: rect(33px 60px 66px 40px); } -#day-next-button-box +#day-previous-button { - -moz-box-pack : end; + -moz-box-align:left; + -moz-image-region: rect(0 20px 33px 0); + cursor:pointer; +} + +#day-previous-button:hover +{ + -moz-image-region: rect(0 40px 33px 20px); +} + +#day-previous-button:hover:active +{ + -moz-image-region: rect(0 60px 33px 40px); +} + +/* Day title Stuff */ +#day-title-container +{ + -moz-box-align: center; + -mox-box-pack: center; + margin: 0px 15px 0px 15px; +} + +#2-day-title, #-2-day-title, #1-day-specific-title, #-1-day-specific-title +{ + font-size:1.2em; + color: #9FBEC8; + margin:0px; + padding:0px; + cursor:pointer; +} + +#1-day-title, #-1-day-title +{ + font-size:1.5em; + color: #9FBEC8; + cursor:pointer; +} + +#0-day-specific-title +{ + font-size:1.2em; + color: #3f7d91; +} + +#0-day-title +{ + font-size:2.0em; + color: #3f7d91; + font-weight:bold; + margin:0px; + padding:0px; +} + +.day-title-label-box +{ + width: 10em !important; + -moz-box-align: center; + -moz-box-pack: end; } /*-------------------------------------------------------------------- @@ -718,6 +754,7 @@ button.calendar-management-button:hover:active #week-view-box { + background-color : white; padding-top :10px; } @@ -734,47 +771,43 @@ button.calendar-management-button:hover:active #week-controls-box { - -moz-box-align : center; - -moz-box-pack : center; - margin-bottom : 10px; -} - -#week-title-text -{ - font-size : 18pt; - font-family : Arial, Helvetica; - color : #3f7d91; -} - - -#week-previous-button -{ - list-style-image : url("chrome://calendar/skin/arrow_left.png"); -} - -#week-previous-button:hover -{ - list-style-image : url("chrome://calendar/skin/arrow_left_hover.png"); -} - -#week-previous-button:hover:active -{ - list-style-image : url("chrome://calendar/skin/arrow_left_down.png"); + -moz-box-align:center; + -moz-box-pack:center; + margin:0px 15px; } #week-next-button { - list-style-image : url("chrome://calendar/skin/arrow_right.png"); + -moz-box-align:right; + -moz-image-region: rect(33px 20px 66px 0); + cursor:pointer; } #week-next-button:hover { - list-style-image : url("chrome://calendar/skin/arrow_right_hover.png"); + -moz-image-region: rect(33px 40px 66px 20px); } #week-next-button:hover:active { - list-style-image : url("chrome://calendar/skin/arrow_right_down.png"); + -moz-image-region: rect(33px 60px 66px 40px); +} + +#week-previous-button +{ + -moz-box-align:left; + -moz-image-region: rect(0 20px 33px 0); + cursor:pointer; +} + +#week-previous-button:hover +{ + -moz-image-region: rect(0 40px 33px 20px); +} + +#week-previous-button:hover:active +{ + -moz-image-region: rect(0 60px 33px 40px); } #week-next-button-box @@ -782,6 +815,27 @@ button.calendar-management-button:hover:active -moz-box-pack : end; } +/* Week title Stuff */ +#week-title-container +{ + -moz-box-align: center; + -mox-box-pack: center; + margin: 0px 15px; +} + +#week-title-text +{ + font-size:2.0em; + color: #3f7d91; + font-weight:bold; + margin:0px; + padding:0px; +} + +.week-title-label-box +{ + -moz-box-align: center; +} /* Week View: Day name header */