diff options
| -rw-r--r-- | CGI.pl | 7 | ||||
| -rw-r--r-- | template/en/default/attachment/create.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 41 | ||||
| -rw-r--r-- | template/en/default/search/search-advanced.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/search/search.html.tmpl | 2 |
6 files changed, 38 insertions, 18 deletions
@@ -332,8 +332,8 @@ sub value_quote { } # Adds <link> elements for bug lists. These can be inserted into the header by -# (ab)using the "jscript" parameter to PutHeader, which inserts an arbitrary -# string into the header. This is currently used only in +# using the "header_html" parameter to PutHeader, which inserts an arbitrary +# string into the header. This function is currently used only in # template/en/default/bug/edit.html.tmpl. sub navigation_links($) { my ($buglist) = @_; @@ -849,8 +849,7 @@ Content-type: text/html } sub PutHeader { - ($vars->{'title'}, $vars->{'h1'}, $vars->{'h2'}, - $vars->{'extra'}, $vars->{'jscript'}) = (@_); + ($vars->{'title'}, $vars->{'h1'}, $vars->{'h2'}) = (@_); $::template->process("global/header.html.tmpl", $::vars) || ThrowTemplateError($::template->error()); diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 414639c22..cb979b0c8 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -32,7 +32,7 @@ th { text-align: right; vertical-align: baseline; white-space: nowrap; } td { text-align: left; vertical-align: baseline; padding-bottom: 5px; } " - extra = "onload=\"setContentTypeDisabledState();\"" + body_attributes = "onload=\"setContentTypeDisabledState();\"" %] <form name="entryform" method="post" action="attachment.cgi" enctype="multipart/form-data"> diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index e7abc1950..335c599ef 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -25,7 +25,7 @@ title = "Bug $bug.bug_id - $bug.short_desc" h1 = "Bugzilla Bug $bug.bug_id" h2 = filtered_desc - extra = navigation_links() + header_html = navigation_links() %] [% END %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index f77649ae3..3c79e22d1 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -16,7 +16,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # - # Contributor(s): + # Contributor(s): Gervase Markham <gerv@gerv.net> #%] [%# INTERFACE: @@ -31,22 +31,23 @@ #%] [% DEFAULT - title = "" h1 = title h2 = "" - extra = "" - jscript = "" - style = "" - message = "" %] <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title>[% title FILTER html %]</title> - [% Param('headerhtml') %] +[%# Migration note: contents of the old Param 'headerhtml' would go here %] + + [% header_html %] - [% jscript %] + [% IF javascript %] + <script type="text/javascript" language="JavaScript"> + [% javascript %] + </script> + [% END %] [% IF style %] <style type="text/css"> @@ -60,9 +61,29 @@ </head> - <body [% Param('bodyhtml') %][% " " %][% extra %]> +[%# Migration note: contents of the old Param 'bodyhtml' go in the body tag %] + + <body [% body_attributes %]> + +[%# Migration note: this section corresponds to the old Param 'bannerhtml' %] + + <table bgcolor="#000000" width="100%" border="0" cellpadding="0" + cellspacing="0"> + <tr> + <td> + <a href="http://www.mozilla.org/"> + <img src="http://www.mozilla.org/images/mozilla-banner.gif" alt="" + border="0" width="600" height="58"> + </a> + </td> + </tr> + </table> + + <center> + <small>Bugzilla version [% Param("version") %]</small> + </center> - [% PerformSubsts(Param('bannerhtml')) %] +[%# End section %] [% IF h1 || h2 %] <table border="0" cellspacing="0"> diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index 6284ec516..d5961ebd2 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -27,7 +27,7 @@ [% PROCESS global/header.html.tmpl title = "Search for bugs" - extra = " onLoad=\"selectProduct(document.forms['queryform']);\"" + body_attributes = "onload=\"selectProduct(document.forms['queryform']);\"" %] [% button_name = "Search" %] diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl index 6284ec516..d5961ebd2 100644 --- a/template/en/default/search/search.html.tmpl +++ b/template/en/default/search/search.html.tmpl @@ -27,7 +27,7 @@ [% PROCESS global/header.html.tmpl title = "Search for bugs" - extra = " onLoad=\"selectProduct(document.forms['queryform']);\"" + body_attributes = "onload=\"selectProduct(document.forms['queryform']);\"" %] [% button_name = "Search" %] |