From a3690810149c8a006cde09258c38e7d7faed5718 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 6 Oct 2008 17:17:43 +0000
Subject: [PATCH] We now correctly position and support the "Load Images"
 option in HTML mails from a popup window.

Monotone-Parent: 95dd42cd6a83e654864923e0ae5dba233def3394
Monotone-Revision: 222ceca8e71fe7e1c2395ac641b067b96b94ae3f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-10-06T17:17:43
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.css        |  6 ++++++
 UI/WebServerResources/MailerUI.js         |  2 +-
 UI/WebServerResources/UIxMailPopupView.js | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

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) {