Index: calendar/resources/skin/classic/calendar.css
===================================================================
RCS file: /cvsroot/mozilla/calendar/resources/skin/classic/calendar.css,v
retrieving revision 1.68
diff -u -6 -r1.68 calendar.css
--- calendar/resources/skin/classic/calendar.css 23 Dec 2005 21:58:44 -0000 1.68
+++ calendar/resources/skin/classic/calendar.css 31 Dec 2005 16:51:37 -0000
@@ -195,15 +195,15 @@
* Change to multiweek view button
*-------------------------------------------------------------------*/
#calendar-multiweek-view-button
{
-moz-image-region: rect(42px 32px 63px 0px);
}
-#calendar-multiweek-view-button[disabled="true"],
-#calendar-multiweek-view-button[disabled="true"]:hover,
-#calendar-multiweek-view-button[disabled="true"]:hover:active
+#calendar-multiweek-view-button[checked="true"],
+#calendar-multiweek-view-button[checked="true"]:hover,
+#calendar-multiweek-view-button[checked="true"]:hover:active
{
-moz-image-region: rect(42px 128px 63px 96px);
}
#calendar-multiweek-view-button:hover
{
-moz-image-region: rect(42px 64px 63px 32px);
@@ -218,15 +218,15 @@
*-------------------------------------------------------------------*/
#calendar-month-view-button
{
-moz-image-region: rect(63px 32px 84px 0px);
}
-#calendar-month-view-button[disabled="true"],
-#calendar-month-view-button[disabled="true"]:hover,
-#calendar-month-view-button[disabled="true"]:hover:active
+#calendar-month-view-button[checked="true"],
+#calendar-month-view-button[checked="true"]:hover,
+#calendar-month-view-button[checked="true"]:hover:active
{
-moz-image-region: rect(63px 128px 84px 96px);
}
#calendar-month-view-button:hover
{
-moz-image-region: rect(63px 64px 84px 32px);
@@ -241,15 +241,15 @@
*-------------------------------------------------------------------*/
#calendar-week-view-button
{
-moz-image-region: rect(21px 32px 42px 0px);
}
-#calendar-week-view-button[disabled="true"],
-#calendar-week-view-button[disabled="true"]:hover,
-#calendar-week-view-button[disabled="true"]:hover:active
+#calendar-week-view-button[checked="true"],
+#calendar-week-view-button[checked="true"]:hover,
+#calendar-week-view-button[checked="true"]:hover:active
{
-moz-image-region: rect(21px 128px 42px 96px);
}
#calendar-week-view-button:hover
{
-moz-image-region: rect(21px 64px 42px 32px);
@@ -264,15 +264,15 @@
*-------------------------------------------------------------------*/
#calendar-day-view-button
{
-moz-image-region: rect(0px 32px 21px 0px);
}
-#calendar-day-view-button[disabled="true"],
-#calendar-day-view-button[disabled="true"]:hover,
-#calendar-day-view-button[disabled="true"]:hover:active
+#calendar-day-view-button[checked="true"],
+#calendar-day-view-button[checked="true"]:hover,
+#calendar-day-view-button[checked="true"]:hover:active
{
-moz-image-region: rect(0px 128px 21px 96px);
}
#calendar-day-view-button:hover
{
-moz-image-region: rect(0px 64px 21px 32px);
Index: calendar/resources/skin/modern/calendar.css
===================================================================
RCS file: /cvsroot/mozilla/calendar/resources/skin/modern/calendar.css,v
retrieving revision 1.95
diff -u -6 -r1.95 calendar.css
--- calendar/resources/skin/modern/calendar.css 23 Dec 2005 21:58:44 -0000 1.95
+++ calendar/resources/skin/modern/calendar.css 31 Dec 2005 16:51:43 -0000
@@ -207,15 +207,15 @@
#calendar-multiweek-view-button
{
margin-left: 8px;
padding-top: 1px;
-moz-image-region: rect(68px 45px 102px 0px);
}
-#calendar-multiweek-view-button[disabled="true"],
-#calendar-multiweek-view-button[disabled="true"]:hover,
-#calendar-multiweek-view-button[disabled="true"]:hover:active,
+#calendar-multiweek-view-button[checked="true"],
+#calendar-multiweek-view-button[checked="true"]:hover,
+#calendar-multiweek-view-button[checked="true"]:hover:active,
#calendar-multiweek-view-button:hover:active
{
-moz-image-region: rect(68px 135px 102px 90px);
}
#calendar-multiweek-view-button:hover
{
@@ -229,15 +229,15 @@
#calendar-month-view-button
{
margin-left: 8px;
padding-top: 1px;
-moz-image-region: rect(102px 45px 136px 0px);
}
-#calendar-month-view-button[disabled="true"],
-#calendar-month-view-button[disabled="true"]:hover,
-#calendar-month-view-button[disabled="true"]:hover:active,
+#calendar-month-view-button[checked="true"],
+#calendar-month-view-button[checked="true"]:hover,
+#calendar-month-view-button[checked="true"]:hover:active,
#calendar-month-view-button:hover:active
{
-moz-image-region: rect(102px 135px 136px 90px);
}
#calendar-month-view-button:hover
{
@@ -251,15 +251,15 @@
#calendar-week-view-button
{
margin-left: 8px;
padding-top: 1px;
-moz-image-region: rect(34px 45px 68px 0px);
}
-#calendar-week-view-button[disabled="true"],
-#calendar-week-view-button[disabled="true"]:hover,
-#calendar-week-view-button[disabled="true"]:hover:active,
+#calendar-week-view-button[checked="true"],
+#calendar-week-view-button[checked="true"]:hover,
+#calendar-week-view-button[checked="true"]:hover:active,
#calendar-week-view-button:hover:active
{
-moz-image-region: rect(34px 135px 68px 90px);
}
#calendar-week-view-button:hover
{
@@ -273,15 +273,15 @@
#calendar-day-view-button
{
margin-left: 8px;
padding-top: 1px;
-moz-image-region: rect(0 45px 34px 0px);
}
-#calendar-day-view-button[disabled="true"],
-#calendar-day-view-button[disabled="true"]:hover,
-#calendar-day-view-button[disabled="true"]:hover:active,
+#calendar-day-view-button[checked="true"],
+#calendar-day-view-button[checked="true"]:hover,
+#calendar-day-view-button[checked="true"]:hover:active,
#calendar-day-view-button:hover:active
{
-moz-image-region: rect(0 135px 34px 90px);
}
#calendar-day-view-button:hover
{
Index: calendar/resources/content/calendar.xul
===================================================================
RCS file: /cvsroot/mozilla/calendar/resources/content/calendar.xul,v
retrieving revision 1.197
diff -u -6 -r1.197 calendar.xul
--- calendar/resources/content/calendar.xul 24 Dec 2005 20:24:26 -0000 1.197
+++ calendar/resources/content/calendar.xul 31 Dec 2005 16:52:10 -0000
@@ -106,16 +106,16 @@
-
-
-
-
+
+
+
+
@@ -292,26 +292,12 @@
-
-
-
-
-
-
Index: calendar/resources/content/calendarWindow.js
===================================================================
RCS file: /cvsroot/mozilla/calendar/resources/content/calendarWindow.js,v
retrieving revision 1.81
diff -u -6 -r1.81 calendarWindow.js
--- calendar/resources/content/calendarWindow.js 26 Dec 2005 16:32:11 -0000 1.81
+++ calendar/resources/content/calendarWindow.js 31 Dec 2005 16:52:16 -0000
@@ -200,60 +200,60 @@
*
* Switch to the day view if it isn't already the current view
*/
CalendarWindow.prototype.switchToDayView = function calWin_switchToDayView( )
{
- document.getElementById("day_view_command").setAttribute("disabled", true);
- document.getElementById("week_view_command").removeAttribute("disabled");
- document.getElementById("multiweek_view_command").removeAttribute("disabled");
- document.getElementById("month_view_command").removeAttribute("disabled");
+ document.getElementById( "day_view_command" ).setAttribute( "checked", "true" );
+ document.getElementById( "week_view_command" ).removeAttribute("checked");
+ document.getElementById( "multiweek_view_command" ).removeAttribute("checked");
+ document.getElementById( "month_view_command" ).removeAttribute("checked");
this.switchToView('day-view');
}
/** PUBLIC
*
* Switch to the week view if it isn't already the current view
*/
CalendarWindow.prototype.switchToWeekView = function calWin_switchToWeekView( )
{
- document.getElementById("day_view_command").removeAttribute("disabled");
- document.getElementById("week_view_command").setAttribute("disabled", true);
- document.getElementById("multiweek_view_command").removeAttribute("disabled");
- document.getElementById("month_view_command").removeAttribute("disabled");
+ document.getElementById( "week_view_command" ).setAttribute( "checked", "true" );
+ document.getElementById( "day_view_command" ).removeAttribute("checked");
+ document.getElementById( "multiweek_view_command" ).removeAttribute("checked");
+ document.getElementById( "month_view_command" ).removeAttribute("checked");
this.switchToView('week-view');
}
/** PUBLIC
*
* Switch to the month view if it isn't already the current view
*/
CalendarWindow.prototype.switchToMonthView = function calWin_switchToMonthView( )
{
- document.getElementById("day_view_command").removeAttribute("disabled");
- document.getElementById("week_view_command").removeAttribute("disabled");
- document.getElementById("multiweek_view_command").removeAttribute("disabled");
- document.getElementById("month_view_command").setAttribute("disabled", true);
+ document.getElementById( "month_view_command" ).setAttribute( "checked", "true" );
+ document.getElementById( "day_view_command" ).removeAttribute("checked");
+ document.getElementById( "multiweek_view_command" ).removeAttribute("checked");
+ document.getElementById( "week_view_command" ).removeAttribute("checked");
this.switchToView('month-view');
}
/** PUBLIC
*
* Switch to the multiweek view if it isn't already the current view
*/
CalendarWindow.prototype.switchToMultiweekView = function calWin_switchToMultiweekView( )
{
- document.getElementById("day_view_command").removeAttribute("disabled");
- document.getElementById("week_view_command").removeAttribute("disabled");
- document.getElementById("multiweek_view_command").setAttribute("disabled", true);
- document.getElementById("month_view_command").removeAttribute("disabled");
+ document.getElementById( "multiweek_view_command" ).setAttribute( "checked", "true" );
+ document.getElementById( "day_view_command" ).removeAttribute("checked");
+ document.getElementById( "week_view_command" ).removeAttribute("checked");
+ document.getElementById( "month_view_command" ).removeAttribute("checked");
this.switchToView('multiweek-view');
}
/** PUBLIC
*
* Display today in the current view
Index: calendar/resources/content/menuOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/calendar/resources/content/menuOverlay.xul,v
retrieving revision 1.71
diff -u -6 -r1.71 menuOverlay.xul
--- calendar/resources/content/menuOverlay.xul 23 Dec 2005 21:58:44 -0000 1.71
+++ calendar/resources/content/menuOverlay.xul 31 Dec 2005 16:52:22 -0000
@@ -220,27 +220,35 @@