From 13fdd3572cf3dc2a12fac9f5d12453a0a090da45 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 5 Jul 2010 15:58:18 +0000
Subject: [PATCH] See ChangeLog.

Monotone-Parent: f034b53abce82938ab4a4f837dfec93dbcb87a76
Monotone-Revision: bb60d6b6e8b42019515accf65d2cbe10c66291b6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-07-05T15:58:18
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                            |  6 ++++++
 UI/WebServerResources/SchedulerUI.js | 11 +++++++----
 UI/WebServerResources/iefixes.css    |  3 +--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed60d605e..0ffd4b5e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-05  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUI.js (onCalendarModify): fixed
+	proper identification of web calendars and adjusted height of
+	popup window.
+
 2010-07-04  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * In the Contacts module, we prioritize the
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 7d5c5723e..190bf1dd2 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -563,6 +563,7 @@ function onViewEventCallback(http) {
                 div.addClassName("right");
             }
             else {
+                //log (" left = " + left + " + " + cellDimensions.width + " - " + parseInt(cellDimensions["width"]/3));
                 left = left + cellDimensions["width"] - parseInt(cellDimensions["width"]/3);
                 div.removeClassName("right");
                 div.addClassName("left");
@@ -2236,25 +2237,27 @@ function onCalendarModify(event) {
     var folders = $("calendarList");
     var selected = folders.getSelectedNodes()[0];
     var calendarID = selected.getAttribute("id");
+    var owner = selected.getAttribute("owner");
     var url = ApplicationBaseURL + calendarID + "/properties";
     var windowID = sanitizeWindowName(calendarID + " properties");
     var width = 310;
-    var height = 350;
+    var height = 294;
     var isWebCalendar = false;
     if (UserSettings['Calendar']
         && UserSettings['Calendar']['WebCalendars']) {
         var webCalendars = UserSettings['Calendar']['WebCalendars'];
-        var realID = calendarID.substr (1, calendarID.length - 1);
+        var realID = owner + ":Calendar/" + calendarID.substr (1, calendarID.length - 1);
         if (webCalendars[realID]) {
             isWebCalendar = true;
         }
     }
-    var owner = selected.getAttribute("owner");
+    if (Prototype.Browser.IE) height += 10;
+    
     if (owner == UserLogin) {
         height += 20;
     }
     if (isWebCalendar) {
-        height -= 38;
+        height += 26;
     }
     else if (calendarID == "/personal") {
         height -= 26;
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 4fffa4622..60a825510 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -95,8 +95,7 @@ BUTTON#colorButton
 { margin-top: 2px; }
 
 DIV#propertiesTabs FIELDSET
-{ margin: 0.5em;
-  padding: 5px; }
+{ padding: 5px; }
 
 DIV#propertiesTabs LEGEND
 { margin-bottom: 5px; }