Don't show subject in page header.

Already show subject in headers - this is just redundant info.

diff --git a/imp/message.php b/imp/message.php
index da311e6..66193e0 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -288,12 +288,10 @@ foreach (array('to', 'cc', 'bcc') as $val) {
 /* Process the subject now. */
 if ($subject = $mime_headers->getValue('subject')) {
     $display_headers['subject'] = $imp_ui->getDisplaySubject($subject);
-    $title = sprintf(_("%s: %s"), $page_label, $subject);
-    $shortsub = htmlspecialchars($subject);
 } else {
-    $display_headers['subject'] = $shortsub = _("[No Subject]");
-    $title = sprintf(_("%s: %s"), $page_label, $shortsub);
+    $display_headers['subject'] = _("[No Subject]");
 }
+$title = sprintf(_("%s: %s"), $page_label, $display_headers['subject']);
 
 /* See if the 'X-Priority' header has been set. */
 $xpriority = $mime_headers->getValue('x-priority');
@@ -424,7 +422,7 @@ if (!IMP::$printMode) {
     $t_template->set('thismailbox', htmlspecialchars($mailbox_name));
     $t_template->set('start', htmlspecialchars($msgindex));
     $t_template->set('index', htmlspecialchars($index));
-    $t_template->set('label', sprintf(_("%s: %s"), $header_label, $shortsub));
+    $t_template->set('label', $header_label);
     $t_template->set('msg_count', sprintf(_("(%d of %d)"), $msgindex, $imp_mailbox->getMessageCount()));
     $t_template->set('status', $status);
     $t_template->set('message_token', $message_token);

diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
index 54d5f38..2f49184 100644 (file)
--- a/imp/templates/chunks/message.php
+++ b/imp/templates/chunks/message.php
@@ -7,9 +7,12 @@
  */
 
 $horde_img = $registry->getImageDir('horde');
+
+$close_img = IMP::img('close.png', 'X', array(), $horde_img);
 $menu_view = $prefs->getValue('menu_view');
 $show_text = ($menu_view == 'text' || $menu_view == 'both');
 
+
 // Small utility function to simplify creating dimpactions buttons.
 // As of right now, we don't show text only links.
 function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
@@ -26,35 +29,29 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 ?>
 <div id="pageContainer">
  <div id="msgData">
-  <div class="noprint">
-   <div class="header">
-    <div class="headercloseimg" id="windowclose"><?php echo IMP::img('close.png', 'X', array(), $horde_img) ?></div>
-    <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
-   </div>
-
-   <div class="dimpActions dimpActionsMsg">
-    <span>
-     <?php _createDAfmsg(_("Reply"), 'Reply', 'reply_link', 'hasmenu', $show_text) ?>
-    </span>
-    <span>
-     <?php _createDAfmsg(_("Forward"), 'Forward', 'forward_link', '', $show_text) ?>
-    </span>
+  <div class="dimpActions dimpActionsMsg noprint">
+   <div class="headercloseimg" id="windowclose"><?php echo $close_img ?></div>
+   <span>
+    <?php _createDAfmsg(_("Reply"), 'Reply', 'reply_link', 'hasmenu', $show_text) ?>
+   </span>
+   <span>
+    <?php _createDAfmsg(_("Forward"), 'Forward', 'forward_link', '', $show_text) ?>
+   </span>
 <?php if (!empty($conf['spam']['reporting']) && (!$conf['spam']['spamfolder'] || ($folder != IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
-    <span>
-     <?php _createDAfmsg(_("Report Spam"), 'Spam', 'button_spam', '', $show_text) ?>
-    </span>
+   <span>
+    <?php _createDAfmsg(_("Report Spam"), 'Spam', 'button_spam', '', $show_text) ?>
+   </span>
 <?php endif; ?>
 <?php if (!empty($conf['notspam']['reporting']) && (!$conf['notspam']['spamfolder'] || ($folder == IMP::folderPref($prefs->getValue('spam_folder'), true)))): ?>
-    <span>
-     <?php _createDAfmsg(_("Report Innocent"), 'Ham', 'button_ham', '', $show_text) ?>
-    </span>
+   <span>
+    <?php _createDAfmsg(_("Report Innocent"), 'Ham', 'button_ham', '', $show_text) ?>
+   </span>
 <?php endif; ?>
 <?php if (!$readonly): ?>
-    <span>
-     <?php _createDAfmsg(_("Delete"), 'Delete', 'button_deleted', '', $show_text) ?>
-    </span>
+   <span>
+    <?php _createDAfmsg(_("Delete"), 'Delete', 'button_deleted', '', $show_text) ?>
+   </span>
 <?php endif; ?>
-   </div>
   </div>
 
   <div class="msgfullread">
@@ -110,7 +107,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 <?php if (!$disable_compose): ?>
  <div id="qreply" style="display:none">
   <div class="header">
-   <div class="headercloseimg"><?php echo IMP::img('close.png', 'X', array(), $horde_img) ?></div>
+   <div class="headercloseimg"><?php echo $close_img ?></div>
    <div><?php echo _("Message:") . ' ' . $show_msg_result['subject'] ?></div>
   </div>
   <?php echo $compose_result['html']; ?>