From c54a74ebe0b3ea793469170a2542bb1ae4685380 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 22 May 2007 15:19:52 +0000
Subject: [PATCH] Monotone-Parent: 23d43e89ea5144597dd91682802c352295f3a8f5
 Monotone-Revision: 1cb455e5ec2a7e5fe584f0aabe21cd236f2e01d8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-22T15:19:52
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/ContactsUI/UIxContactsListViewContainer.wox | 3 ++-
 UI/Templates/SchedulerUI/UIxCalMainView.wox              | 3 +--
 UI/WebServerResources/ContactsUI.js                      | 5 +++--
 UI/WebServerResources/SchedulerUI.js                     | 2 +-
 UI/WebServerResources/generic.js                         | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index 3edc005b4..8a2d86556 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -14,12 +14,13 @@
     <div class="menu" id="contactFoldersMenu">
       <ul>
 	<li><var:string label:value="Modify" /></li>
-	<li><var:string label:value="Sharing..." /></li>
 	<li><!-- separator --></li>
 	<li><var:string label:value="New Card" /></li>
 	<li><var:string label:value="New List" /></li>
 	<li><!-- separator --></li>
 	<li><var:string label:value="Delete" /></li>
+	<li><!-- separator --></li>
+	<li><var:string label:value="Sharing..." /></li>
       </ul>
     </div>
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 688969bd3..6c075ace7 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -47,14 +47,13 @@
       <ul>
         <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>
+        <li><var:string label:value="Sharing..." /></li>
       </ul>
     </div>
 
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 1d17513b4..334291133 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -615,8 +615,9 @@ function onMenuSharing(event) {
 function initializeMenus() {
    menus["menuIds"] = new Array("contactFoldersMenu", "contactMenu",
 				"searchMenu");
-   menus["contactFoldersMenu"] = new Array(null, onMenuSharing, "-", null,
-					   null, "-", null);
+   menus["contactFoldersMenu"] = new Array(null, "-", null,
+					   null, "-", null, "-",
+					   onMenuSharing);
    menus["contactMenu"] = new Array(onMenuEditContact, "-",
 				    onMenuWriteToContact, null, "-",
 				    onMenuDeleteContact);
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 4628e08f0..b8ed20fe4 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1005,7 +1005,7 @@ function initializeMenus() {
 					     editEvent, deleteEvent, "-",
 					     onSelectAll, "-",
 					     null, null);
-   menus["calendarsMenu"] = new Array(null, null, null, "-", null, null, "-",
+   menus["calendarsMenu"] = new Array(null, null, "-", null, null, "-",
 				      null, "-", onMenuSharing);
    menus["searchMenu"] = new Array(setSearchCriteria);
 
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 90c61c400..d9cf205b8 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1076,11 +1076,11 @@ function indexColor(number) {
 
 var onLoadHandler = function (event) {
   queryParameters = parseQueryParameters('' + window.location);
-  if (!$(document.body).hasClassName("popup")) {
+  if (!document.body.hasClassName("popup")) {
     initLogConsole();
-    initializeMenus();
     initCriteria();
   }
+  initializeMenus();
   initTabs();
   configureDragHandles();
   configureSortableTableHeaders();