From: mkanat%bugzilla.org <>
Date: Wed, 11 Feb 2009 20:30:32 +0000 (+0000)
Subject: Bug 375382: When viewing a bug, make obsolete attachments hidden by default
X-Git-Tag: bugzilla-3.3.4~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138c15b19a7f49667c012829cc0311abdbdfb0c0;p=thirdparty%2Fbugzilla.git

Bug 375382: When viewing a bug, make obsolete attachments hidden by default
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
---

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 08c575dbf8..04894ff8d3 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -20,33 +20,32 @@
   #%]
 
 <script type="text/javascript">
-  <!--
-  function toggle_display(link) {
+<!--
+function toggle_display(link) {
     var table = document.getElementById("attachment_table");
-    var rows = table.getElementsByTagName("tr");
-    var originalHeight = table.offsetHeight; // Store current height for scrolling
+    // Store current height for scrolling later
+    var originalHeight = table.offsetHeight;
+    var rows = YAHOO.util.Dom.getElementsByClassName(
+        'bz_tr_obsolete', 'tr', table);
 
-    var toggle;
-    if (link.innerHTML == "Show Obsolete") {
-      toggle = ""; // This should be 'table-row', but IE 6 doesn't understand it.
-      link.innerHTML = "Hide Obsolete";
-    }
-    else {
-      toggle = "none";
-      link.innerHTML = "Show Obsolete";
+    for (var i = 0; i < rows.length; i++) {
+        bz_toggleClass(rows[i], 'bz_default_hidden');
     }
 
-    for (var i = 0; i < rows.length; i++) {
-      if (rows[i].className.match('bz_tr_obsolete'))
-        rows[i].style.display = toggle;
+    if (YAHOO.util.Dom.hasClass(rows[0], 'bz_default_hidden')) {
+        link.innerHTML = "Show Obsolete";
+    }
+    else {
+        link.innerHTML = "Hide Obsolete";
     }
 
     var newHeight = table.offsetHeight;
+    // This scrolling makes the window appear to not move at all.
     window.scrollBy(0, newHeight - originalHeight);
 
     return false;
-  }
-  //-->
+}
+//-->
 </script>
 
 <br>
@@ -66,8 +65,9 @@
       [% IF attachment.isobsolete %]
         [% obsolete_attachments = obsolete_attachments + 1 %]
       [% END %]
-      <tr class="[% "bz_private" IF attachment.isprivate %][%-%]
-                 [%+ "bz_tr_obsolete" IF attachment.isobsolete %]">
+      <tr class="[% "bz_private" IF attachment.isprivate %]
+                 [% " bz_tr_obsolete bz_default_hidden" 
+                     IF attachment.isobsolete %]">
         <td valign="top">
           [% IF attachment.datasize %]
             <a name="a[% count %]" href="attachment.cgi?id=[% attachment.id %]"
@@ -131,7 +131,8 @@
       [% IF attachments.size %]
         <span class="bz_attach_view_hide">
           [% IF obsolete_attachments %]
-            <a href="#a0" onClick="return toggle_display(this);">Hide Obsolete</a> ([% obsolete_attachments %])
+            <a href="#a0" onclick="return toggle_display(this);">Show
+              Obsolete</a> ([% obsolete_attachments %])
           [% END %]
           [% IF Param("allow_attachment_display") %]
             <a href="attachment.cgi?bugid=[% bugid %]&amp;action=viewall">View All</a>