From 204a5e9e597063c8a01142f01d91f2138f93e5a5 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 17 Dec 2007 16:07:09 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1305
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                                       | 5 +++++
 NEWS                                            | 2 ++
 UI/MailerUI/UIxMailMainFrame.m                  | 5 +++--
 UI/WebServerResources/ContactsUI.js             | 7 +++++--
 UI/WebServerResources/MailerUI.js               | 3 +++
 UI/WebServerResources/UIxContactsUserFolders.js | 3 ++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3aaf1aa..3d5fba87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailMainFrame.m ([UIxMailMainFrame
+	-composeAction]): fixed URL when no recipient is specified.
+
 2007-12-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/NSArray+Scheduler.m ([NSMutableArray
diff --git a/NEWS b/NEWS
index 4d2cdc06..0d4165cf 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@
 - invitation from Google calendar are now correctly parsed;
 - it is now possible to search events by title in the Calendar module;
 - all the writable calendars are now listed in the event edition dialog;
+- mail folders state is now save;
+- the status of participants in represented with an icon;
 
 0.9.0-20071119 (1.0 rc1)
 ------------------------
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 400e3280..e45d9d30 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -119,7 +119,7 @@
 - (id <WOActionResults>) composeAction
 {
   NSArray *accounts;
-  NSString *firstAccount, *newLocation;
+  NSString *firstAccount, *newLocation, *parameters;
   SOGoMailAccounts *co;
   NSDictionary *formValues;
 
@@ -127,10 +127,11 @@
   accounts = [[context activeUser] mailAccounts];
   firstAccount = [[accounts objectsForKey: @"name"] objectAtIndex: 0];
   formValues = [[context request] formValues];
+  parameters = [formValues count] > 0 ? [formValues asURLParameters] : @"?mailto=";
   newLocation = [NSString stringWithFormat: @"%@/%@/compose%@",
 			  [co baseURLInContext: context],
 			  firstAccount,
-			  [formValues asURLParameters]];
+			  parameters];
 
   return [self redirectToLocation: newLocation];
 }
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index fa2ba949..21c9872f 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -353,7 +353,7 @@ function onToolbarWriteToSelectedContacts(event) {
   var rowsWithEmail = 0;
 
   if (rows.length == 0) {
-    window.alert(labels["Please select a contact."]);
+    openMailComposeWindow(ApplicationBaseURL + "Mail/compose");
     return false;
   }
 
@@ -533,6 +533,7 @@ function onAddressBookNew(event) {
 
 function appendAddressBook(name, folder) {
   var owner;
+  var result = true;
 
   if (folder) {
     owner = getSubscribedFolderOwner(folder);
@@ -545,7 +546,7 @@ function appendAddressBook(name, folder) {
     owner = UserLogin;
 
   if ($(folder))
-    window.alert(clabels["You have already subscribed to that folder!"]);
+    result = false;
   else {
     var contactFolders = $("contactFolders");
     var items = contactFolders.childNodesWithTag("li");
@@ -563,6 +564,8 @@ function appendAddressBook(name, folder) {
     li.appendChild(document.createTextNode(name));
     setEventsOnContactFolder(li);
   }
+
+  return result;
 }
 
 function newFolderCallback(http) {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 9e46418e..f2568018 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1040,6 +1040,9 @@ function expandUpperTree(node) {
 }
 
 function onHeaderClick(event) {
+  if (TableKit.Resizable._onHandle)
+    return;
+  
   var headerId = this.getAttribute("id");
   var newSortAttribute;
   if (headerId == "subjectHeader")
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index fe55efc3..7ad09086 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -133,7 +133,8 @@ function onConfirmFolderSelection(event) {
 	 folderName = spans1[0].innerHTML + ' (' + email + ')';
       }
       var data = { folderName: folderName, folder: folder, window: window };
-      window.opener.subscribeToFolder(window.opener.userFolderCallback, data);
+      if (!window.opener.subscribeToFolder(window.opener.userFolderCallback, data))
+	window.alert(clabels["You have already subscribed to that folder!"]);
    }
 }
 
-- 
2.39.5