summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authormkanat%bugzilla.org <>2009-12-07 20:11:58 +0100
committermkanat%bugzilla.org <>2009-12-07 20:11:58 +0100
commitbfcab9b81d3aa6b31124a6068dda8f5061d4089a (patch)
treefd780dcbfdb229ee6d11e74a39e8b1faeb156428 /template/en
parent52d3817935a8b93048884bcdfe1c03822afd3efc (diff)
downloadbugzilla-bfcab9b81d3aa6b31124a6068dda8f5061d4089a.tar.gz
bugzilla-bfcab9b81d3aa6b31124a6068dda8f5061d4089a.tar.xz
Bug 530009: Put the template header stuff required to display show_bug all in one place
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/attachment/created.html.tmpl16
-rw-r--r--template/en/default/attachment/updated.html.tmpl20
-rw-r--r--template/en/default/bug/create/created.html.tmpl7
-rw-r--r--template/en/default/bug/process/header.html.tmpl10
-rw-r--r--template/en/default/bug/show-header.html.tmpl50
-rw-r--r--template/en/default/bug/show.html.tmpl24
6 files changed, 61 insertions, 66 deletions
diff --git a/template/en/default/attachment/created.html.tmpl b/template/en/default/attachment/created.html.tmpl
index 4a977667c..da2fec823 100644
--- a/template/en/default/attachment/created.html.tmpl
+++ b/template/en/default/attachment/created.html.tmpl
@@ -26,23 +26,9 @@
[% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %]
-[% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
-%]
-[% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
-[% END %]
-
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
%]
<dl>
diff --git a/template/en/default/attachment/updated.html.tmpl b/template/en/default/attachment/updated.html.tmpl
index b75dc7242..9a74f5c98 100644
--- a/template/en/default/attachment/updated.html.tmpl
+++ b/template/en/default/attachment/updated.html.tmpl
@@ -25,28 +25,10 @@
[% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %]
-[% filtered_desc = bug.short_desc FILTER html %]
-[% filtered_timestamp = bug.delta_ts FILTER time %]
-[% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
-%]
-[% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
-[% END %]
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "Changes Submitted to Attachment $attachment.id of $terms.Bug $attachment.bug_id"
- header = "$terms.Bug&nbsp;$attachment.bug_id"
- subheader = filtered_desc
- header_addl_info = "Last modified: $filtered_timestamp"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
%]
<dl>
diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index dd1be1c17..3dfb3534a 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -32,15 +32,10 @@
[% PROCESS global/variables.none.tmpl %]
-[% filtered_desc = bug.short_desc FILTER html %]
+[% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl
title = "$terms.Bug $id Submitted &ndash; $filtered_desc"
header = "$terms.Bug&nbsp;$id Submitted"
- subheader = filtered_desc
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
-
-
%]
[% header_done = 1 %]
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 3ca8e10e8..25571354e 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -26,6 +26,8 @@
[% USE Bugzilla %]
+[% PROCESS "bug/show-header.html.tmpl" %]
+
[% IF title_tag == "bug_processed" %]
[% title = BLOCK %]
[% IF Bugzilla.cgi.param('id') %]
@@ -41,8 +43,8 @@
[% title = "Change Votes" %]
[% END %]
-[% PROCESS global/header.html.tmpl
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
+[% PROCESS global/header.html.tmpl
+ # We don't have a bug object at this point, unfortunately, so we can't
+ # actually display all the proper header info.
+ header_addl_info = ''
%]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
new file mode 100644
index 000000000..3f81e5738
--- /dev/null
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -0,0 +1,50 @@
+[%# 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): Gervase Markham <gerv@gerv.net>
+ # Vaskin Kissoyan <vkissoyan@yahoo.com>
+ # Bradley Baetz <bbaetz@student.usyd.edu.au>
+ # Max Kanat-Alexander <mkanat@bugzilla.org>
+ #%]
+
+[%# This template should be called with PROCESS before processing
+ # "global/header.html.tmpl" in any template that is going to load the
+ # bug form. It expects only a "bug" object, and can even manage to get
+ # along without that. Some of these variables are just defaults that will
+ # be overridden by the calling templates.
+ #%]
+
+[% filtered_desc = bug.short_desc FILTER html %]
+[% subheader = filtered_desc %]
+[% filtered_timestamp = bug.delta_ts FILTER time %]
+[% title = "$terms.Bug $bug.bug_id &ndash; $filtered_desc" %]
+[% header = "$terms.Bug&nbsp;$bug.bug_id" %]
+[% header_addl_info = "Last modified: $filtered_timestamp" %]
+[% javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] %]
+[% style_urls = [ "skins/standard/yui/calendar.css",
+ "skins/standard/show_bug.css" ] %]
+[% doc_section = "bug_page.html" %]
+
+[% bodyclasses = ['bz_bug',
+ "bz_status_$bug.bug_status",
+ "bz_product_$bug.product",
+ "bz_component_$bug.component",
+ "bz_bug_$bug.bug_id",
+ ] %]
+[% FOREACH group = bug.groups_in %]
+ [% bodyclasses.push("bz_group_$group.name") %]
+[% END %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 44d637d45..8d8e63a20 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -27,28 +27,8 @@
[% bug = bugs.0 %]
[% IF !header_done %]
- [% filtered_desc = bug.short_desc FILTER html %]
- [% filtered_timestamp = bug.delta_ts FILTER time %]
- [% bodyclasses = ['bz_bug',
- "bz_status_$bug.bug_status",
- "bz_product_$bug.product",
- "bz_component_$bug.component",
- "bz_bug_$bug.bug_id"
- ]
- %]
- [% FOREACH group = bug.groups_in %]
- [% bodyclasses.push("bz_group_$group.name") %]
- [% END %]
- [% PROCESS global/header.html.tmpl
- title = "$terms.Bug $bug.bug_id &ndash; $filtered_desc"
- header = "$terms.Bug&nbsp;$bug.bug_id"
- subheader = filtered_desc
- header_addl_info = "Last modified: $filtered_timestamp"
- bodyclasses = bodyclasses
- javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ]
- style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ]
- doc_section = "bug_page.html"
- %]
+ [% PROCESS "bug/show-header.html.tmpl" %]
+ [% PROCESS global/header.html.tmpl %]
[% END %]
[% IF nextbug %]