From 15666aa6464d574eb021a0e2332e89e7d4ed11a0 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 2 Nov 2009 23:06:58 -0700
Subject: [PATCH] Tweak display of mimeStatusMessage boxes

---
 imp/js/imp.js          |  2 +-
 imp/lib/UI/Message.php |  8 +++++---
 imp/themes/screen.css  | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/imp/js/imp.js b/imp/js/imp.js
index eb2ca93e7..015661e47 100644
--- a/imp/js/imp.js
+++ b/imp/js/imp.js
@@ -29,7 +29,7 @@ document.observe('dom:loaded', function() {
     IMP.unblockImages = function(e)
     {
         var callback,
-            elt = e.element().up('TABLE.mimeStatusMessage'),
+            elt = e.element().up('.mimeStatusMessage>TABLE'),
             iframe = elt.up().next('.htmlMsgData'),
             iframeid = iframe.readAttribute('id'),
             imgload = false,
diff --git a/imp/lib/UI/Message.php b/imp/lib/UI/Message.php
index 867935ec9..3d1f15d07 100644
--- a/imp/lib/UI/Message.php
+++ b/imp/lib/UI/Message.php
@@ -442,7 +442,7 @@ class IMP_UI_Message
                 continue;
             }
 
-            $out .= '<div><table ' . (isset($val['id']) ? ('id="' . $val['id'] . '" ') : '') . 'class="mimeStatusMessage">';
+            $out .= '<table' . (isset($val['id']) ? (' id="' . $val['id'] . '" ') : '') . '>';
 
             /* If no image, simply print out the message. */
             if (empty($val['icon'])) {
@@ -457,10 +457,12 @@ class IMP_UI_Message
                 $out .= '</table></td></tr>';
             }
 
-            $out .= '</table></div>';
+            $out .= '</table>';
         }
 
-        return $out;
+        return $out
+            ? '<div class="mimeStatusMessage">' . $out . '</div>'
+            : '';
     }
 
     /**
diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index ad5afbc21..d7d26077a 100644
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -519,12 +519,12 @@ td.addressTr span.loadingImg {
 }
 
 /* MIME styles. */
-.mimeStatusMessage, .mimeHeaders {
+.mimeStatusMessage>table, .mimeHeaders {
     padding: 4px;
     margin-bottom: 3px;
     font-size: 90%;
 }
-.mimeStatusMessage {
+.mimeStatusMessage>table {
     color: #000;
     background: #ffc;
     border: 1px solid #fff760;
@@ -540,7 +540,7 @@ td.addressTr span.loadingImg {
     background: #f9f9f9;
     width: auto;
 }
-div.mimePartInfo {
+div.mimeStatusMessage, div.mimePartInfo {
     margin-bottom: 5px;
 }
 .mimePartInfo div {
@@ -557,10 +557,10 @@ div.mimePartInfo {
     vertical-align: bottom;
 }
 
-.mimeStatusMessage td {
+.mimeStatusMessage table td {
     padding: 0;
 }
-.mimeStatusMessage td table td {
+.mimeStatusMessage table td table td {
     padding-right: 2px;
     white-space: nowrap;
 }
-- 
2.11.0