Vitaliy Margolen : Move attachment table before comments into same table as other bug properties .

[Jeremy Newman]

Module: bugzilla
Branch: master
Commit: c532c47d86cffbdd95088a6a45b3d13175b0950f
URL:    http://source.winehq.org/git/bugzilla.git/?a=commit;h=c532c47d86cffbdd95088a...

Author: Vitaliy Margolen <wine-patches(a)kievinfo.com>
Date:   Sun Sep  2 12:20:20 2007 -0600

Move attachment table before comments into same table as other bug properties.

---

 template/en/default/attachment/list.html.tmpl |    2 --
 template/en/default/bug/edit.html.tmpl        |   24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index b6b0431..78bd586 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -50,7 +50,6 @@
   //-->
 </script>
 
-<br>
 <table id="attachment_table" cellspacing="0" cellpadding="4">
   <tr>
     <th colspan="[% show_attachment_flags ? 3 : 2 %]" align="left">
@@ -145,4 +144,3 @@
     </td>
   </tr>
 </table>
-<br>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 5a12dd5..ddc79a7 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -336,6 +336,20 @@
       </td>
     </tr>
 
+    <tr>
+      <td colspan="2">
+        <br>
+        [%# *** Attachments *** %]
+
+          [% PROCESS attachment/list.html.tmpl
+                     attachments = bug.attachments
+                     bugid       = bug.bug_id
+                     num_attachment_flag_types = bug.num_attachment_flag_types
+                     show_attachment_flags = bug.show_attachment_flags
+          %]
+      </td>
+    </tr>
+
   </table>
 
   [% IF user.in_group(Param('timetrackinggroup')) %]
@@ -410,16 +424,6 @@
     </table>
   [% END %]
 
-[%# *** Attachments *** %]
-
-  [% PROCESS attachment/list.html.tmpl
-             attachments = bug.attachments
-             bugid       = bug.bug_id
-             num_attachment_flag_types = bug.num_attachment_flag_types
-             show_attachment_flags = bug.show_attachment_flags
-   %]
-
-
 [%# *** Comments Groups *** %]
 
   <br>