diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css index 0ed73b367..d241fd35c 100644 --- a/UI/WebServerResources/MailerUI.css +++ b/UI/WebServerResources/MailerUI.css @@ -363,6 +363,12 @@ INPUT#loadImagesButton right: 1em; } +.popup INPUT#loadImagesButton +{ + top: 9.0em; + right: 1em; +} + TABLE.mailer_fieldtable { top: 0px; left: 0px; diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index f79e1ee3d..8ab294853 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -790,7 +790,7 @@ function configureLoadImagesButton() { // We show/hide the "Load Images" button var loadImagesButton = $("loadImagesButton"); var displayLoadImages = $("displayLoadImages"); - + if (typeof(loadImagesButton) == "undefined" || loadImagesButton == null ) { return; diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js index 5443d7b77..cd064c6dd 100644 --- a/UI/WebServerResources/UIxMailPopupView.js +++ b/UI/WebServerResources/UIxMailPopupView.js @@ -9,6 +9,21 @@ function onPrintCurrentMessage(event) { function initPopupMailer(event) { configureLinksInMessage(); resizeMailContent(); + + var loadImagesButton = $("loadImagesButton"); + if (loadImagesButton) + loadImagesButton.observe("click", + onMessageLoadImages.bindAsEventListener(loadImagesButton)); + + configureLoadImagesButton(); +} + +function onMessageLoadImages(event) { + var msguid = window.opener.Mailer.currentMessages[window.opener.Mailer.currentMailbox]; + var url = (window.opener.ApplicationBaseURL + window.opener.encodeURI(window.opener.Mailer.currentMailbox) + "/" + + msguid + "/view?noframe=1&unsafe=1"); + document.messageAjaxRequest + = triggerAjaxRequest(url, messageCallback, msguid); } function onICalendarButtonClick(event) {