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 e5d90d66d..e452b4367 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"); @@ -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) { 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; } 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