From 6175b77614e30d2e60d984cccc109670722bb5cf Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Fri, 23 May 2014 16:02:00 +0400
Subject: [PATCH] Move session_result to a separate template

---
 .../en/default/bug/session_result.html.tmpl   | 63 +++++++++++++++++++
 template/en/default/bug/show.html.tmpl        | 59 +----------------
 2 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 template/en/default/bug/session_result.html.tmpl

diff --git a/template/en/default/bug/session_result.html.tmpl b/template/en/default/bug/session_result.html.tmpl
new file mode 100644
index 000000000..908fec406
--- /dev/null
+++ b/template/en/default/bug/session_result.html.tmpl
@@ -0,0 +1,63 @@
+[%# This template shows result for previous operation loaded from session
+  # License: Dual-license MPL 1.1+ or GPL 3.0+
+  # Author(s): Vitaliy Filippov %]
+
+[% IF added_attachments %]
+[% FOR att = added_attachments %]
+<dl>
+  <dt>
+    <a title="[% att.description | html %]"
+       href="attachment.cgi?id=[% att.id %]&amp;action=edit">Attachment #[% att.id %]</a>
+    to [% "$terms.bug $att.bug_id" FILTER bug_link(att.bug_id) FILTER none %] created
+  </dt>
+  <dd>
+    [% IF att.ctype_auto %]
+      <p>
+        <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
+        <em>[% att.contenttype | html %]</em> for this attachment. If this is
+        incorrect, correct the value by editing the attachment's
+        <a href="attachment.cgi?id=[% att.id %]&amp;action=edit">details</a>.
+      </p>
+    [% END %]
+    [% Hook.process("added_attachment_links") %]
+  </dd>
+</dl>
+[% IF att.convertedbmp %]
+<p>
+  <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
+  compressed PNG format.
+</p>
+[% END %]
+[% END %]
+[% END %]
+
+[% IF changed_attachment %]
+[% SET title = "Changes Submitted to Attachment $changed_attachment.id of $terms.Bug $changed_attachment.bug_id" %]
+<dl>
+  <dt>Changes to
+    <a href="attachment.cgi?id=[% changed_attachment.id %]&amp;action=edit">attachment [% changed_attachment.id %]</a>
+    of [% "$terms.bug $changed_attachment.bug_id" FILTER bug_link(changed_attachment.bug_id) FILTER none %] submitted
+  </dt>
+</dl>
+[% END %]
+
+[% FOREACH item = sentmail %]
+  [% FOR k = item.keys; $k = item.$k; END %]
+  [% PROCESS bug/process/results.html.tmpl item %]
+  [% FOR k = item.keys; $k = ''; END %]
+[% END %]
+
+[% IF added_attachments %]
+<a href="attachment.cgi?bugid=[% added_attachments.0.bug_id %]&amp;action=enter">
+  Create Another Attachment to [% terms.Bug %] [%+ added_attachments.0.bug_id %]</a>
+</p>
+[% END %]
+
+[% IF nextbug %]
+<hr />
+<p>
+  The next [% terms.bug %] in your list is [% terms.bug %]
+  <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>:
+</p>
+<hr />
+[% END %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index d33c228ea..cc2016d10 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -33,64 +33,7 @@
 
 [% header_done = 1 %]
 
-[% IF added_attachments %]
-[% FOR att = added_attachments %]
-<dl>
-  <dt>
-    <a title="[% att.description | html %]"
-       href="attachment.cgi?id=[% att.id %]&amp;action=edit">Attachment #[% att.id %]</a>
-    to [% "$terms.bug $att.bug_id" FILTER bug_link(att.bug_id) FILTER none %] created
-  </dt>
-  <dd>
-    [% IF att.ctype_auto %]
-      <p>
-        <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type
-        <em>[% att.contenttype | html %]</em> for this attachment. If this is
-        incorrect, correct the value by editing the attachment's
-        <a href="attachment.cgi?id=[% att.id %]&amp;action=edit">details</a>.
-      </p>
-    [% END %]
-    [% Hook.process("added_attachment_links") %]
-  </dd>
-</dl>
-[% IF att.convertedbmp %]
-<p>
-  <b>Note:</b> [% terms.Bugzilla %] automatically converted your BMP image file to a
-  compressed PNG format.
-</p>
-[% END %]
-[% END %]
-[% END %]
-
-[% IF changed_attachment %]
-[% SET title = "Changes Submitted to Attachment $changed_attachment.id of $terms.Bug $changed_attachment.bug_id" %]
-<dl>
-  <dt>Changes to
-    <a href="attachment.cgi?id=[% changed_attachment.id %]&amp;action=edit">attachment [% changed_attachment.id %]</a>
-    of [% "$terms.bug $changed_attachment.bug_id" FILTER bug_link(changed_attachment.bug_id) FILTER none %] submitted
-  </dt>
-</dl>
-[% END %]
-
-[% FOREACH item = sentmail %]
-  [% FOR k = item.keys; $k = item.$k; END %]
-  [% PROCESS bug/process/results.html.tmpl %]
-[% END %]
-
-[% IF added_attachments %]
-<a href="attachment.cgi?bugid=[% added_attachments.0.bug_id %]&amp;action=enter">
-  Create Another Attachment to [% terms.Bug %] [%+ added_attachments.0.bug_id %]</a>
-</p>
-[% END %]
-
-[% IF nextbug %]
-<hr />
-<p>
-  The next [% terms.bug %] in your list is [% terms.bug %]
-  <a href="show_bug.cgi?id=[% bug.bug_id %]">[% bug.bug_id %]</a>:
-</p>
-<hr />
-[% END %]
+[% PROCESS bug/session_result.html.tmpl %]
 
 [% PROCESS bug/navigate.html.tmpl %]