From 53d90d404c83e431db4ec74d073282e06f444a26 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 6 Nov 2006 17:44:07 +0000
Subject: [PATCH] Monotone-Parent: 41860311e9a9d95e4e0a179f742a52d433d59d72
 Monotone-Revision: b71cb031b6d81c362bbb5a411baf4cd30bcf1b01

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-06T17:44:07
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/SchedulerUI.css         | 18 ++++++-------
 UI/WebServerResources/SchedulerUI.js          | 15 +++++++----
 .../UIxFreeBusyUserSelector.js                | 26 +++++++++++++------
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 9c7284e56..70765c6c6 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -328,7 +328,7 @@ TABLE.weekOverview TD.dayOfToday
 { background-color: #deebf7; }
 
 TABLE.monthOverview TD.dayOfToday
-{ border: 3px solid #99f;
+{ border: 3px solid #397d94;
   background-color: #deebf7; }
 
 TABLE.weekOverview TD.weekEndDay,
@@ -336,7 +336,7 @@ TABLE.monthOverview TD.weekEndDay
 { background-color: #fffbe7; }
 
 TABLE.monthOverview TD.dayOfAnotherMonth
-{ background-color: #eef; }
+{ background-color: #e7efef; }
 
 TABLE.weekOverview TD.selectedDay,
 TABLE.monthOverview TD.selectedDay
@@ -344,26 +344,26 @@ TABLE.monthOverview TD.selectedDay
 
 TABLE.dayOverview TD,
 TABLE.weekOverview TD
-{ border: 1px solid #99f; }
+{ border: 1px solid #397d94; }
 
 TABLE.monthOverview TD
-{ border: 2px solid #99f; }
+{ border: 2px solid #397d94; }
 
 TABLE.dayOverview TD.header
 { text-align: center;
-  color: #77a;
+  color: #397d94;
   width: 100%;
   font-weight: bold;
-  background: #eef; }
+  background: #e7efef; }
 
 TABLE.weekOverview TD.header,
 TABLE.monthOverview TD.header
 { text-align: center;
-  color: #77a;
+  color: #397d94;
   width: 14%;
   height: 2em;
   font-weight: bold;
-  background: #eef; }
+  background: #e7efef; }
 
 TABLE.dayOverview TD.nullHeader,
 TABLE.weekOverview TD.nullHeader
@@ -378,7 +378,7 @@ TABLE.weekOverview TD.hourOfDay
   overflow: auto;
   width: 5em;
   color: #77a;
-  background: #eef; }
+  background: #e7efef; }
 
 SPAN.daysHeader,
 SPAN.weeksHeader,
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index f1e3f4cb0..bec8561d1 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -79,7 +79,13 @@ function deleteEvent()
     var nodes = listOfSelection.getSelectedRows();
 
     if (nodes.length > 0) {
-      if (confirm(labels["appointmentDeleteConfirmation"].decodeEntities())) {
+      var label = "";
+      if (listOfSelection == $("tasksList"))
+        label = labels["taskDeleteConfirmation"].decodeEntities();
+      else
+        label = labels["appointmentDeleteConfirmation"].decodeEntities();
+      
+      if (confirm(label)) {
         if (document.deleteEventAjaxRequest) {
           document.deleteEventAjaxRequest.aborted = true;
           document.deleteEventAjaxRequest.abort();
@@ -282,8 +288,7 @@ function restoreCurrentDaySelection(div)
     }
 
   if (day
-      && day.substr(0, 6) == currentDay.substr(0, 6))
-    {
+      && day.substr(0, 6) == currentDay.substr(0, 6)) {
       for (i = 0; i < elements.length; i++) {
         day = elements[i].getAttribute("day");
         if (day && day == currentDay) {
@@ -342,7 +347,7 @@ function changeCalendarDisplay(time, newView)
   if (day)
     url += "?day=" + day;
 
-  if (newView)
+//   if (newView)
 //     log ("switching to view: " + newView);
 //   log ("changeCalendarDisplay: " + url);
 
@@ -423,7 +428,7 @@ function calendarDisplayCallback(http)
     var hour = null;
     if (http.callbackData["hour"])
       hour = http.callbackData["hour"];
-    if (hour)
+    if (currentView != 'monthview')
       scrollDayView(hour);
   }
   else
diff --git a/UI/WebServerResources/UIxFreeBusyUserSelector.js b/UI/WebServerResources/UIxFreeBusyUserSelector.js
index c27545c05..3b3c00bfa 100644
--- a/UI/WebServerResources/UIxFreeBusyUserSelector.js
+++ b/UI/WebServerResources/UIxFreeBusyUserSelector.js
@@ -9,13 +9,17 @@ var freeBusySelectorId;
 
 function onContactKeyUp(node, event)
 {
-  if (!running && (event.keyCode == 8
-                   || event.keyCode == 13
-                   || event.keyCode == 32
-                   || event.keyCode > 47)) {
-    running = true;
-    requestField = node;
-    setTimeout("triggerRequest()", delay);
+  if (!running) {
+    if (event.keyCode == 8
+        || event.keyCode == 32
+        || event.keyCode > 47) {
+      running = true;
+      requestField = node;
+      setTimeout("triggerRequest()", delay);
+    } else if (node.confirmedValue && event.keyCode == 13) {
+      node.value = node.confirmedValue;
+      node.setSelectionRange(node.value.length, node.value.length);
+    }
   }
 }
 
@@ -43,7 +47,13 @@ function updateResults(http)
       else
         searchField.uid = null;
       searchField.hasfreebusy = false;
-      searchField.value = text[1];
+      if (text[1].substring(0, searchField.value.length).toUpperCase()
+          == searchField.value.toUpperCase())
+        searchField.value = text[1];
+      else {
+        searchField.value += ' >> ' + text[1];
+      }
+      searchField.confirmedValue = text[1];
       var end = searchField.value.length;
       searchField.setSelectionRange(start, end);
     }