summaryrefslogtreecommitdiffstats
path: root/template/en/default/global
diff options
context:
space:
mode:
authorbugzilla%glob.com.au <>2006-06-27 22:58:51 +0200
committerbugzilla%glob.com.au <>2006-06-27 22:58:51 +0200
commit619f441accf1b12758aa513ed06a457d7f193138 (patch)
tree69465a89e98e350870dac1064ec5a9ecda8c92f2 /template/en/default/global
parent49449152d181d37f554a1b6e44836384d3c54b3d (diff)
downloadbugzilla-619f441accf1b12758aa513ed06a457d7f193138.tar.gz
bugzilla-619f441accf1b12758aa513ed06a457d7f193138.tar.xz
Bug 341495: Merge the banner and header
Patch by Byron Jones <bugzilla@glob.com.au> r=LpSolit,kevin.benton a=justdave
Diffstat (limited to 'template/en/default/global')
-rw-r--r--template/en/default/global/banner.html.tmpl10
-rw-r--r--template/en/default/global/header.html.tmpl25
2 files changed, 15 insertions, 20 deletions
diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl
index 4aaa8bd91..620233afa 100644
--- a/template/en/default/global/banner.html.tmpl
+++ b/template/en/default/global/banner.html.tmpl
@@ -23,15 +23,5 @@
[%# Migration note: this file corresponds to the old Param 'bannerhtml' %]
-[% PROCESS global/variables.none.tmpl %]
-
<div id="banner">
- <div class="intro"></div>
- <p id="banner-name">
- <span>This is [% terms.Bugzilla %]</span>
- </p>
- <div class="outro"></div>
-
- [% PROCESS "global/common-links.html.tmpl" no_find = 0 %]
-
</div>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index a18e860fb..9edb5ec08 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -123,30 +123,35 @@
# 'bannerhtml'
#%]
+
+<div id="header">
+
[% INCLUDE global/banner.html.tmpl %]
-<table border="0" cellspacing="0" cellpadding="0" id="header">
+<table border="0" cellspacing="0" cellpadding="0" id="titles">
<tr>
- [% IF h1 %]
- <td>
- <h1>[% h1 %]</h1>
- </td>
- [% END %]
+ <td id="title">
+ [% terms.Bugzilla %][% IF h1 %] - [% h1 %] [% END %]
+ </td>
[% IF h2 %]
- <td>
- <h2>[% h2 %]</h2>
+ <td id="subtitle">
+ [% h2 %]
</td>
[% END %]
[% IF h3 %]
- <td>
- <h3>[% h3 %]</h3>
+ <td id="information">
+ [% h3 %]
</td>
[% END %]
</tr>
</table>
+[% PROCESS "global/common-links.html.tmpl" %]
+
[% IF message %]
<div id="message">[% message %]</div>
[% END %]
+
+</div>