From 619f441accf1b12758aa513ed06a457d7f193138 Mon Sep 17 00:00:00 2001
From: "bugzilla%glob.com.au" <>
Date: Tue, 27 Jun 2006 20:58:51 +0000
Subject: Bug 341495: Merge the banner and header Patch by Byron Jones
 <bugzilla@glob.com.au> r=LpSolit,kevin.benton a=justdave

---
 template/en/default/global/header.html.tmpl | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'template/en/default/global/header.html.tmpl')

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>
-- 
cgit v1.2.3-24-g4f1b