From 1e64a91f02c05d92f5b289f36d21a7ca7dfd43d8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 22 Jan 2010 21:15:11 +0000
Subject: [PATCH 1/2] fixed properties window

Monotone-Parent: a343f74f4a124ecd3e0d422d0fc2b88a22459e97
Monotone-Revision: 845e78bebd63c5b3c1727b437500cbe012c2f5d5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-22T21:15:11
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/SchedulerUI/UIxCalendarProperties.wox |  7 ++++---
 UI/WebServerResources/SchedulerUI.js               |  4 ++--
 UI/WebServerResources/UIxCalendarProperties.css    | 14 +++++++++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 05b11c9e8..0e31355f3 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -52,13 +52,14 @@
               /></label></div>
 
         <var:if condition="mustSynchronize" const:negate="YES"
-          ><div><label><var:string
-                label:value="Tag:"/><input type="text"
+          ><div><span class="label"><var:string
+                label:value="Tag:"/></span
+              ><span class="content"><input type="text"
                 name="calendarSyncTag"
                 id="calendarSyncTag"
                 class="textField"
                 var:value="calendarSyncTag"
-                /></label
+                /></span
               ><var:if condition="synchronizeCalendar"><input type="hidden"
                 name="originalCalendarSyncTag"
                 id="originalCalendarSyncTag"
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index c184b436c..6c6ff80ba 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1971,7 +1971,7 @@ function onCalendarModify(event) {
     var url = ApplicationBaseURL + calendarID + "/properties";
     var windowID = sanitizeWindowName(calendarID + " properties");
     var width = 310;
-    var height = 260;
+    var height = 266;
     var isWebCalendar = false;
     if (UserSettings['Calendar'] 
         && UserSettings['Calendar']['WebCalendars']) {
@@ -1982,7 +1982,7 @@ function onCalendarModify(event) {
         }
     }
     if (isWebCalendar)
-        height += 25;
+        height += 21;
     else if (calendarID == "/personal")
         height -= 25;
 
diff --git a/UI/WebServerResources/UIxCalendarProperties.css b/UI/WebServerResources/UIxCalendarProperties.css
index c620352d5..790375430 100644
--- a/UI/WebServerResources/UIxCalendarProperties.css
+++ b/UI/WebServerResources/UIxCalendarProperties.css
@@ -11,23 +11,28 @@ FIELDSET
   border-top: 1px solid #909090;
   border-left: 1px solid #909090; }
 
+FIELDSET DIV
+{ margin-left: 20px;
+  margin-right: 10px; }
 
 SPAN.label
 { cursor: default;
-  width: 10em;
+  width: 60px;
   text-align: right;
-  padding-right: 1em;
   line-height: 2em;
   float: left;
   display: block; }
 
+INPUT.checkBox
+{ margin-left: 35px; }
+
 SPAN.content
 { display: block;
   line-height: 1.5em;
   vertical-align: middle; }
 
 SPAN.content INPUT.textField
-{ width: 50%; }
+{ width: 160px; }
 
 BUTTON#colorButton
 { display: none;
@@ -45,6 +50,9 @@ DIV#buttons
 INPUT#calendarSyncTag
 { width: 7em; }
 
+LABEL
+{ white-space: nowrap; }
+
 #webCalendarUrl SPAN.content
 { white-space: nowrap;
   overflow: hidden; }

From dc41b95e0dd17222446a46ae1e8545fa85b9f6bd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 22 Jan 2010 21:34:39 +0000
Subject: [PATCH 2/2] Monotone-Parent: 845e78bebd63c5b3c1727b437500cbe012c2f5d5
 Monotone-Revision: c8e16863bcabf9adf6b224c4a9922c0ace67917f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-22T21:34:39
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                         |  3 +++
 UI/WebServerResources/MailerUI.js | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f35aa52e6..b968d3114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-01-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/MailerUI.js (composeNewMessage): fixed
+	potential js error in IE when no mailbox is selected.
+
 	* Tools/SOGoToolRestore.m (+initialize): we need to invoke
 	[iCalEntityObject+SOGo initializeSOGoExtensions], otherwise the
 	extraction of quick records will cause a crash because some global
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index cbb7959e1..278651808 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -575,9 +575,17 @@ function onComposeMessage() {
 }
 
 function composeNewMessage() {
-    var account = Mailer.currentMailbox.split("/")[1];
-    var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
-    openMailComposeWindow(url);
+    var account;
+    if (Mailer.currentMailbox)
+        account = Mailer.currentMailbox.split("/")[1];
+    else if (mailAccounts.length)
+        account = mailAccounts[0][0];
+    else
+        account = null;
+    if (account) {
+        var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
+        openMailComposeWindow(url);
+    }
 }
 
 function openMailbox(mailbox, reload, idx, updateStatus) {