From 8bc105c8542b83b13bbe4b4da6e05b981f4a4585 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 19 Dec 2006 19:17:35 +0000
Subject: [PATCH] Monotone-Parent: 1b12beb00e557f3ecfec3bb87a586b501981fced
 Monotone-Revision: 4d602a103e8374d8aced65e9979231733ede20b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-12-19T19:17:35
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/UIxPageFrame.wox        |  2 --
 UI/WebServerResources/SchedulerUI.js | 24 +++++++-----------------
 UI/WebServerResources/generic.js     | 13 ++-----------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 8b087e3bb..ed9460fe5 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -68,8 +68,6 @@
                 ><var:string label:value="Address Book" /></a> |
               <a var:href="relativeMailPath"
                 ><var:string label:value="Mail" /></a> |
-              <a href="#" id="rightAdministrationLink"
-                ><var:string label:value="Right Administration" /></a> |
               <a var:href="logoffPath"
                 ><var:string label:value="Logoff" /></a>
               <var:if condition="context.isUIxDebugEnabled"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 21bd2a8a0..023f60f5d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -473,7 +473,7 @@ function calendarDisplayCallback(http)
     var appointments = document.getElementsByClassName("appointment", contentView);
     for (var i = 0; i < appointments.length; i++) {
       appointments[i].addEventListener("mousedown", listRowMouseDownHandler, true);
-      appointments[i].addEventListener("click", onCalendarSelectAppointment, true);
+      appointments[i].addEventListener("click", onCalendarSelectAppointment, false);
       appointments[i].addEventListener("dblclick", displayAppointment, true);
     }
     var days = document.getElementsByClassName("day", contentView);
@@ -484,7 +484,7 @@ function calendarDisplayCallback(http)
       }
     else
       for (var i = 0; i < days.length; i++) {
-        days[i].addEventListener("click", onCalendarSelectDay, true);
+        days[i].addEventListener("click", onCalendarSelectDay, false);
         var clickableCells = document.getElementsByClassName("clickableHourCell",
                                                              days[i]);
         for (var j = 0; j < clickableCells.length; j++)
@@ -706,8 +706,7 @@ function onMonthMenuItemClick(node)
   return false;
 }
 
-function onYearMenuItemClick(node)
-{
+function onYearMenuItemClick(node) {
   var month = '' + $("monthLabel").getAttribute("month");;
   var year = '' + node.innerHTML;
 
@@ -716,14 +715,13 @@ function onYearMenuItemClick(node)
   return false;
 }
 
-function onSearchFormSubmit()
-{
+function onSearchFormSubmit() {
   log ("search not implemented");
 
   return false;
 }
 
-function onCalendarSelectAppointment(event) {
+function onCalendarSelectAppointment() {
   var list = $("appointmentsList");
   list.deselectAll();
 
@@ -734,13 +732,9 @@ function onCalendarSelectAppointment(event) {
     div.scrollTop = row.offsetTop - (div.offsetHeight / 2);
     selectNode(row);
   }
-
-  event.cancelBubble = false;
-  event.returnValue = false;
 }
 
-function onCalendarSelectDay(event)
-{
+function onCalendarSelectDay(event) {
   var day = this.getAttribute("day");
   var needRefresh = (listFilter == 'view_selectedday'
                      && day != currentDay);
@@ -753,13 +747,9 @@ function onCalendarSelectDay(event)
 
   if (needRefresh)
     refreshAppointments();
-
-  event.cancelBubble = true;
-  event.returnValue = false;
 }
 
-function changeWeekCalendarDisplayOfSelectedDay(node)
-{
+function changeWeekCalendarDisplayOfSelectedDay(node) {
   var days = document.getElementsByClassName("day", node.parentNode);
 
   for (var i = 0; i < days.length; i++)
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index e02eaa562..9ba0bd815 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -994,14 +994,6 @@ function onLinkBannerClick() {
   checkAjaxRequestsState();
 }
 
-function onRightsAdministrationClick(event) {
-  var url = ApplicationBaseURL;
-  if (!url)
-    url = UserFolderURL;
-  openAclWindow(url+ "/acls");
-  event.preventDefault();
-}
-
 function configureLinkBanner() {
   var linkBanner = $("linkBanner");
   if (linkBanner) {
@@ -1011,9 +1003,8 @@ function configureLinkBanner() {
                                   false);
       anchors[i].addEventListener("click", onLinkBannerClick, false);
     }
-    anchors[4].addEventListener("click", onRightsAdministrationClick, false);
-    if (anchors.length > 6)
-      anchors[6].addEventListener("click", toggleLogConsole, true);
+    if (anchors.length > 5)
+      anchors[5].addEventListener("click", toggleLogConsole, true);
   }
 }