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 e5a54804606..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_left.png and /dev/null differ diff --git a/mozilla/calendar/resources/skin/modern/arrow_left_down.png b/mozilla/calendar/resources/skin/modern/arrow_left_down.png deleted file mode 100644 index 776a82d17ed..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_left_down.png and /dev/null differ 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 0d1ca70e5a1..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_left_hover.png and /dev/null differ 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 2d7a9e95748..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_right.png and /dev/null differ diff --git a/mozilla/calendar/resources/skin/modern/arrow_right_down.png b/mozilla/calendar/resources/skin/modern/arrow_right_down.png deleted file mode 100644 index 78fb33809c8..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_right_down.png and /dev/null differ 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 ab316370291..00000000000 Binary files a/mozilla/calendar/resources/skin/modern/arrow_right_hover.png and /dev/null differ diff --git a/mozilla/calendar/resources/skin/modern/calendar.css b/mozilla/calendar/resources/skin/modern/calendar.css index 8253180b493..fe5d11fb0fb 100644 --- a/mozilla/calendar/resources/skin/modern/calendar.css +++ b/mozilla/calendar/resources/skin/modern/calendar.css @@ -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 @@ -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 */