diff --git a/mozilla/calendar/resources/content/calendar.js b/mozilla/calendar/resources/content/calendar.js
index 55670e76a17..e33c6c6b0e1 100644
--- a/mozilla/calendar/resources/content/calendar.js
+++ b/mozilla/calendar/resources/content/calendar.js
@@ -432,20 +432,6 @@ function deselectEventInUnifinder( )
document.getElementById( "modify_command" ).setAttribute( "disabled", true );
}
-function selectCategoryInUnifinder( )
-{
- document.getElementById( "delete_command" ).removeAttribute( "disabled" );
-
- document.getElementById( "modify_command" ).removeAttribute( "disabled" );
-}
-
-function deselectCategoryInUnifinder( )
-{
- document.getElementById( "delete_command" ).setAttribute( "disabled", true );
-
- document.getElementById( "modify_command" ).setAttribute( "disabled", true );
-}
-
/**
* Called when the new event button is clicked
diff --git a/mozilla/calendar/resources/content/calendarEventDialog.xul b/mozilla/calendar/resources/content/calendarEventDialog.xul
index bbe53fdb050..a9e6bef9a4f 100644
--- a/mozilla/calendar/resources/content/calendarEventDialog.xul
+++ b/mozilla/calendar/resources/content/calendarEventDialog.xul
@@ -127,18 +127,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/calendar/resources/content/eventDialog.xul b/mozilla/calendar/resources/content/eventDialog.xul
index bbe53fdb050..a9e6bef9a4f 100644
--- a/mozilla/calendar/resources/content/eventDialog.xul
+++ b/mozilla/calendar/resources/content/eventDialog.xul
@@ -127,18 +127,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/mozilla/calendar/resources/content/test/testCalendarEvent.js b/mozilla/calendar/resources/content/test/testCalendarEvent.js
index 65d4d8e8908..a0757d96dc1 100644
--- a/mozilla/calendar/resources/content/test/testCalendarEvent.js
+++ b/mozilla/calendar/resources/content/test/testCalendarEvent.js
@@ -545,11 +545,8 @@ function testModify( owner )
this.repeatEnd = new Date( 2000, 6, 7, 0, 0, 0 );
this.addedEvent.repeatEnd = this.repeatEnd;
- this.addedEvent.category = "7";
-
/* THESE FIELDS ARE NOT SET UP PROPERLY WHEN YOU GET AN EVENT
FOR MODIFICATION!!!!
- category:null,
location:null,
inviteEmailAddress:null,
alarmEmailAddress:null,
@@ -597,7 +594,6 @@ function testModify( owner )
assertEquals( "mod: start" , this.newStart.toString(), this.modEvent.start.toString() );
assertEquals( "mod: end" , this.newEnd.toString(), this.modEvent.end.toString() );
assertEquals( "mod: description" , "test description", this.modEvent.description );
- assertEquals( "mod: category" , "7", this.modEvent.category );
assertEquals( "mod: location" , "test location", this.modEvent.location );
assertEquals( "mod: privateEvent" , false, this.modEvent.privateEvent );
assertEquals( "mod: alarm" , true, this.modEvent.alarm );
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index ea02746b412..9f9556bd383 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -106,14 +106,14 @@ calendar.jar:
skin/modern/calendar/week_up.gif (skin/modern/week_up.gif)
skin/modern/calendar/weekendwatch1.png (skin/modern/weekendwatch1.png)
skin/modern/calendar/weekendwatch8.png (skin/modern/weekendwatch8.png)
- skin/modern/calendar/ca-event-dialog/calendar_disabled.png (skin/modern/ca-event-dialog/calendar_disabled.png)
- skin/modern/calendar/ca-event-dialog/calendar_down.png (skin/modern/ca-event-dialog/calendar_down.png)
- skin/modern/calendar/ca-event-dialog/calendar_hover.png (skin/modern/ca-event-dialog/calendar_hover.png)
- skin/modern/calendar/ca-event-dialog/calendar_up.png (skin/modern/ca-event-dialog/calendar_up.png)
- skin/modern/calendar/ca-event-dialog/clock_disabled.png (skin/modern/ca-event-dialog/clock_disabled.png)
- skin/modern/calendar/ca-event-dialog/clock_down.png (skin/modern/ca-event-dialog/clock_down.png)
- skin/modern/calendar/ca-event-dialog/clock_hover.png (skin/modern/ca-event-dialog/clock_hover.png)
- skin/modern/calendar/ca-event-dialog/clock_up.png (skin/modern/ca-event-dialog/clock_up.png)
+ skin/modern/calendar/ca-event-dialog/calendar_disabled.gif (skin/modern/ca-event-dialog/calendar_disabled.gif)
+ skin/modern/calendar/ca-event-dialog/calendar_down.gif (skin/modern/ca-event-dialog/calendar_down.gif)
+ skin/modern/calendar/ca-event-dialog/calendar_hover.gif (skin/modern/ca-event-dialog/calendar_hover.gif)
+ skin/modern/calendar/ca-event-dialog/calendar_up.gif (skin/modern/ca-event-dialog/calendar_up.gif)
+ skin/modern/calendar/ca-event-dialog/clock_disabled.gif (skin/modern/ca-event-dialog/clock_disabled.gif)
+ skin/modern/calendar/ca-event-dialog/clock_down.gif (skin/modern/ca-event-dialog/clock_down.gif)
+ skin/modern/calendar/ca-event-dialog/clock_hover.gif (skin/modern/ca-event-dialog/clock_hover.gif)
+ skin/modern/calendar/ca-event-dialog/clock_up.gif (skin/modern/ca-event-dialog/clock_up.gif)
skin/modern/calendar/ca-event-dialog/new_event_icon.png (skin/modern/ca-event-dialog/new_event_icon.png)
skin/modern/calendar/datepicker/datepicker.css (skin/modern/datepicker/datepicker.css)
skin/modern/calendar/datepicker/day_grid.png (skin/modern/datepicker/day_grid.png)
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.gif
new file mode 100644
index 00000000000..5c9a9414d1c
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.png
deleted file mode 100644
index e9c5b47684f..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_disabled.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.gif
new file mode 100644
index 00000000000..a0c23350e99
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.png
deleted file mode 100644
index ee1f9f02ece..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_down.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.gif
new file mode 100644
index 00000000000..c7416ee3627
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.png
deleted file mode 100644
index 190bae7bc9c..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_hover.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.gif
new file mode 100644
index 00000000000..496fc65eaef
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.png
deleted file mode 100644
index c0d65b39949..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/calendar_up.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.gif
new file mode 100644
index 00000000000..a052b69560e
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.png
deleted file mode 100644
index 712089c83f3..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_disabled.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.gif
new file mode 100644
index 00000000000..c275a4967a3
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.png
deleted file mode 100644
index 6c9b83e028a..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_down.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.gif
new file mode 100644
index 00000000000..6a363239bbc
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.png
deleted file mode 100644
index 3a54073542a..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_hover.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.gif b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.gif
new file mode 100644
index 00000000000..43ad00d8982
Binary files /dev/null and b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.gif differ
diff --git a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.png b/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.png
deleted file mode 100644
index c1995197c27..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/ca-event-dialog/clock_up.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/calendarEventDialog.css b/mozilla/calendar/resources/skin/modern/calendarEventDialog.css
index b9576ac31dd..362d9510a91 100644
--- a/mozilla/calendar/resources/skin/modern/calendarEventDialog.css
+++ b/mozilla/calendar/resources/skin/modern/calendarEventDialog.css
@@ -169,21 +169,21 @@
#start-date-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.gif");
}
#start-date-button[disabled="true"],
#start-date-button[disabled="true"]:hover,
#start-date-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.gif");
}
#start-date-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.gif");
}
#start-date-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.gif");
}
@@ -194,21 +194,21 @@
#start-time-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.gif");
}
#start-time-button[disabled="true"],
#start-time-button[disabled="true"]:hover,
#start-time-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.gif");
}
#start-time-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.gif");
}
#start-time-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.gif");
}
@@ -219,21 +219,21 @@
#end-time-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.gif");
}
#end-time-button[disabled="true"],
#end-time-button[disabled="true"]:hover,
#end-time-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.gif");
}
#end-time-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.gif");
}
#end-time-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.gif");
}
@@ -245,21 +245,21 @@
#repeat-end-date-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.gif");
}
#repeat-end-date-button[disabled="true"],
#repeat-end-date-button[disabled="true"]:hover,
#repeat-end-date-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.gif");
}
#repeat-end-date-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.gif");
}
#repeat-end-date-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.gif");
}
diff --git a/mozilla/calendar/resources/skin/modern/eventDialog.css b/mozilla/calendar/resources/skin/modern/eventDialog.css
index b9576ac31dd..362d9510a91 100644
--- a/mozilla/calendar/resources/skin/modern/eventDialog.css
+++ b/mozilla/calendar/resources/skin/modern/eventDialog.css
@@ -169,21 +169,21 @@
#start-date-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.gif");
}
#start-date-button[disabled="true"],
#start-date-button[disabled="true"]:hover,
#start-date-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.gif");
}
#start-date-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.gif");
}
#start-date-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.gif");
}
@@ -194,21 +194,21 @@
#start-time-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.gif");
}
#start-time-button[disabled="true"],
#start-time-button[disabled="true"]:hover,
#start-time-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.gif");
}
#start-time-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.gif");
}
#start-time-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.gif");
}
@@ -219,21 +219,21 @@
#end-time-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_up.gif");
}
#end-time-button[disabled="true"],
#end-time-button[disabled="true"]:hover,
#end-time-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_disabled.gif");
}
#end-time-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_hover.gif");
}
#end-time-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/clock_down.gif");
}
@@ -245,21 +245,21 @@
#repeat-end-date-button
{
margin-left : 3px;
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_up.gif");
}
#repeat-end-date-button[disabled="true"],
#repeat-end-date-button[disabled="true"]:hover,
#repeat-end-date-button[disabled="true"]:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_disabled.gif");
}
#repeat-end-date-button:hover
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_hover.gif");
}
#repeat-end-date-button:hover:active
{
- list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.png");
+ list-style-image : url("chrome://calendar/skin/ca-event-dialog/calendar_down.gif");
}
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css b/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
index 1345f6a294d..b933bbfbd27 100644
--- a/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
+++ b/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
@@ -122,24 +122,20 @@ tabpanels {
.unifinder-modify-button > .unifinder-button-image
{
- background-color : #DDE3EB;
list-style-image : url("chrome://calendar/skin/unifinder/modify_up.png");
}
.unifinder-modify-button[disabled="true"] > .unifinder-button-image,
.unifinder-modify-button[disabled="true"]:hover > .unifinder-button-image,
.unifinder-modify-button[disabled="true"]:hover:active > .unifinder-button-image
{
- background-color : #DDE3EB;
list-style-image : url("chrome://calendar/skin/unifinder/modify_disabled.png");
}
.unifinder-modify-button:hover > .unifinder-button-image
{
- background-color : #EAEEF6;
list-style-image : url("chrome://calendar/skin/unifinder/modify_hover.png");
}
.unifinder-modify-button:hover:active > .unifinder-button-image
{
- background-color : #CBD9E8;
list-style-image : url("chrome://calendar/skin/unifinder/modify_down.png");
}
@@ -173,6 +169,28 @@ tabpanels {
list-style-image : url("chrome://calendar/skin/unifinder/remove_down.png");
}
+.unifinder-remove-button,
+.unifinder-remove-button[disabled="true"],
+.unifinder-remove-button[disabled="true"]:hover,
+.unifinder-remove-button[disabled="true"]:hover:active,
+.unifinder-modify-button,
+.unifinder-modify-button[disabled="true"],
+.unifinder-modify-button[disabled="true"]:hover,
+.unifinder-modify-button[disabled="true"]:hover:active
+ {
+ background-color : #DDE3EB;
+ }
+.unifinder-remove-button:hover,
+.unifinder-modify-button:hover
+ {
+ background-color : #EAEEF6;
+ }
+.unifinder-remove-button:hover:active,
+.unifinder-modify-button:hover:active
+ {
+ background-color : #CBD9E8;
+ }
+
.unifinder-button-text
{
font-family : helvetica;