From a421956b860616d025f5364c2b71ee04712f154c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 21 Nov 2007 22:38:42 +0000
Subject: [PATCH 1/3] Monotone-Parent: 35c754c13dd7549e8bbd023fbab28780ffd77a58
 Monotone-Revision: 97177e8c25666ceaaffd5ed4ce58fac2fef8354a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-21T22:38:42
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index e5d90d66d..91abbe4cf 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -14,7 +14,7 @@ var Mailer = {
  maxCachedMessages: 20,
  cachedMessages: new Array(),
  currentMailbox: null,
- currentMailboxType: "",
+ currentMailboxType: ""
 };
 
 var usersRightsWindowHeight = 320;
@@ -131,7 +131,10 @@ function markMailReadInWindow(win, msguid) {
 
 function openMessageWindowsForSelection(action, firstOnly) {
   if (document.body.hasClassName("popup")) {
-    return true;
+    var url = window.location.href;
+    var parts = url.split("/");
+    parts[parts.length-1] = action;
+    window.location.href = parts.join("/");
   }
   else {
     var messageList = $("messageList");

From bcc147aed98f2fe3256300be6740f8f08abcc105 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 22 Nov 2007 14:52:03 +0000
Subject: [PATCH 2/3] Monotone-Parent: a949c0a5881acabcd4cf2e8940f829cbd16b1037
 Monotone-Revision: 453e43c2ab4fa9ffdfc48f065c8428072096e990

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-22T14:52:03
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/UIxAttendeesEditor.css | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index 48873f787..808d0012a 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -58,10 +58,17 @@ TABLE#freeBusy TD.attendees IMG
   top: 0.5em; }
 
 TABLE#freeBusy TD.attendees INPUT
-{ width: 11.5em;
+{ background-image: url('/SOGo.woa/WebServerResources/abcard.gif');
+  background-repeat: no-repeat;
+  background-position: 2px center;
+  width: 11.5em;
   margin: 0px;
+  padding-left: 24px;
   margin-left: 5px; }
 
+TABLE#freeBusy TR.futureAttendee INPUT
+{ background-image: none; }
+
 TABLE#freeBusy TR.freeBusyHeader2 TH
 { font-weight: normal; }
 

From a87d9dc6909ec4d8ef7c1e0d4ab8ba62c15f957c Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 22 Nov 2007 16:14:39 +0000
Subject: [PATCH 3/3] Monotone-Parent: 453e43c2ab4fa9ffdfc48f065c8428072096e990
 Monotone-Revision: 481000e0cd17c7724939535ed3c25eaa596aa5cb

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-22T16:14:39
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.css |  2 +-
 UI/WebServerResources/MailerUI.js  | 14 +++++++++++---
 UI/WebServerResources/iefixes.css  |  4 ++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 04970b43a..a0a3dcfe9 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -391,7 +391,7 @@ TD.mailer_fieldname
   text-align: right;
   font-weight: bold;
   vertical-align: top;
-  width: 6em;
+  width: 7em;
 }
 
 TD.mailer_fieldvalue
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 91abbe4cf..e452b4367 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -737,8 +737,7 @@ function configureLinksInMessage() {
   var mailContentDiv = document.getElementsByClassName('mailer_mailcontent',
 						       messageDiv)[0];
   if (!document.body.hasClassName("popup"))
-    Event.observe(mailContentDiv, "contextmenu",
-		  onMessageContentMenu.bindAsEventListener(mailContentDiv));
+    mailContentDiv.observe("contextmenu", onMessageContentMenu);
   var anchors = messageDiv.getElementsByTagName('a');
   for (var i = 0; i < anchors.length; i++)
     if (anchors[i].href.substring(0,7) == "mailto:") {
@@ -810,6 +809,11 @@ function resizeMailContent() {
 }
 
 function onMessageContentMenu(event) {
+  var element = getTarget(event);
+  if (element.tagName == 'A' && element.href.substring(0,7) == "mailto:")
+    // Don't show the default contextual menu; let the click propagate to 
+    // other observers
+    return true;
   popupMenu(event, 'messageContentMenu', this);
 }
 
@@ -819,6 +823,8 @@ function onMessageEditDraft(event) {
 
 function onEmailAddressClick(event) {
   popupMenu(event, 'addressMenu', this);
+  preventDefault(event);
+  return false;
 }
 
 function onMessageAnchorClick(event) {
@@ -949,7 +955,9 @@ function newContactFromEmail(event) {
 }
 
 function onEmailTo(event) {
-  return openMailTo(this.innerHTML.strip());
+  openMailTo(this.innerHTML.strip());
+  preventDefault(event);
+  return false;
 }
 
 function newEmailTo(sender) {
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 2faaf0eeb..b9ebf1373 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -43,9 +43,13 @@ UL#userList
 { top: 3em; }
 
 /* MailerUI */
+
 IMG.dragMessage
 { filter: alpha(opacity=70); }
 
+TD.mailer_fieldname
+{ width: 8em; }
+
 /* SchedulerUI */
 
 DIV[class~="event"]._selected > DIV.eventInside