From 1547feccf321c2cba7e4d56429189f9ff1c78f0d Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 22 May 2007 14:38:54 +0000
Subject: [PATCH] Monotone-Parent: a0715acf1cc86b5389ffa60d65b3f90e4d976e79
 Monotone-Revision: 37ceea55166e4e5489fd66be14e66b1dc1635432

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-22T14:38:54
Monotone-Branch: ca.inverse.sogo
---
 .../SchedulerUI/UIxCalFilterPanel.wox         |   4 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox   |  50 ++++-----
 UI/WebServerResources/HTMLElement.js          |   2 +-
 UI/WebServerResources/MailerUI.js             |   3 +-
 UI/WebServerResources/SchedulerUI.js          | 106 +++++++++++-------
 UI/WebServerResources/UIxAclEditor.js         |   9 +-
 6 files changed, 98 insertions(+), 76 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
index 44c03cade..c0b6f513b 100644
--- a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
+++ b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
@@ -7,9 +7,7 @@
     >
     <div class="menu" id="searchMenu">
       <ul id="searchOptions">
-        <li id="name_or_address"
-          onmousedown="return false;"
-          onmouseup="setSearchCriteria(event);"><var:string label:value="Title or Description"/></li>
+        <li><var:string label:value="Title or Description"/></li>
       </ul>
     </div>
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index e065bda08..688969bd3 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -14,10 +14,7 @@
     <div class="menu" id="monthListMenu">
       <ul>
         <var:foreach list="monthMenuItems" item="monthMenuItem"
-          ><li
-            onmousedown="return false;"
-            onclick="return onMonthMenuItemClick(this);"
-            var:month="monthMenuItem"
+          ><li var:month="monthMenuItem"
             ><var:string value="monthMenuItemLabel" /></li>
         </var:foreach
           ></ul>
@@ -26,41 +23,38 @@
     <div class="menu" id="yearListMenu">
       <ul>
         <var:foreach list="yearMenuItems" item="yearMenuItem"
-          ><li
-            onmousedown="return false;"
-            onclick="return onYearMenuItemClick(this);"
-            ><var:string value="yearMenuItem" /></li>
+          ><li><var:string value="yearMenuItem" /></li>
         </var:foreach
         ></ul>
     </div>
 
     <div class="menu" id="appointmentsListMenu">
       <ul>
-        <li onmouseup="newEvent(this, 'event');"><var:string label:value="New Event..."/></li>
-        <li class="separator"></li>
-        <li onmouseup="newEvent(this, 'task');"><var:string label:value="New Task..."/></li>
-        <li onmouseup="editEvent();"><var:string label:value="Edit Selected Event..."/></li>
-        <li onmouseup="deleteEvent();"><var:string label:value="Delete Selected Event"/></li>
-        <li class="separator"></li>
-        <li onmouseup="onSelectAll();"><var:string label:value="Select All"/></li>
-        <li class="separator"></li>
-        <li onmouseup="onToggleWorkweekDaysOnly();"><var:string label:value="Workweek days only" /></li>
-        <li onmouseup="onToggleTasksInView();"><var:string label:value="Tasks in View"/></li>
+        <li><var:string label:value="New Event..."/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="New Task..."/></li>
+        <li><var:string label:value="Edit Selected Event..."/></li>
+        <li><var:string label:value="Delete Selected Event"/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Select All"/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Workweek days only"/></li>
+        <li><var:string label:value="Tasks in View"/></li>
       </ul>
     </div>
 
     <div class="menu" id="calendarsMenu">
       <ul>
-        <li class="disabled" id="newCalendarMenuEntry"><var:string label:value="New Calendar..."/></li>
-        <li class="disabled" id="deleteCalendarMenuEntry"><var:string label:value="Delete Calendar"/></li>
-        <li id="accessRightsMenuEntry"><var:string label:value="Sharing..." /></li>
-        <li class="separator"></li>
-        <li class="disabled" id="exportCalendarMenuEntry"><var:string label:value="Export Calendar..."/></li>
-        <li class="disabled" id="publishCalendarMenuEntry"><var:string label:value="Publish Calendar..."/></li>
-        <li class="separator"></li>
-        <li class="disabled" id="publishCalendarMenuEntry"><var:string label:value="Reload Remote Calendars"/></li>
-        <li class="separator"></li>
-        <li class="disabled" id="calendarPropertiesMenuEntry"><var:string label:value="Properties"/></li>
+        <li><var:string label:value="New Calendar..."/></li>
+        <li><var:string label:value="Delete Calendar"/></li>
+        <li><var:string label:value="Sharing..." /></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Export Calendar..."/></li>
+        <li><var:string label:value="Publish Calendar..."/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Reload Remote Calendars"/></li>
+        <li><!-- separator --></li>
+        <li><var:string label:value="Properties"/></li>
       </ul>
     </div>
 
diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 6168bfb9e..44e876b99 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -216,7 +216,7 @@ HTMLElement.prototype.onContextMenu = function(event) {
 
 HTMLElement.prototype.attachMenu = function(menuName) {
   this.sogoContextMenu = $(menuName);
-  this.addEventListener("contextmenu", this.onContextMenu, true);
+  Event.observe(this, "contextmenu", this.onContextMenu);
 }
 
 HTMLElement.prototype.select = function() {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 613963397..0c5629e7a 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1077,7 +1077,8 @@ function initializeMenus() {
    menus["trashIconMenu"] = new Array(null, null, null, "-", null, null, null,
 				      null, "-", null, onMenuSharing);
    menus["mailboxIconMenu"] = new Array(null, null, null, "-", null, null,
-					null, null, null, "-", null, onMenuSharing);
+					null, null, null, "-", null,
+					onMenuSharing);
    menus["addressMenu"] = new Array(newContactFromEmail, newEmailTo, null);
    menus["messageListMenu"] = new Array(onMenuOpenMessage, "-",
 					onMenuReplyToSender,
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 297ae334c..4628e08f0 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -23,28 +23,36 @@ var usersRightsWindowHeight = 250;
 var usersRightsWindowWidth = 502;
 
 function newEvent(sender, type) {
-  var day = sender.getAttribute("day");
-  if (!day)
-    day = currentDay;
+   var day = sender.getAttribute("day");
+   if (!day)
+      day = currentDay;
 
-  var user = UserLogin;
-  if (sender.parentNode.getAttribute("id") != "toolbar"
-      && currentView == "multicolumndayview" && type == "event")
-     user = sender.parentNode.parentNode.getAttribute("user");
+   var user = UserLogin;
+   if (sender.parentNode.getAttribute("id") != "toolbar"
+       && currentView == "multicolumndayview" && type == "event")
+      user = sender.parentNode.parentNode.getAttribute("user");
 
-  var hour = sender.getAttribute("hour");
-  var urlstr = UserFolderURL + "../" + user + "/Calendar/new" + type;
-  var params = new Array();
-  if (day)
-    params.push("day=" + day);
-  if (hour)
-    params.push("hm=" + hour);
-  if (params.length > 0)
-    urlstr += "?" + params.join("&");
+   var hour = sender.getAttribute("hour");
+   var urlstr = UserFolderURL + "../" + user + "/Calendar/new" + type;
+   var params = new Array();
+   if (day)
+      params.push("day=" + day);
+   if (hour)
+      params.push("hm=" + hour);
+   if (params.length > 0)
+      urlstr += "?" + params.join("&");
+   
+   window.open(urlstr, "", "width=490,height=470,resizable=0");
+   
+   return false; /* stop following the link */
+}
 
-  window.open(urlstr, "", "width=490,height=470,resizable=0");
+function onMenuNewEventClick(event) {
+   newEvent(this, "event");
+}
 
-  return false; /* stop following the link */
+function onMenuNewTaskClick(event) {
+   newEvent(this, "task");
 }
 
 function _editEventId(id, owner) {
@@ -552,7 +560,7 @@ function onAppointmentContextMenu(event, element) {
   var menu = $("appointmentsListMenu");
 
   menu.addEventListener("hideMenu", onAppointmentContextMenuHide, false);
-  onMenuClick(event, "appointmentsListMenu");
+  popupMenu(event, "appointmentsListMenu", element);
 
   var topNode = $("appointmentsList");
   var selectedNodes = topNode.getSelectedRows();
@@ -717,22 +725,20 @@ function popupMonthMenu(event, menuId) {
   }
 }
 
-function onMonthMenuItemClick(node) {
-  var month = '' + node.getAttribute("month");
+function onMonthMenuItemClick(event) {
+  var month = '' + this.getAttribute("month");
   var year = '' + $("yearLabel").innerHTML;
-  
-  changeDateSelectorDisplay(year+month+"01", true);
 
-  return false;
+  changeDateSelectorDisplay(year + month + "01", true);
+
+//   event.cancelBubble();
 }
 
-function onYearMenuItemClick(node) {
+function onYearMenuItemClick(event) {
   var month = '' + $("monthLabel").getAttribute("month");;
-  var year = '' + node.innerHTML;
+  var year = '' + this.innerHTML;
 
-  changeDateSelectorDisplay(year+month+"01", true);
-
-  return false;
+  changeDateSelectorDisplay(year + month + "01", true);
 }
 
 function onSearchFormSubmit() {
@@ -980,25 +986,45 @@ function browseURL(anchor, event) {
 }
 
 function initializeMenus() {
-//   var menus = new Array("monthListMenu", "yearListMenu",
-//                         "appointmentsListMenu", "calendarsMenu", "searchMenu");
-//   initMenusNamed(menus);
+   menus["menuIds"] = new Array("monthListMenu", "yearListMenu",
+				"appointmentsListMenu",
+ 				"calendarsMenu",
+ 				"searchMenu");
+   var dateMenu = new Array();
+   for (var i = 0; i < 12; i++)
+      dateMenu.push(onMonthMenuItemClick);
+   menus["monthListMenu"] = dateMenu;
 
-//   $("calendarSelector").attachMenu("calendarsMenu");
+   dateMenu = new Array();
+   for (var i = 0; i < 11; i++)
+      dateMenu.push(onYearMenuItemClick);
+   menus["yearListMenu"] = dateMenu;
 
-//   var accessRightsMenuEntry = $("accessRightsMenuEntry");
-//   accessRightsMenuEntry.addEventListener("mouseup",
-//                                          onMenuSharing,
-//                                          false);
+   menus["appointmentsListMenu"] = new Array(onMenuNewEventClick, "-",
+					     onMenuNewTaskClick,
+					     editEvent, deleteEvent, "-",
+					     onSelectAll, "-",
+					     null, null);
+   menus["calendarsMenu"] = new Array(null, null, null, "-", null, null, "-",
+				      null, "-", onMenuSharing);
+   menus["searchMenu"] = new Array(setSearchCriteria);
+
+   initMenus();
+
+   $("calendarSelector").attachMenu("calendarsMenu");
 }
 
 function onMenuSharing(event) {
   var folders = $("calendarList");
   var selected = folders.getSelectedNodes()[0];
-  var folderID = selected.getAttribute("id");
-  var urlstr = URLForFolderID(folderID) + "/acls";
+  /* FIXME: activation of the context menu should preferable select the entry
+	       above which the event has occured */
+  if (selected) {
+     var folderID = selected.getAttribute("id");
+     var urlstr = URLForFolderID(folderID) + "/acls";
 
-  openAclWindow(urlstr);
+     openAclWindow(urlstr);
+  }
 }
 
 function configureDragHandles() {
diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js
index 0745c2fe0..5354d9998 100644
--- a/UI/WebServerResources/UIxAclEditor.js
+++ b/UI/WebServerResources/UIxAclEditor.js
@@ -127,9 +127,12 @@ function onAclLoadHandler() {
    for (var i = 0; i < lis.length; i++)
       setEventsOnUserNode(lis[i]);
 
-   var buttons = $("userSelectorButtons").childNodesWithTag("a");
-   Event.observe(buttons[0], "click", onUserAdd);
-   Event.observe(buttons[1], "click", onUserRemove);
+   var buttonArea = $("userSelectorButtons");
+   if (buttonArea) {
+      var buttons = buttonArea.childNodesWithTag("a");
+      Event.observe(buttons[0], "click", onUserAdd);
+      Event.observe(buttons[1], "click", onUserRemove);
+   }
 
    this.userRightsHeight = window.opener.getUsersRightsWindowHeight();
    this.userRightsWidth = window.opener.getUsersRightsWindowWidth();