From 2f96220dd6be3293962174d799d5356f872b0254 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 13 Jun 2006 00:35:34 +0000 Subject: Bug 340426: Add a navbar at the top of each pages + have a better title - Patch by Frédéric Buclin and Byron Jones r=glob a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skins/standard/global.css | 96 +++++------------------ template/en/default/bug/show.html.tmpl | 2 +- template/en/default/filterexceptions.pl | 6 +- template/en/default/global/banner.html.tmpl | 11 ++- template/en/default/global/common-links.html.tmpl | 73 +++++++++++++++++ template/en/default/global/header.html.tmpl | 18 +++-- template/en/default/global/useful-links.html.tmpl | 52 +----------- 7 files changed, 113 insertions(+), 145 deletions(-) create mode 100644 template/en/default/global/common-links.html.tmpl diff --git a/skins/standard/global.css b/skins/standard/global.css index 34a25f27a..65ff85a64 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -30,10 +30,9 @@ body /* banner (begin) */ #banner { - text-align: center; - width: 100%; background: #fff; + padding-bottom: 1em; } #banner p @@ -50,17 +49,17 @@ body background: transparent no-repeat url(global/header.png); } - #banner-version + #banner .links { font-family: sans-serif; - font-size: 75%; + font-size: 85%; background: #fff; } - /* hide from NN4 */ - p#banner-version + #banner form { font-size: 85%; + display: inline; } /* banner (end) */ @@ -68,102 +67,45 @@ body #header { width: 100%; + background-color: #edf2f2; + border: 1px solid #ddd; + margin-bottom: 1em; } - #header * + #header h1,h2,h3 { + font-family: sans-serif; + font-size: 110%; margin: 0; - padding: 0; - } - - /* hide from MSIE and NN4 */ - [id]#header - { - display: table; - } - - /* IE hack for float content*/ - * html #header - { - height: 1%; - } - - /* hide from NN4 */ - div#header h1 - { - float: left; + padding: 0.5em; + vertical-align: bottom; } #header h1 { - font-family: serif; font-weight: bold; - font-size: 110%; - padding: 0.2em 1em 0.1em 0.2em; - } - - /* hide from MSIE and NN4 */ - [id]#header h1 - { - float: none; - display: table-cell; - - vertical-align: top; - } - - /* hide from NN4 */ - div#header h2 - { - float: left; - width: 70%; - - text-align: center; - padding: 0.2em 1em 0.1em 0.1em; } #header h2 { - font-family: serif; font-weight: normal; - font-size: 100%; - } - - /* hide from MSIE and NN4 */ - [id]#header h2 - { - float: none; - width: auto; - - text-align: left; - vertical-align: top; + width: 100%; + text-align: center; } #header h3 { - font-family: serif; font-weight: normal; - font-size: 100%; - - padding: 0.2em 0.2em 0.1em 0.1em; - float: right; - } - - /* hide from MSIE and NN4 */ - [id]#header h3 - { - display: table-cell; - float: none; - text-align: right; - vertical-align: top; + font-size: 90%; } #message { - border: 1px solid red; + border: 1px solid red; - padding: 0.3em; - color: green; + padding: 0.3em; + color: green; } /* header (end) */ 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 %] - 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 + # Svetlana Harisova + #%] + +
+ Home | + New | + Search | + +
+ + +
| + + Reports + + [% IF user.id %] + [% email = user.login FILTER url_quote %] + | My Requests + [% ELSE %] + | Requests + [% END %] + + [% IF user.id && Param('usevotes') %] + | My Votes + [% END %] + + [% IF user.login %] + [% ' | Sanity check' IF user.groups.tweakparams %] + [% IF user.authorizer.can_logout %] + | Log out + [% ELSE %] + | Logged in as + [% END %] + [% IF sudoer %] + [%+ sudoer.login FILTER html %] (impersonating + [%+ user.login FILTER html %] + end session) + [% ELSE %] + [%+ user.login FILTER html %] + [% END %] + [% ELSE %] + [% IF Param('createemailregexp') + && user.authorizer.user_can_create_account %] + | New Account + [% END %] + [% IF user.authorizer.can_login %] + | Log In + [% END %] + [% END %] +
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 %] -