From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 27 Jul 2009 17:58:35 +0000 (-0600)
Subject: Re-add printed by header when printing messages
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d8f0d2e23ae509047f684060b0fe67d60d976176;p=horde.git

Re-add printed by header when printing messages
---

diff --git a/imp/message.php b/imp/message.php
index 656496d50..8958e0074 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -694,13 +694,21 @@ if (!empty($atc_parts) && ($show_parts != 'none')) {
         $tmp[] = '</td></tr>';
     }
 
-    $hdrs[] = array('name' => ($show_parts == 'all') ? _("Parts") : _("Attachments"), 'val' => '<table>' . implode('', $tmp) . '</table>', 'i' => (++$i % 2));
-}
-
-if (!empty($conf['print']['add_printedby'])) {
-    // TODO
-    //$hdrs[] = array('name' => _("Printed By"), 'val' => $user_identity->getFullname() ? $user_identity->getFullname() : Horde_Auth::getAuth(), 'i' => (++$i % 2));
-}
+    $hdrs[] = array(
+        'name' => ($show_parts == 'all') ? _("Parts") : _("Attachments"),
+        'val' => '<table>' . implode('', $tmp) . '</table>',
+        'i' => (++$i % 2)
+    );
+}
+
+//if (!empty($conf['print']['add_printedby'])) {
+    $hdrs[] = array(
+        'class' => 'printedby',
+        'name' => _("Printed By"),
+        'val' => $user_identity->getFullname() ? $user_identity->getFullname() : Horde_Auth::getAuth(),
+        'i' => (++$i % 2)
+    );
+//}
 
 $m_template->set('headers', $hdrs);
 $m_template->set('msgtext', $msgtext);
diff --git a/imp/templates/message/message.html b/imp/templates/message/message.html
index 2ed4b0a53..5a8aef7f6 100644
--- a/imp/templates/message/message.html
+++ b/imp/templates/message/message.html
@@ -1,7 +1,7 @@
 <div id="msgheaders">
  <table cellspacing="0">
 <loop:headers>
-  <tr>
+  <tr<if:headers.class> class="<tag:headers.class />"</if:headers.class>>
    <td class="item<tag:headers.i /> rightAlign nowrap" valign="top"><strong><tag:headers.name />:</strong>&nbsp;</td>
    <td class="item<tag:headers.i /> msgheader"><tag:headers.val /></td>
   </tr>
diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 6688d1939..33ced98c8 100644
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -53,6 +53,11 @@
     margin-left: 3px;
 }
 
+/* Message view styling. */
+#msgheaders tr.printedby {
+    display: none;
+}
+
 /* Newmail alerts. */
 #newmail {
     padding: 1em;
@@ -607,8 +612,6 @@ td.addressTr span.loadingImg {
 }
 
 
-
-
 /* Print CSS rules. */
 @media print {
     body {
@@ -640,6 +643,10 @@ td.addressTr span.loadingImg {
         display: block !important;
     }
 
+    #msgheaders tr.printedby {
+        display: table-row !important;
+    }
+
     .msgfullread .msgBody {
         border-top: 1px solid silver;
     }