From d2e754a0508239c85f0ec5d2542e6714f08fc8db Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 7 Sep 2007 15:44:51 +0000
Subject: [PATCH] Monotone-Parent: e4f673580688fbffc564757a9720e95b85813807
 Monotone-Revision: b264aff5cf95695eb1004c058472fcab17cece68

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-07T15:44:51
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                             | 10 ++++++++++
 .../MailPartViewers/UIxMailPartHTMLViewer.wox         | 11 +++++++----
 UI/WebServerResources/MailerUI.css                    |  5 +++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b9dccc48..c85b8bc70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-09-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailPartViewers/UIxMailPartHTMLViewer.m
+	([_UIxHTMLMailContentHandler
+	-endElement:_localNamenamespace:_nsrawName:_rawName]): remove HTML
+	comments from the CSS code, do not add the CSS code to the body
+	content and remove references of body from the CSS declarations.
+	([UIxMailPartHTMLViewer -cssContent]): new accessor method.
+	([UIxMailPartHTMLViewer -flatContentAsString]): separated code
+	common with cssContent in a different method and invoke it only
+	once.
+
 	* UI/MainUI/SOGoRootPage.[hm]: made a subclass of UIxComponent
 	instead of UIxPageFrame.
 
diff --git a/UI/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox
index ba3db2f03..c4bd4faea 100644
--- a/UI/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox
@@ -1,9 +1,12 @@
 <?xml version="1.0" standalone="yes"?>
-<div
+<!DOCTYPE container>
+<container
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:var="http://www.skyrix.com/od/binding"
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  class="mailer_htmlcontent SOGoHTMLMail-CSS-Delimiter"
-><var:string value="flatContentAsString" const:escapeHTML="NO" /></div>
+  xmlns:label="OGo:label">
+  <var:string value="cssContent" const:escapeHTML="NO" />
+  <div class="SOGoHTMLMail-CSS-Delimiter mailer_htmlcontent"
+    ><var:string value="flatContentAsString" const:escapeHTML="NO" /></div>
+</container>
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 24261f7e5..18798df29 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -367,7 +367,8 @@ img.mailer_imagecontent
 }
 
 DIV.mailer_plaincontent
-{ 
+{
+  position: relative;
   font-family: monospace, fixed;
   white-space: normal;
   font-size: inherit;
@@ -386,7 +387,7 @@ DIV.mailer_plaincontent P
 DIV.mailer_htmlcontent P
 { 
   white-space: normal;
-  font-family: serif;
+  font-family: sans-serif;
   font-size: inherit;
   margin: 0px;
   padding: 0px;