summaryrefslogtreecommitdiffstats
path: root/template/en/default/bug
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default/bug')
-rw-r--r--template/en/default/bug/process/next.html.tmpl67
-rw-r--r--template/en/default/bug/show.html.tmpl37
2 files changed, 24 insertions, 80 deletions
diff --git a/template/en/default/bug/process/next.html.tmpl b/template/en/default/bug/process/next.html.tmpl
deleted file mode 100644
index 1cd9328a1..000000000
--- a/template/en/default/bug/process/next.html.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-[%# 1.0@bugzilla.org %]
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
- #
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Netscape Communications
- # Corporation. Portions created by Netscape are
- # Copyright (C) 1998 Netscape Communications Corporation. All
- # Rights Reserved.
- #
- # Contributor(s): Myk Melez <myk@mozilla.org>
- #%]
-
-[%# INTERFACE:
- # bug : Bug object; the next bug to show
- #%]
-
-[% PROCESS global/variables.none.tmpl %]
-
-<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>
-<table border="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" align="left" nowrap="nowrap">
- <font size="+1">
- <b>[%+ terms.Bugzilla %] [%+ terms.Bug %] [%+ bug.bug_id %]</b>
- </font>
- </td>
- <td valign="middle" align="left">
- &nbsp;
- </td>
- <td valign="middle" align="left">
- [% bug.short_desc FILTER html %]
- </td>
- <td valign="middle" align="right">
- Last modified: [% bug.delta_ts FILTER time %]
- </td>
- </tr>
-</table>
-
-[% PROCESS bug/navigate.html.tmpl %]
-
-<hr>
-
-[% PROCESS "bug/edit.html.tmpl" %]
-
-<hr>
-
-[% PROCESS bug/navigate.html.tmpl %]
-
-<br>
-
-[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 8db59a980..8cb14ee4d 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -26,19 +26,30 @@
[%# This script/template only handles one bug #%]
[% bug = bugs.0 %]
-[% filtered_desc = bug.short_desc FILTER html %]
-[% filtered_timestamp = bug.delta_ts FILTER time %]
-[% PROCESS global/header.html.tmpl
- title = "$terms.Bug $bug.bug_id - $bug.short_desc"
- h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id"
- h2 = filtered_desc
- h3 = "Last modified: $filtered_timestamp"
- bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
-%]
+[% IF !header_done %]
+ [% filtered_desc = bug.short_desc FILTER html %]
+ [% filtered_timestamp = bug.delta_ts FILTER time %]
+ [% PROCESS global/header.html.tmpl
+ title = "$terms.Bug $bug.bug_id - $bug.short_desc"
+ h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id"
+ h2 = filtered_desc
+ h3 = "Last modified: $filtered_timestamp"
+ bodyclasses = ['bz_bug',
+ "bz_status_$bug.bug_status",
+ "bz_component_$bug.component",
+ "bz_bug_$bug.bug_id"
+ ]
+ %]
+[% 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/navigate.html.tmpl %]