diff options
author | myk%mozilla.org <> | 2002-03-12 22:54:53 +0100 |
---|---|---|
committer | myk%mozilla.org <> | 2002-03-12 22:54:53 +0100 |
commit | 496013d2cc0586cde9db0ace761292594fcae995 (patch) | |
tree | 619f2c7f7f253ce069595b09865d1bfb3c33e0f0 /template | |
parent | 38551035718d027fb8794f56a15fe1bf5a63676b (diff) | |
download | bugzilla-496013d2cc0586cde9db0ace761292594fcae995.tar.gz bugzilla-496013d2cc0586cde9db0ace761292594fcae995.tar.xz |
Fix for bug 103778: Rewrites and templatizes buglist.cgi.
Patch by Myk Melez <myk@mozilla.org>.
r=bbaetz,gerv
Diffstat (limited to 'template')
-rw-r--r-- | template/default/buglist/buglist-rdf.rdf.tmpl | 52 | ||||
-rw-r--r-- | template/default/buglist/buglist-simple.html.tmpl | 44 | ||||
-rw-r--r-- | template/default/buglist/buglist.html.tmpl | 160 | ||||
-rw-r--r-- | template/default/buglist/change-form.tmpl | 339 | ||||
-rw-r--r-- | template/default/buglist/server-push.html.tmpl | 35 | ||||
-rw-r--r-- | template/default/buglist/table.tmpl | 142 | ||||
-rwxr-xr-x | template/default/global/header | 9 | ||||
-rw-r--r-- | template/default/global/message.html.tmpl | 4 |
8 files changed, 783 insertions, 2 deletions
diff --git a/template/default/buglist/buglist-rdf.rdf.tmpl b/template/default/buglist/buglist-rdf.rdf.tmpl new file mode 100644 index 000000000..4cf480dcc --- /dev/null +++ b/template/default/buglist/buglist-rdf.rdf.tmpl @@ -0,0 +1,52 @@ +[%# 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> + #%] + +<?xml version="1.0"?> +<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:bz="http://www.bugzilla.org/rdf#"> + +<bz:result about="[% Param('urlbase') %]buglist.cgi?[% urlquerypart FILTER html %]"> + + <bz:bugs> + <Seq> + [% FOREACH bug = bugs %] + <li> + + <bz:bug about="[% Param('urlbase') %]show_bug.cgi?id=[% bug.id %]"> + + <bz:id>[% bug.id %]</bz:id> + + [% FOREACH column = displaycolumns %] + <bz:[% column %]>[% bug.$column FILTER html %]</bz:[% column %]> + [% END %] + + </bz:bug> + + </li> + + [% END %] + + </Seq> + + </bz:bugs> + +</bz:result> + +</RDF> diff --git a/template/default/buglist/buglist-simple.html.tmpl b/template/default/buglist/buglist-simple.html.tmpl new file mode 100644 index 000000000..c2e4e6823 --- /dev/null +++ b/template/default/buglist/buglist-simple.html.tmpl @@ -0,0 +1,44 @@ +[%# 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> + #%] + +[%############################################################################%] +[%# Initialization #%] +[%############################################################################%] + +[% DEFAULT title = "Bug List" %] +[% title = title FILTER html %] + + +[%############################################################################%] +[%# Bug Table #%] +[%############################################################################%] + +<html> + + <head> + <title>[% title %]</title> + <link href="css/buglist.css" rel="stylesheet" type="text/css" /> + </head> + + <body> + [% PROCESS buglist/table.tmpl %] + </body> + +</html> diff --git a/template/default/buglist/buglist.html.tmpl b/template/default/buglist/buglist.html.tmpl new file mode 100644 index 000000000..f9ea46bec --- /dev/null +++ b/template/default/buglist/buglist.html.tmpl @@ -0,0 +1,160 @@ +[%# 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> + #%] + +[%############################################################################%] +[%# Template Initialization #%] +[%############################################################################%] + +[% DEFAULT title = "Bug List" %] +[% style_url = "css/buglist.css" %] + + +[%############################################################################%] +[%# Page Header #%] +[%############################################################################%] + +[% PROCESS global/header + title = title + style = style +%] + +<div align="center"> + <b>[% currenttime %]</b><br /> + + [% IF debug %] + <p>[% query FILTER html %]</p> + [% END %] + + [% IF quip %] + <a href="quips.cgi"><i>[% quip %]</i></a> + [% END %] + +</div> + +[% IF toolong %] + <h2> + This list is too long for Bugzilla's little mind; the + Next/Prev/First/Last buttons won't appear on individual bugs. + </h2> +[% END %] + +<hr /> + + +[%############################################################################%] +[%# Preceding Status Line #%] +[%############################################################################%] + +[% IF bugs.size > 9 %] + [% bugs.size %] bugs found. +[% END %] + + +[%############################################################################%] +[%# Start of Change Form #%] +[%############################################################################%] + +[% IF dotweak %] + <form name="changeform" method="post" action="process_bug.cgi"> +[% END %] + + +[%############################################################################%] +[%# Bug Table #%] +[%############################################################################%] + +[% FLUSH %] +[% PROCESS buglist/table.tmpl %] + +[%############################################################################%] +[%# Succeeding Status Line #%] +[%############################################################################%] + +[% IF bugs.count == 0 %] + Zarro Boogs found. + <p> + <a href="query.cgi">Query Page</a> + <a href="enter_bug.cgi">Enter New Bug</a> + <a href="query.cgi?[% urlquerypart %]">Edit this query</a> + </p> + +[% ELSIF bugs.count == 1 %] + One bug found. + +[% ELSE %] + [% bugs.size %] bugs found. + +[% END %] + +<br /> + + +[%############################################################################%] +[%# Rest of Change Form #%] +[%############################################################################%] + +[% IF dotweak %] + + [% PROCESS "buglist/change-form.tmpl" %] + + </form> + + <hr /> + +[% END %] + + +[%############################################################################%] +[%# Navigation Bar #%] +[%############################################################################%] + +[% IF bugs.size > 0 %] + <form method="post" action="long_list.cgi"> + <input type="hidden" name="buglist" value="[% buglist %]"> + <input type="submit" value="Long Format"> + + <a href="query.cgi">Query Page</a> + <a href="enter_bug.cgi">Enter New Bug</a> + <a href="colchange.cgi?[% urlquerypart %]">Change Columns</a> + + [% IF bugs.size > 1 && caneditbugs && !dotweak %] + <a href="buglist.cgi?[% urlquerypart %] + [%- "&order=$order" FILTER uri html IF order %]&tweak=1">Change Several + Bugs at Once</a> + + [% END %] + + [% IF bugowners %] + <a href="mailto:[% bugowners %]">Send Mail to Bug Owners</a> + [% END %] + + <a href="query.cgi?[% urlquerypart %]">Edit this Query</a> + + </form> + +[% END %] + + +[%############################################################################%] +[%# Page Footer #%] +[%############################################################################%] + +[% PROCESS global/footer %] + diff --git a/template/default/buglist/change-form.tmpl b/template/default/buglist/change-form.tmpl new file mode 100644 index 000000000..8498a0ab8 --- /dev/null +++ b/template/default/buglist/change-form.tmpl @@ -0,0 +1,339 @@ +[%# 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> + #%] + +<script type="text/javascript" language="JavaScript"> + var numelements = document.forms.changeform.elements.length; + function SetCheckboxes(value) { + var item; + for (var i=0 ; i<numelements ; i++) { + item = document.forms.changeform.elements[i]; + item.checked = value; + } + } + document.write(' <input type="button" value="Uncheck All" onclick="SetCheckboxes(false);">'); + document.write(' <input type="button" value="Check All" onclick="SetCheckboxes(true);">'); +</script> + +<hr /> + +<p><font size="-1"> + To change multiple bugs: + <ol> + <li>Check the bugs you want to change above.</li> + <li>Make your changes in the form fields below. If the change + you are making requires an explanation, include it in + the comments box.</li> + <li>Click the <em>Commit</em> button.</li> + </ol> +</font></p> + +<table id="form"> + <tr> + + <th><label for="product">Product:</label></th> + <td> + [% PROCESS selectmenu menuname = "product" + menuitems = products %] + </td> + + <th><label for="version">Version:</label></th> + <td> + [% PROCESS selectmenu menuname = "version" + menuitems = versions %] + </td> + + </tr> + <tr> + + <th> + <label for="rep_platform"> + <a href="bug_status.html#rep_platform">Platform:</a> + </label> + </th> + <td> + [% PROCESS selectmenu menuname = "rep_platform" + menuitems = platforms %] + </td> + + <th> + <label for="priority"> + <a href="bug_status.html#priority">Priority:</a> + </label> + </th> + <td> + [% PROCESS selectmenu menuname = "priority" + menuitems = priorities %] + </td> + + </tr> + <tr> + + <th><label for="component">Component:</label></th> + <td> + [% PROCESS selectmenu menuname = "component" + menuitems = components %] + </td> + + <th> + <label for="severity"> + <a href="bug_status.html#severity">Severity:</a> + </label> + </th> + <td> + [% PROCESS selectmenu menuname = "severity" + menuitems = severities %] + </td> + + </tr> + <tr> + + <th><label for="target_milestone">Target Milestone:</label></th> + <td colspan="3"> + [% PROCESS selectmenu menuname = "target_milestone" + menuitems = targetmilestones %] + </td> + + </tr> + + [% IF Param("useqacontact") %] + <tr> + <th><label for="qa_contact">QA Contact:</label></th> + <td colspan="3"> + <input id="qa_contact" + name="qa_contact" + value="[% dontchange FILTER html %]" + size="32"> + </td> + </tr> + [% END %] + + <tr> + + <th><label for="masscc">CC List:</label></th> + <td colspan="3"> + <input id="masscc" name="masscc" size="32"> + <select name="ccaction"> + <option value="add">Add these to the CC List</option> + <option value="remove">Remove these from the CC List</option> + </select> + </td> + + </tr> + + [% IF use_keywords %] + <tr> + + <th> + <label for="keywords"> + <a href="describekeywords.cgi">Keywords:</a> + </label> + </th> + <td colspan="3"> + <input id="keywords" name="keywords" size="32"> + <select name="keywordaction"> + <option value="add">Add these keywords</option> + <option value="delete">Delete these keywords</option> + <option value="makeexact">Make the keywords be exactly this list</option> + </select> + </td> + + </tr> + [% END %] + + <tr> + <th>Depends on:</th> + <td colspan="3"> + <input id="dependson" name="dependson" size="32"> + <select name="dependsonaction"> + <option value="add">Add these dependencies</option> + <option value="delete">Remove these dependencies</option> + <option value="makeexact">Make the dependencies be exactly this list</option> + </select> + </td> + </tr> + + <tr> + <th>Blocks:</th> + <td colspan="3"> + <input id="blocked" name="blocked" size="32"> + <select name="blockedaction"> + <option value="add">Add these dependencies</option> + <option value="delete">Remove these dependencies</option> + <option value="makeexact">Make the dependencies be exactly this list</option> + </select> + </td> + </tr> + +</table> + +<input type="hidden" name="multiupdate" value="Y"> + +<label for="comment"><b>Additional Comments:</b></label><br /> +<textarea id="comment" name="comment" rows="5" cols="80" wrap="hard"></textarea><br /> + +[% IF groups.size > 0 %] + + <b>Groupset:</b><br /> + <table border="1"> + <tr> + <th>Don't<br />change<br />this group<br />restriction</td> + <th>Remove<br />bugs<br />from this<br />group</td> + <th>Add<br />bugs<br />to this<br />group</td> + <th>Group Name:</td> + </tr> + + [% FOREACH group = groups %] + <tr> + <td align="center"> + <input type="radio" name="bit-[% group.bit %]" value="-1" checked> + </td> + <td align="center"> + <input type="radio" name="bit-[% group.bit %]" value="0"> + </td> + [% IF group.isactive %] + <td align="center"> + <input type="radio" name="bit-[% group.bit %]" value="1"> + </td> + [% ELSE %] + <td> </td> + [% foundinactive = 1 %] + [% END %] + + <td> + [% IF group.isactive %] + [% group.description %] + [% ELSE %] + [% group.description FILTER strike %] + [% END %] + </td> + + </tr> + [% END %] + + </table> + + [% IF foundinactive %] + <font size="-1">(Note: Bugs may not be added to <strike>inactive + groups</strike>, only removed.)</font><br /> + [% END %] + +[% END %] + + + +[% knum = 0 %] +<input id="knob-none" type="radio" name="knob" value="none" CHECKED> +<label for="knob-none">Do nothing else</label><br /> + +[% IF bugstatuses.size == 1 && bugstatuses.0 == unconfirmedstate %] + [% knum = knum + 1 %] + <input id="knob-confirm" type="radio" name="knob" value="confirm> + <label for="knob-confirm"> + Confirm bugs (change status to <b>NEW</b>) + </label><br /> +[% END %] + +[% knum = knum + 1 %] +<input id="knob-accept" type="radio" name="knob" value="accept"> +<label for="knob-accept"> + Accept bugs (change status to <b>ASSIGNED</b>) +</label><br /> + +[%# If all the bugs being changed are open, allow the user to close them. %] +[% IF !bugstatuses.containsany(closedstates) %] + [% knum = knum + 1 %] + <input id="knob-clearresolution" type="radio" name="knob" value="clearresolution"> + <label for="knob-clearresolution">Clear the resolution</label><br /> + + [% knum = knum + 1 %] + <input id="knob-resolve" type="radio" name="knob" value="resolve"> + <label for="knob-resolve"> + Resolve bugs, changing <A HREF="bug_status.html">resolution</A> to + </label> + <select name="resolution" onchange="document.forms.changeform.knob[[% knum %]].checked=true"> + [% FOREACH resolution = resolutions %] + [% NEXT IF !resolution %] + <option value="[% resolution %]" [% selected IF resolution == "FIXED" %]> + [% resolution %] + </option> + [% END %] + </select><br /> + +[% END %] + +[%# If all the bugs are closed, allow the user to reopen them. %] +[% IF !bugstatuses.containsany(openstates) %] + [% knum = knum + 1 %] + <input id="knob-reopen" type="radio" name="knob" value="reopen"> + <label for="knob-reopen">Reopen bugs</label><br /> +[% END %] + +[% IF bugstatuses.size == 1 %] + [% IF bugstatuses.contains('RESOLVED') %] + [% knum = knum + 1 %] + <input id="knob-verify" type="radio" name="knob" value="verify"> + <label for="knob-verify">Mark bugs as <b>VERIFIED</b></label><br /> + [% ELSIF bugstatuses.contains('VERIFIED') %] + [% knum = knum + 1 %] + <input id="knob-close" type="radio" name="knob" value="close"> + <label for="knob-close">Mark bugs as <b>CLOSED</b></label><br /> + [% END %] +[% END %] + +[% knum = knum + 1 %] +<input id="knob-reassign" type="radio" name="knob" value="reassign"> +<label for="knob-reassign"><a href="bug_status.html#assigned_to"> + Reassign</A> bugs to +</label> +<input name="assigned_to" + value="[% user %]" + onchange="document.forms.changeform.knob[[% knum %]].checked = true;" + size="32"><br /> + +[% knum = knum + 1 %] +<input id="knob-reassignbycomponent" + type="radio" + name="knob" + value="reassignbycomponent"> +<label for="knob-reassignbycomponent"> + Reassign bugs to owner of selected component +</label><br /> + +<input type="submit" value="Commit"> + +[% IF ismover %] + <input type="submit" name="action" value="[% Param('move-button-text') %]"> +[% END %] + + +[%############################################################################%] +[%# Select Menu Block #%] +[%############################################################################%] + +[% BLOCK selectmenu %] + <select id="[% menuname %]" name="[% menuname %]"> + <option value="[% dontchange FILTER html %]" selected> + [% dontchange FILTER html %] + </option> + [% FOREACH menuitem = menuitems %] + <option value="[% menuitem FILTER html %]">[% menuitem FILTER html %]</option> + [% END %] + </select> +[% END %] diff --git a/template/default/buglist/server-push.html.tmpl b/template/default/buglist/server-push.html.tmpl new file mode 100644 index 000000000..be10f7ab3 --- /dev/null +++ b/template/default/buglist/server-push.html.tmpl @@ -0,0 +1,35 @@ +[%# 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> + #%] + +<html> + <head> + <title>Bugzilla is pondering your query</title> + </head> + <body> + <h1 style="margin-top: 20%; text-align: center;">Please stand by ...</h1> + + [% IF debug %] + <p> + <code>[% query FILTER html %]</code> + </p> + [% END %] + + </body> +</html> diff --git a/template/default/buglist/table.tmpl b/template/default/buglist/table.tmpl new file mode 100644 index 000000000..092ff8d2d --- /dev/null +++ b/template/default/buglist/table.tmpl @@ -0,0 +1,142 @@ +[%# 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> + #%] + +[%############################################################################%] +[%# Initialization #%] +[%############################################################################%] + +[%# Columns whose titles or values should be abbreviated to make the list + # more compact. For columns whose titles should be abbreviated, + # the shortened title is included. For columns whose values should be + # abbreviated, a maximum length is provided along with the ellipsis that + # should be added to an abbreviated value, if any. + #%] +[% abbrev = + { + "severity" => { size => 3 , title => "Sev" } , + "priority" => { size => 3 , title => "Pri" } , + "platform" => { size => 3 , title => "Plt" } , + "status" => { size => 4 } , + "reporter" => { size => 45 , ellipsis => "..." } , + "owner" => { size => 45 , ellipsis => "..." } , + "qa_contact" => { size => 45 , ellipsis => "..." , title => "QAContact" } , + "resolution" => { size => 4 } , + "summary" => { size => 60 , ellipsis => "..." } , + "status_whiteboard" => { title => "StatusSummary" } , + "component" => { size => 8 , title => "Comp" } , + "product" => { size => 8 } , + "version" => { size => 5 , title => "Vers" } , + "os" => { size => 4 } , + "target_milestone" => { title => "TargetM" } , + } +%] + +[%############################################################################%] +[%# Table Header #%] +[%############################################################################%] + +[% tableheader = BLOCK %] + <table class="bz_buglist" cellspacing="0" cellpadding="4" width="100%"> + <colgroup> + <col class="bz_id_column"> + [% FOREACH id = displaycolumns %] + <col class="bz_[% id %]_column"> + [% END %] + </colgroup> + + <tr align="left"> + <th colspan="[% splitheader ? 2 : 1 %]"> + <a href="buglist.cgi?[% urlquerypart %]&order=bugs.bug_id">ID</a> + </th> + + [% IF splitheader %] + + [% FOREACH id = displaycolumns %] + [% NEXT IF loop.count() % 2 == 0 %] + [% column = columns.$id %] + [% PROCESS columnheader %] + [% END %] + + </tr><tr align="left"><th> </th> + + [% FOREACH id = displaycolumns %] + [% NEXT UNLESS loop.count() % 2 == 0 %] + [% column = columns.$id %] + [% PROCESS columnheader %] + [% END %] + + [% ELSE %] + + [% FOREACH id = displaycolumns %] + [% column = columns.$id %] + [% PROCESS columnheader %] + [% END %] + + [% END %] + + </tr> +[% END %] + +[% BLOCK columnheader %] + <th colspan="[% splitheader ? 2 : 1 %]"> + <a href="buglist.cgi?[% urlquerypart %]&order= + [% column.name FILTER uri html %] + [% ",$order" FILTER uri html IF order %]"> + [%- abbrev.$id.title || column.title -%]</a> + </th> +[% END %] + + +[%############################################################################%] +[%# Bug Table #%] +[%############################################################################%] + +[% FOREACH bug = bugs %] + [% FLUSH IF loop.count() % 10 == 1 %] + + [%# At the beginning of every hundred bugs in the list, start a new table. %] + [% IF loop.count() % 100 == 1 %] + [% tableheader %] + [% END %] + + <tr class="bz_[% bug.severity %] bz_[% bug.priority %] [%+ "bz_secure" IF (bug.groupset && !usebuggroups) %]"> + + <td> + [% IF dotweak %]<input type="checkbox" name="id_[% bug.id %]">[% END %] + <a href="show_bug.cgi?id=[% bug.id %]">[% bug.id %]</a> + </td> + + [% FOREACH column = displaycolumns %] + <td> + [%+ bug.$column.truncate(abbrev.$column.size, abbrev.$column.ellipsis) FILTER html %] + </td> + [% END %] + + </tr> + + [%# At the end of every hundred bugs in the list, or at the end of the list, + # end the current table. + #%] + [% IF loop.last() || loop.count() % 100 == 0 %] + </table> + [% END %] + +[% END %] + diff --git a/template/default/global/header b/template/default/global/header index 627a52571..05afe2bed 100755 --- a/template/default/global/header +++ b/template/default/global/header @@ -11,14 +11,23 @@ <html> <head> <title>[% title %]</title> + [% Param('headerhtml') %] + [% jscript %] + [% IF style %] <style type="text/css"> [% style %] </style> [% END %] + + [% IF style_url %] + <link href="[% style_url %]" rel="stylesheet" type="text/css" /> + [% END %] + </head> + <body [% Param('bodyhtml') %][% " " %][% extra %]> [% PerformSubsts(Param('bannerhtml')) %] diff --git a/template/default/global/message.html.tmpl b/template/default/global/message.html.tmpl index 03253242a..912e9f322 100644 --- a/template/default/global/message.html.tmpl +++ b/template/default/global/message.html.tmpl @@ -1,6 +1,6 @@ [% DEFAULT title = "Bugzilla Message" %] -[% INCLUDE global/header title=title %] +[% PROCESS global/header %] [%# The "header" template automatically displays the contents of a "message" variable if it finds one, so it is not necessary to display the message @@ -13,4 +13,4 @@ </p> [% END %] -[% INCLUDE global/footer %] +[% PROCESS global/footer %] |