Bug 340426: Add a navbar at the top of each pages + have a better title - Patch by Frédéric Buclin <LpSolit@gmail.com> and Byron Jones <bugzilla@glob.com.au> r=glob a=justdave

6 files changed, 94 insertions, 68 deletions

diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl
index 8cb14ee4d..64410df17 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 $bug.bug_id"
+    h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id"
     h2 = filtered_desc
     h3 = "Last modified: $filtered_timestamp"
     bodyclasses = ['bz_bug',
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index bb139e2de..19f040c52 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -227,10 +227,6 @@
   'h.html', 
 ],
 
-'global/banner.html.tmpl' => [
-  'VERSION', 
-],
-
 'global/choose-classification.html.tmpl' => [
   'class.description', 
 ],
@@ -265,7 +261,7 @@
   'size', 
 ],
 
-'global/useful-links.html.tmpl' => [
+'global/common-links.html.tmpl' => [
   'email', 
 ],
 
diff --git a/template/en/default/global/banner.html.tmpl b/template/en/default/global/banner.html.tmpl
index 42ccce1aa..4aaa8bd91 100644
--- a/template/en/default/global/banner.html.tmpl
+++ b/template/en/default/global/banner.html.tmpl
@@ -25,14 +25,13 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-    <div id="banner">
+  <div id="banner">
     <div class="intro"></div>
       <p id="banner-name">
         <span>This is [% terms.Bugzilla %]</span>
       </p>
-      <p id="banner-version">
-        <a href="http://www.bugzilla.org/"><span>Bugzilla</span></a>
-        <span>Version [% VERSION %]</span>
-      </p>
     <div class="outro"></div>
-    </div>
+
+    [% PROCESS "global/common-links.html.tmpl" no_find = 0 %]
+
+  </div>
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
new file mode 100644
index 000000000..877027676
--- /dev/null
+++ b/template/en/default/global/common-links.html.tmpl
@@ -0,0 +1,73 @@
+[%# 1.0@bugzilla.org %]
+[%# 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): Gervase Markham <gerv@gerv.net>
+  #                 Svetlana Harisova <light@rathedg.com>
+  #%]
+
+<div class="links">
+  <a href="./">Home</a> |
+  <a href="enter_bug.cgi">New</a> |
+  <a href="query.cgi">Search</a> |
+
+  <form action="buglist.cgi" method="get"
+        onsubmit="if (this.quicksearch.value == '')
+                  { alert('Please enter one or more search terms first.');
+                    return false; } return true;">
+    <input class="txt" type="text" name="quicksearch">
+    <input class="btn" type="submit" value="Find">
+  </form> |
+
+  <a href="report.cgi">Reports</a>
+
+  [% IF user.id %]
+    [% email = user.login FILTER url_quote %]
+    | <a href="request.cgi?requester=[% email %]&amp;requestee=
+               [%- email %]&amp;do_union=1&amp;group=type">My Requests</a>
+  [% ELSE %]
+    | <a href="request.cgi">Requests</a>
+  [% END %]
+
+  [% IF user.id && Param('usevotes') %]
+    | <a href="votes.cgi?action=show_user">My&nbsp;Votes</a>
+  [% END %]
+
+  [% IF user.login %]
+    [% ' | <a href="sanitycheck.cgi">Sanity&nbsp;check</a>' IF user.groups.tweakparams %]
+    [% IF user.authorizer.can_logout %]
+      | <a href="relogin.cgi">Log&nbsp;out</a>
+    [% ELSE %]
+      | Logged&nbsp;in&nbsp;as
+    [% END %]
+    [% IF sudoer %]
+      [%+ sudoer.login FILTER html %] (<b>impersonating
+      [%+ user.login FILTER html %]</b>
+      <a href="relogin.cgi?action=end-sudo">end session</a>)
+    [% ELSE %]
+      [%+ user.login FILTER html %]
+    [% END %]
+  [% ELSE %]
+    [% IF Param('createemailregexp')
+          && user.authorizer.user_can_create_account %]
+      | <a href="createaccount.cgi">New&nbsp;Account</a>
+    [% END %]
+    [% IF user.authorizer.can_login %]
+      | <a href="index.cgi?GoAheadAndLogIn=1">Log&nbsp;In</a>
+    [% END %]
+  [% END %]
+</div>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 959bf5a99..a18e860fb 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -125,19 +125,27 @@
 
 [% INCLUDE global/banner.html.tmpl %]
 
-<div id="header">
+<table border="0" cellspacing="0" cellpadding="0" id="header">
+<tr>
   [% IF h1 %]
-    <h1>[% h1 %]</h1>
+    <td>
+      <h1>[% h1 %]</h1>
+    </td>
   [% END %]
 
   [% IF h2 %]
-    <h2>[% h2 %]</h2>
+    <td>
+      <h2>[% h2 %]</h2>
+    </td>
   [% END %]
 
   [% IF h3 %]
-    <h3>[% h3 %]</h3>
+    <td>
+      <h3>[% h3 %]</h3>
+    </td>
   [% END %]
-</div>
+</tr>
+</table>
 
 [% IF message %]
 <div id="message">[% message %]</div>
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 3ac44d62a..9d97b095b 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -28,57 +28,7 @@
 <div id="useful-links">
   <div id="links-actions">
     <div class="label">Actions:</div>
-    <div class="links">
-        <a href="./">Home</a> | 
-        <a href="enter_bug.cgi">New</a> | 
-        <a href="query.cgi">Search</a> |
-        
-        <form action="buglist.cgi" method="get"
-              onsubmit="if (this.quicksearch.value == '')
-                        { alert('Please enter one or more search terms first.');
-                          return false; } return true;">
-            <input class="txt" type="text" name="quicksearch">
-            <input class="btn" type="submit" value="Find">
-        </form> |
-        
-        <a href="report.cgi">Reports</a> 
-        
-        [% IF user.id %]
-          [% email = user.login FILTER url_quote %]
-          | <a href="request.cgi?requester=[% email %]&amp;requestee=[% email %]&amp;do_union=1&amp;group=type">My Requests</a>
-        [% ELSE %]
-          | <a href="request.cgi">Requests</a>
-        [% END %]
-        
-        [% IF user.id && Param('usevotes') %]
-          | <a href="votes.cgi?action=show_user">My&nbsp;Votes</a>
-        [% END %]      
-        
-        [% IF user.login %] 
-            [% ' | <a href="sanitycheck.cgi">Sanity&nbsp;check</a>' 
-                                                  IF user.groups.tweakparams %]
-            [% IF user.authorizer.can_logout %]
-              | <a href="relogin.cgi">Log&nbsp;out</a>&nbsp;
-            [% ELSE %]
-              | Logged&nbsp;in&nbsp;as&nbsp;
-            [% END %]
-            [% IF sudoer %]
-              [% sudoer.login FILTER html %] (<b>impersonating 
-              [% user.login FILTER html %]</b> 
-              <a href="relogin.cgi?action=end-sudo">end session</a>)
-            [% ELSE %]
-              [% user.login FILTER html %]
-            [% END %]
-        [% ELSE %]
-            [% IF Param('createemailregexp')
-                  && user.authorizer.user_can_create_account %] 
-              | <a href="createaccount.cgi">New&nbsp;Account</a>
-            [% END %]
-            [% IF user.authorizer.can_login %]
-              | <a href="index.cgi?GoAheadAndLogIn=1">Log&nbsp;In</a>
-            [% END %]
-        [% END %]
-    </div>
+    [% PROCESS "global/common-links.html.tmpl" no_find = 0 %]
   </div>
       
     [% IF user.login %]