Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
colinp%oeone.com
2002-03-28 19:47:17 +00:00
parent 8b9ff13013
commit df343ef883
25 changed files with 398 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/calendar/resources/content/alertDialog.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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

84
mozilla/calendar/resources/content/calendarDayView.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
*
* 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 );
}
}

46
mozilla/calendar/resources/content/calendarDayView.xul
View File

@@ -22,6 +22,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
<!-- Day View: Controls-->
<hbox id="day-controls-box">
<box flex="1">
<image id="day-previous-button" onclick="gCalendarWindow.goToPrevious()"/>
<hbox id="day-controls-box"> <!-- DO NOT SET FLEX, breaks resizing -->
<box class="day-previous-button-box">
<image id="day-previous-button" class="prevnextbuttons" onclick="gCalendarWindow.goToPrevious()"/>
</box>
<label id="day-title-text" value="" />
<box flex="1" id="day-next-button-box">
<image id="day-next-button" onclick="gCalendarWindow.goToNext()"/>
<vbox id="day-title-container" flex="1">
<hbox id="day-title-box" flex="1">
<vbox class="day-title-label-box" flex="1">
<label id="-2-day-title" onclick="gCalendarWindow.goToPrevious( 2 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="-1-day-title" onclick="gCalendarWindow.goToPrevious( 1 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="0-day-title" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="1-day-title" onclick="gCalendarWindow.goToNext( 1 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="2-day-title" onclick="gCalendarWindow.goToNext( 2 )" value="" />
</vbox>
</hbox>
<hbox id="day-specific-title-box" flex="1">
<vbox class="day-title-label-box" flex="1">
<label id="0-day-specific-title" value="" />
</vbox>
</hbox>
</vbox>
<box id="day-next-button-box">
<image id="day-next-button" class="prevnextbuttons" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
</hbox>
<!-- Day View: -->
<box id="all-day-content-box" align="center" collapsed="true" flex="1">

1
mozilla/calendar/resources/content/calendarEventAlertDialog.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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

1
mozilla/calendar/resources/content/calendarEventDialog.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
* Chris Charabaruk <coldacid@meldstar.com>
*
* Alternatively, the contents of this file may be used under the terms of

1
mozilla/calendar/resources/content/calendarEventDialog.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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

14
mozilla/calendar/resources/content/calendarMonthView.js
View File

@@ -21,6 +21,7 @@
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Karl Guertin <grayrest@grayrest.com>
* Colin Phillips <colinp@oeone.com>
*
* 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

9
mozilla/calendar/resources/content/calendarMonthView.xul
View File

@@ -22,6 +22,7 @@
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Karl Guertin <grayrest@grayrest.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
</hbox>
<hbox id="year-title-box" flex="1">
<vbox class="month-title-label-box" flex="1">
<label id="-1-year-title" onclick="gCalendarWindow.goToPrevious( 12 )" value="" />
</vbox>
<vbox class="month-title-label-box" flex="1">
<label id="0-year-title" value="" />
</vbox>
<vbox class="month-title-label-box" flex="1">
<label id="1-year-title" onclick="gCalendarWindow.goToNext( 12 )" value="" />
<label id="0-year-title" value="" />
</vbox>
</hbox>
</vbox>

1
mozilla/calendar/resources/content/calendarWeekView.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
*
* 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

29
mozilla/calendar/resources/content/calendarWeekView.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
<!-- Week View: Controls-->
<hbox id="week-controls-box">
<box flex="1">
<image id="week-previous-button" onclick="gCalendarWindow.goToPrevious()"/>
<hbox id="week-controls-box"> <!-- DO NOT SET FLEX, breaks resizing -->
<box class="week-previous-button-box">
<image id="week-previous-button" class="prevnextbuttons" onclick="gCalendarWindow.goToPrevious()"/>
</box>
<label id="week-title-text" value="" />
<box flex="1" id="week-next-button-box" >
<image id="week-next-button" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
<hbox id="week-title-container" flex="1">
<vbox class="week-title-label-box" flex="1">
<label id="week-title-text" value="" />
</vbox>
</hbox>
<box id="week-next-button-box">
<image id="week-next-button" class="prevnextbuttons" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
<!-- Week View: All Day Boxes -->

84
mozilla/calendar/resources/content/dayView.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
*
* 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 );
}
}

46
mozilla/calendar/resources/content/dayView.xul
View File

