Commit bfcab9b8 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org

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
parent 52d38179
...@@ -26,23 +26,9 @@ ...@@ -26,23 +26,9 @@
[% PROCESS global/variables.none.tmpl %] [% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %] [% bug = bugs.0 %]
[% bodyclasses = ['bz_bug', [% PROCESS "bug/show-header.html.tmpl" %]
"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 [% PROCESS global/header.html.tmpl
title = "Attachment $attachment.id added to $terms.Bug $attachment.bug_id" 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> <dl>
......
...@@ -25,28 +25,10 @@ ...@@ -25,28 +25,10 @@
[% PROCESS global/variables.none.tmpl %] [% PROCESS global/variables.none.tmpl %]
[% bug = bugs.0 %] [% 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 [% PROCESS global/header.html.tmpl
title = "Changes Submitted to Attachment $attachment.id of $terms.Bug $attachment.bug_id" 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> <dl>
......
...@@ -32,15 +32,10 @@ ...@@ -32,15 +32,10 @@
[% PROCESS global/variables.none.tmpl %] [% PROCESS global/variables.none.tmpl %]
[% filtered_desc = bug.short_desc FILTER html %] [% PROCESS "bug/show-header.html.tmpl" %]
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = "$terms.Bug $id Submitted &ndash; $filtered_desc" title = "$terms.Bug $id Submitted &ndash; $filtered_desc"
header = "$terms.Bug&nbsp;$id Submitted" 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 %] [% header_done = 1 %]
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
[% USE Bugzilla %] [% USE Bugzilla %]
[% PROCESS "bug/show-header.html.tmpl" %]
[% IF title_tag == "bug_processed" %] [% IF title_tag == "bug_processed" %]
[% title = BLOCK %] [% title = BLOCK %]
[% IF Bugzilla.cgi.param('id') %] [% IF Bugzilla.cgi.param('id') %]
...@@ -42,7 +44,7 @@ ...@@ -42,7 +44,7 @@
[% END %] [% END %]
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
javascript_urls = [ "js/util.js", "js/field.js", "js/yui/calendar.js" ] # We don't have a bug object at this point, unfortunately, so we can't
style_urls = [ "skins/standard/yui/calendar.css", "skins/standard/show_bug.css" ] # actually display all the proper header info.
doc_section = "bug_page.html" header_addl_info = ''
%] %]
[%# 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 %]
...@@ -27,28 +27,8 @@ ...@@ -27,28 +27,8 @@
[% bug = bugs.0 %] [% bug = bugs.0 %]
[% IF !header_done %] [% IF !header_done %]
[% filtered_desc = bug.short_desc FILTER html %] [% PROCESS "bug/show-header.html.tmpl" %]
[% filtered_timestamp = bug.delta_ts FILTER time %] [% PROCESS global/header.html.tmpl %]
[% 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"
%]
[% END %] [% END %]
[% IF nextbug %] [% IF nextbug %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment