Bug 72863: Remove ugly table shown when posting/changing a bug

Patch by Olav Vitters <olav@bkor.dhs.org> r+a=justdave

2 files changed, 36 insertions, 47 deletions

diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 3114b2963..e6037bcba 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -32,38 +32,34 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
-  style = "th { text-align: left; }"
 %]
 
-<table border="1">
-  <tr>
-    <td>
-      <h2>
-        <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
-        to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created
-      </h2>
+<dl>
+  <dt>
+    <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&amp;action=edit">Attachment #[% attachid %]</a>
+    to [% "$terms.bug $bugid" FILTER bug_link(bugid) %] created
+  </dt>
+  <dd>
+    [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+    [% IF convertedbmp %]
+      <p>
+        <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
+        compressed PNG format.
+      </p>
+    [% END %]
+    [% IF contenttypemethod == 'autodetect' %]
+      <p>
+        <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
+        <em>[% contenttype %]</em> for this attachment.  If this is
+        incorrect, correct the value by
+        editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
+      </p>
+    [% END %]
 
-      [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
-      [% IF convertedbmp %]
-        <p>
-          <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a 
-          compressed PNG format.
-        </p>
-      [% END %]
-      [% IF contenttypemethod == 'autodetect' %]
-        <p>
-          <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
-          <em>[% contenttype %]</em> for this attachment.  If this is
-          incorrect, correct the value by
-          editing the attachment's <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">details</a>.
-        </p>
-      [% END %]
-    </td>
-    <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a>
-    </td>
-  </tr>
-</table>
+    [%# Links to more information about the changed bug. %]
+    [% Hook.process("links") %]
+  </dd>
+</dl>
 
 <p>
 <a href="attachment.cgi?bugid=[% bugid %]&amp;action=enter">Create
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index de56341e0..a66b74e17 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -29,25 +29,18 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Changes Submitted"
-  style = "th { text-align: left; }"
 %]
 
-<hr>
-
-<table border="1">
-  <tr>
-    <td>
-      <h2>Changes to
-        <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
-        of [% terms.bug %] [%+ bugid %] submitted
-      </h2>
-      [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
-    </td>
-
-    <td>
-      <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a>
-    </td>
-  </tr>
-</table>
+<dl>
+  <dt>Changes to
+    <a href="attachment.cgi?id=[% attachid %]&amp;action=edit">attachment [% attachid %]</a>
+    of [% "$terms.bug $bugid" FILTER bug_link(bugid) %] submitted
+  </dt>
+  <dd>
+    [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %]
+    [%# Links to more information about the changed bug. %]
+    [% Hook.process("links") %]
+  </dd>
+</dl>
 
 [% PROCESS global/footer.html.tmpl %]