@@ -22,6 +22,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
<!-- Day View: Controls-->
<hbox id="day-controls-box">
<box flex="1">
<image id="day-previous-button" onclick="gCalendarWindow.goToPrevious()"/>
<hbox id="day-controls-box"> <!-- DO NOT SET FLEX, breaks resizing -->
<box class="day-previous-button-box">
<image id="day-previous-button" class="prevnextbuttons" onclick="gCalendarWindow.goToPrevious()"/>
</box>
<label id="day-title-text" value="" />
<box flex="1" id="day-next-button-box">
<image id="day-next-button" onclick="gCalendarWindow.goToNext()"/>
<vbox id="day-title-container" flex="1">
<hbox id="day-title-box" flex="1">
<vbox class="day-title-label-box" flex="1">
<label id="-2-day-title" onclick="gCalendarWindow.goToPrevious( 2 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="-1-day-title" onclick="gCalendarWindow.goToPrevious( 1 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="0-day-title" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="1-day-title" onclick="gCalendarWindow.goToNext( 1 )" value="" />
</vbox>
<vbox class="day-title-label-box" flex="1">
<label id="2-day-title" onclick="gCalendarWindow.goToNext( 2 )" value="" />
</vbox>
</hbox>
<hbox id="day-specific-title-box" flex="1">
<vbox class="day-title-label-box" flex="1">
<label id="0-day-specific-title" value="" />
</vbox>
</hbox>
</vbox>
<box id="day-next-button-box">
<image id="day-next-button" class="prevnextbuttons" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
</hbox>
<!-- Day View: -->
<box id="all-day-content-box" align="center" collapsed="true" flex="1">

1
mozilla/calendar/resources/content/eventDialog.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
* Chris Charabaruk <coldacid@meldstar.com>
*
* Alternatively, the contents of this file may be used under the terms of

1
mozilla/calendar/resources/content/eventDialog.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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

14
mozilla/calendar/resources/content/monthView.js
View File

@@ -21,6 +21,7 @@
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Karl Guertin <grayrest@grayrest.com>
* Colin Phillips <colinp@oeone.com>
*
* 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

9
mozilla/calendar/resources/content/monthView.xul
View File

@@ -22,6 +22,7 @@
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Karl Guertin <grayrest@grayrest.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
</hbox>
<hbox id="year-title-box" flex="1">
<vbox class="month-title-label-box" flex="1">
<label id="-1-year-title" onclick="gCalendarWindow.goToPrevious( 12 )" value="" />
</vbox>
<vbox class="month-title-label-box" flex="1">
<label id="0-year-title" value="" />
</vbox>
<vbox class="month-title-label-box" flex="1">
<label id="1-year-title" onclick="gCalendarWindow.goToNext( 12 )" value="" />
<label id="0-year-title" value="" />
</vbox>
</hbox>
</vbox>

1
mozilla/calendar/resources/content/weekView.js
View File

@@ -20,6 +20,7 @@
*
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Colin Phillips <colinp@oeone.com>
*
* 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

29
mozilla/calendar/resources/content/weekView.xul
View File

@@ -21,6 +21,7 @@
-
- Contributor(s): Garth Smedley <garths@oeone.com>
- Mike Potter <mikep@oeone.com>
- Colin Phillips <colinp@oeone.com>
-
- 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 @@
<!-- Week View: Controls-->
<hbox id="week-controls-box">
<box flex="1">
<image id="week-previous-button" onclick="gCalendarWindow.goToPrevious()"/>
<hbox id="week-controls-box"> <!-- DO NOT SET FLEX, breaks resizing -->
<box class="week-previous-button-box">
<image id="week-previous-button" class="prevnextbuttons" onclick="gCalendarWindow.goToPrevious()"/>
</box>
<label id="week-title-text" value="" />
<box flex="1" id="week-next-button-box" >
<image id="week-next-button" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
<hbox id="week-title-container" flex="1">
<vbox class="week-title-label-box" flex="1">
<label id="week-title-text" value="" />
</vbox>
</hbox>
<box id="week-next-button-box">
<image id="week-next-button" class="prevnextbuttons" onclick="gCalendarWindow.goToNext()"/>
</box>
</hbox>
<!-- Week View: All Day Boxes -->

BIN
mozilla/calendar/resources/skin/modern/arrow_left.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 257 B

BIN
mozilla/calendar/resources/skin/modern/arrow_left_down.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 303 B

BIN
mozilla/calendar/resources/skin/modern/arrow_left_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 304 B

BIN
mozilla/calendar/resources/skin/modern/arrow_right.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 266 B

BIN
mozilla/calendar/resources/skin/modern/arrow_right_down.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 296 B

BIN
mozilla/calendar/resources/skin/modern/arrow_right_hover.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 298 B

214
mozilla/calendar/resources/skin/modern/calendar.css
View File

@@ -21,6 +21,7 @@
* Contributor(s): Garth Smedley <garths@oeone.com>
* Mike Potter <mikep@oeone.com>
* Karl Guertin <grayrest@grayrest.com>
* Colin Phillips <colinp@oeone.com>
*
* 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 */