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

---
 .../en/default/admin/params/editparams.html.tmpl   |  4 ++--
 template/en/default/bug/show.html.tmpl             |  2 +-
 template/en/default/global/banner.html.tmpl        | 10 ---------
 template/en/default/global/header.html.tmpl        | 25 +++++++++++++---------
 template/en/default/index.html.tmpl                |  1 +
 5 files changed, 19 insertions(+), 23 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 0560cac6c..ef379e75c 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -46,9 +46,9 @@
 
 [% title = BLOCK %]
   [% IF curpanel == -1 %]
-    [% terms.Bugzilla FILTER html %] Parameters: Index
+    Parameters: Index
   [% ELSE %]
-    [% terms.Bugzilla FILTER html %] Configuration:
+    Configuration:
     [%+ current_panel.title FILTER html %]
   [% END %]
 [% END %]
diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 64410df17..99fd46660 100644
--- a/template/en/default/bug/show.html.tmpl
+++ b/template/en/default/bug/show.html.tmpl
@@ -31,7 +31,7 @@
   [% filtered_timestamp = bug.delta_ts FILTER time %]
   [% PROCESS global/header.html.tmpl
     title = "$terms.Bug $bug.bug_id - $bug.short_desc"
-    h1 = "$terms.Bugzilla $terms.Bug&nbsp;$bug.bug_id"
+    h1 = "$terms.Bug&nbsp;$bug.bug_id"
     h2 = filtered_desc
     h3 = "Last modified: $filtered_timestamp"
     bodyclasses = ['bz_bug',
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>
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index c479f9201..053c03b92 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -31,6 +31,7 @@
 
 [% PROCESS global/header.html.tmpl
    title = "$terms.Bugzilla Main Page"
+   h1 = "Main Page" 
    h3 = "version $VERSION"
    style_urls = [ 'skins/standard/index.css' ]
    onload = 'document.forms[\'f\'].quicksearch.focus();'
-- 
cgit v1.2.3-24-g4f1b