Clean up attachment icon display in preview

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index fe065bb..c171b39 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -924,7 +924,7 @@ var DimpBase = {
 
     _loadPreviewCallback: function(resp)
     {
-        var ppuid, row, search, tmp, tmp2,
+        var ppuid, row, search, tmp,
             pm = $('previewMsg'),
             r = resp.response,
             t = $('msgHeadersContent').down('THEAD');
@@ -991,18 +991,14 @@ var DimpBase = {
         });
 
         // Add attachment information
-        $('toggleHeaders').select('.attachmentImage').invoke(r.atc_label ? 'show' : 'hide');
         if (r.atc_label) {
-            tmp = $('msgAtc').show().down('.label');
-            tmp2 = $('partlist');
-            tmp2.hide().previous().update(new Element('SPAN', { className: 'atcLabel' }).insert(r.atc_label)).insert(r.atc_download);
+            $('msgAtc').show();
+            tmp = $('partlist');
+            tmp.hide().previous().update(new Element('SPAN', { className: 'atcLabel' }).insert(r.atc_label)).insert(r.atc_download);
             if (r.atc_list) {
                 $('partlist_col').show();
                 $('partlist_exp').hide();
-                tmp.down().hide().next().show();
-                tmp2.down('TABLE').update(r.atc_list);
-            } else {
-                tmp.down().show().next().hide();
+                tmp.down('TABLE').update(r.atc_list);
             }
         } else {
             $('msgAtc').hide();

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 3c6f05c..61833ba 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -259,7 +259,6 @@ function _simpleButton($id, $text, $image, $imagedir = null)
         <div id="toggleHeaders" class="noprint">
          <a id="th_expand"><span class="iconImg" title="<?php echo htmlspecialchars(_("Expand Headers")) ?>"></span></a>
          <a id="th_collapse" style="display:none"><span class="iconImg" title="<?php echo htmlspecialchars(_("Collapse Headers")) ?>"></span></a>
-         <span class="iconImg attachmentImg" style="display:none"></span>
         </div>
         <div id="msgHeadersColl">
          <a id="msg_newwin"><span class="iconImg" title="<?php echo htmlspecialchars(_("Open in new window")) ?>"></span></a>