From b011ee41cc1365e5e07e652266c637eb8a54f430 Mon Sep 17 00:00:00 2001
From: "mostafah%oeone.com" <mostafah%oeone.com>
Date: Tue, 8 Jun 2004 12:50:51 +0000
Subject: [PATCH] Checked in patch for bug 245611

---
 calendar/sunbird/base/content/calendar.xul    | 14 ++++++-------
 calendar/sunbird/base/content/menuOverlay.xul | 21 ++++++++++++-------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/calendar/sunbird/base/content/calendar.xul b/calendar/sunbird/base/content/calendar.xul
index dbd693b5e2c..69ed5b515bc 100644
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -46,7 +46,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/content/datepicker/calendar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/content/datetimepickers/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/communicator.css" type="text/css"?>
 
 <!-- Overlays -->
@@ -113,6 +113,7 @@
    <command id="next_command" oncommand="gCalendarWindow.currentView.goToNext()"/>
    <command id="previous_command" oncommand="gCalendarWindow.currentView.goToPrevious()"/>
    <command id="go_today_command" oncommand="gCalendarWindow.goToToday()"/>
+   <command id="go_date_command" oncommand="gCalendarWindow.pickAndGoToDate()"/>
    
    <command id="day_view_command"   oncommand="gCalendarWindow.switchToDayView()" disabled="true"/>
    <command id="week_view_command"  oncommand="gCalendarWindow.switchToWeekView()" disabled="true"/>
@@ -154,9 +155,10 @@
   <key id="view_multiweek_key" keycode="VK_F3" observes="multiweek_view_command"/>
   <key id="view_month_key" keycode="VK_F4" observes="month_view_command"/>
   
-  <key id="go_forward_key" keycode="VK_PAGE_UP" observes="previous_command"/>
-  <key id="go_backward_key" keycode="VK_PAGE_DOWN" observes="next_command"/>
+  <key id="go_backward_key" keycode="VK_PAGE_UP" observes="previous_command"/>
+  <key id="go_forward_key"  keycode="VK_PAGE_DOWN" observes="next_command"/>
   <key id="go_to_today_key"   keycode="VK_DOWN" modifiers="control" observes="go_today_command"/>
+  <key id="go_to_date_key" keycode="VK_UP" modifiers="control" observes="go_date_command"/>
   
   <key id="key_close" key="W" modifiers="control" observes="close_calendar_command"/>
 </keyset>
@@ -403,10 +405,6 @@
              observes="publish_calendar"/>
 </popup>
 
-<popup id="oe-date-picker-popup"  position="after_start" value="">
-   <datepicker id="oe-date-picker" valud="" ondatepick="gCalendarWindow.goToDay( date )"/>
-</popup>
-
 <commandset id="commands"/>
 
 <toolbox id="calendar-toolbox" class="toolbox-top" deferattached="true">
@@ -489,7 +487,7 @@
          <tabpanels>
          <tabpanel>
             <vbox flex="1">
-               <calendar flex="1" id="lefthandcalendar" onchange="gCalendarWindow.goToDay( this.value );"/>
+               <minimonth flex="1" id="lefthandcalendar" onchange="gCalendarWindow.goToDay( this.value );" />
                <button observes="go_today_command" label="&calendar.gototoday.button.label;"/>
             </vbox>
          </tabpanel>
diff --git a/calendar/sunbird/base/content/menuOverlay.xul b/calendar/sunbird/base/content/menuOverlay.xul
index 21a05cad2e9..3f5e9b307d3 100644
--- a/calendar/sunbird/base/content/menuOverlay.xul
+++ b/calendar/sunbird/base/content/menuOverlay.xul
@@ -248,19 +248,26 @@
          label="&goMenu.label;"
          accesskey="&goMenu.accesskey;">
       <menupopup id="mppView">
-         <menuitem id="calendar-view-menu-today"
+         <menuitem id="calendar-go-menu-today"
                    key="go_to_today_key"
                    label="&goTodayCmd.label;"
                    accesskey="&goTodayCmd.accesskey;"
                    observes="go_today_command"/>
-         <menuitem id="calendar-view-menu-previous"
-                   key="go_forward_key"
-                   label="&goPreviousCmd.label;"
-                   accesskey="&goPreviousCmd.accesskey;"/>
-         <menuitem id="calendar-view-menu-next"
+         <menuitem id="calendar-go-menu-date"
+                   key="go_to_date_key"
+                   label="&goDateCmd.label;"
+                   accesskey="&goDateCmd.accesskey;"
+                   observes="go_date_command"/>
+         <menuitem id="calendar-go-menu-previous"
                    key="go_backward_key"
+                   label="&goPreviousCmd.label;"
+                   accesskey="&goPreviousCmd.accesskey;"
+                   observes="previous_command"/>
+         <menuitem id="calendar-go-menu-next"
+                   key="go_forward_key"
                    label="&goNextCmd.label;"
-                   accesskey="&goNextCmd.accesskey;"/>
+                   accesskey="&goNextCmd.accesskey;"
+                   observes="next_command"/>
       </menupopup>
    </menu>