From 55808443c900d4ae8e3efe248467565874aa3298 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 10 Jun 2009 22:16:11 -0600
Subject: [PATCH] Improvements to message info display in dimp preview

---
 imp/js/src/DimpBase.js             |  4 ++--
 imp/lib/Views/ShowMessage.php      |  6 +++++-
 imp/templates/index/index-dimp.inc |  2 +-
 imp/themes/screen-dimp.css         | 12 ++++++++++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 040699768..cc8fba1c4 100644
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -1030,10 +1030,10 @@ var DimpBase = {
             }
 
             log.each(function(entry) {
-                tmp += '<tr><td>' + entry + '</td></tr>';
+                tmp += '<li><span class="iconImg imp-' + entry.t + '"></span>' + entry.m + '</li>';
             });
 
-            $('infolist').down('TABLE').update(tmp);
+            $('infolist').down('UL').update(tmp);
         }
 
         if (opts) {
diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 67ce70b9e..de0912817 100644
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -76,6 +76,7 @@ class IMP_Views_ShowMessage
      * 'fulldate' - The fully formatted date
      * 'js' - Javascript code to run on display (only if the previewview
      *        hook is active)
+     * 'log' - Log information
      * 'minidate' - A miniature date
      *
      * FOR NON-PREVIEW MODE:
@@ -198,7 +199,10 @@ class IMP_Views_ShowMessage
             /* Grab maillog information. */
             if (!empty($GLOBALS['conf']['maillog']['use_maillog'])) {
                 foreach (IMP_Maillog::parseLog($envelope['message-id']) as $val) {
-                    $result['log'][] = htmlspecialchars($val['msg']);
+                    $result['log'][] = array_map('htmlspecialchars', array(
+                        'm' => $val['msg'],
+                        't' => $val['action']
+                    ));
                 }
             }
         } else {
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 525e84b92..070dbe148 100644
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -311,7 +311,7 @@ function _simpleButton($id, $text, $image, $imagedir = null)
              <td>
               <div><span class="infoLabel"><?php echo _("Message Information") ?></span></div>
               <div id="infolist" style="display:none">
-               <table cellspacing="2"></table>
+               <ul></ul>
               </div>
              </td>
             </tr>
diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index cb228a37c..eba224758 100644
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -524,6 +524,7 @@ div.dimpActionsCompose, div.dimpActionsMsg {
     font-weight: bold;
     padding-right: 5px;
 }
+
 #partlist table {
     margin-top: 3px;
     margin-bottom: 1px;
@@ -532,6 +533,13 @@ div.dimpActionsCompose, div.dimpActionsMsg {
     padding-bottom: 2px;
 }
 
+#infolist {
+    padding-top: 2px;
+}
+#infolist ul {
+    list-style-type: none;
+}
+
 #msgHeadersContent {
     overflow: hidden;
 }
@@ -1016,9 +1024,9 @@ span.readonlyImg {
 }
 
 /* Growler notification styles. */
-#Growler div.imp-reply {
+#Growler div.imp-reply, span.imp-reply {
     background-image: url("graphics/mail_answered.png");
 }
-#Growler div.imp-forward, div.imp-redirect {
+#Growler div.imp-forward, div.imp-redirect, span.imp-forward, span.imp-redirect {
     background-image: url("graphics/mail_forwarded.png");
 }
-- 
2.11.0