merge of '00622e0c5fa34a4e5e98835bf4037dc6f562e342'

and '481000e0cd17c7724939535ed3c25eaa596aa5cb'

Monotone-Parent: 00622e0c5fa34a4e5e98835bf4037dc6f562e342
Monotone-Parent: 481000e0cd17c7724939535ed3c25eaa596aa5cb
Monotone-Revision: c1fa71027de8d19eaa232cf89370ad4655d2d15b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-22T16:19:42
Monotone-Branch: ca.inverse.sogo

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

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");
@@ -734,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:") {
@@ -807,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);
 }
 
@@ -816,6 +823,8 @@ function onMessageEditDraft(event) {
 
 function onEmailAddressClick(event) {
   popupMenu(event, 'addressMenu', this);
+  preventDefault(event);
+  return false;
 }
 
 function onMessageAnchorClick(event) {
@@ -946,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) {

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; }
 

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