Skip to content

bugzilla
bugzilla
Commit 2f96220d authored by lpsolit%gmail.com's avatar lpsolit%gmail.com
Browse files
Options

Bug 340426: Add a navbar at the top of each pages + have a better title - Patch…

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
parent 3e81855f
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 145 deletions
skins/standard/global.css
View file @ 2f96220d
...@@ -30,10 +30,9 @@ body ...@@ -30,10 +30,9 @@ body
/* banner (begin) */ /* banner (begin) */
#banner #banner
{ {
text-align: center;
width: 100%; width: 100%;
background: #fff; background: #fff;
padding-bottom: 1em;
} }
#banner p #banner p
...@@ -50,17 +49,17 @@ body ...@@ -50,17 +49,17 @@ body
background: transparent no-repeat url(global/header.png); background: transparent no-repeat url(global/header.png);
} }
#banner-version #banner .links
{ {
font-family: sans-serif; font-family: sans-serif;
font-size: 75%; font-size: 85%;
background: #fff; background: #fff;
} }
/* hide from NN4 */ #banner form
p#banner-version
{ {
font-size: 85%; font-size: 85%;
display: inline;
} }
/* banner (end) */ /* banner (end) */
...@@ -68,102 +67,45 @@ body ...@@ -68,102 +67,45 @@ body
#header #header
{ {
width: 100%; 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; margin: 0;
padding: 0; padding: 0.5em;
} vertical-align: bottom;
/* 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;
} }
#header h1 #header h1
{ {
font-family: serif;
font-weight: bold; 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 #header h2
{ {
font-family: serif;
font-weight: normal; font-weight: normal;
font-size: 100%; width: 100%;
} text-align: center;
/* hide from MSIE and NN4 */
[id]#header h2
{
float: none;
width: auto;
text-align: left;
vertical-align: top;
} }
#header h3 #header h3
{ {
font-family: serif;
font-weight: normal; 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; text-align: right;
vertical-align: top; font-size: 90%;
} }
#message #message
{ {
border: 1px solid red; border: 1px solid red;
padding: 0.3em; padding: 0.3em;
color: green; color: green;
} }
/* header (end) */ /* header (end) */
......
template/en/default/bug/show.html.tmpl
View file @ 2f96220d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
[% filtered_timestamp = bug.delta_ts FILTER time %] [% filtered_timestamp = bug.delta_ts FILTER time %]
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = "$terms.Bug $bug.bug_id - $bug.short_desc" title = "$terms.Bug $bug.bug_id - $bug.short_desc"
h1 = "$terms.Bugzilla $terms.Bug $bug.bug_id" h1 = "$terms.Bugzilla $terms.Bug&nbsp;$bug.bug_id"
h2 = filtered_desc h2 = filtered_desc
h3 = "Last modified: $filtered_timestamp" h3 = "Last modified: $filtered_timestamp"
bodyclasses = ['bz_bug', bodyclasses = ['bz_bug',
......
template/en/default/filterexceptions.pl
View file @ 2f96220d
...@@ -227,10 +227,6 @@ ...@@ -227,10 +227,6 @@
'h.html', 'h.html',
], ],
'global/banner.html.tmpl' => [
'VERSION',
],
'global/choose-classification.html.tmpl' => [ 'global/choose-classification.html.tmpl' => [
'class.description', 'class.description',
], ],
...@@ -265,7 +261,7 @@ ...@@ -265,7 +261,7 @@
'size', 'size',
], ],
'global/useful-links.html.tmpl' => [ 'global/common-links.html.tmpl' => [
'email', 'email',
], ],
......
template/en/default/global/banner.html.tmpl
View file @ 2f96220d
...@@ -25,14 +25,13 @@ ...@@ -25,14 +25,13 @@
[% PROCESS global/variables.none.tmpl %] [% PROCESS global/variables.none.tmpl %]
<div id="banner"> <div id="banner">
<div class="intro"></div> <div class="intro"></div>
<p id="banner-name"> <p id="banner-name">
<span>This is [% terms.Bugzilla %]</span> <span>This is [% terms.Bugzilla %]</span>
</p> </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 class="outro"></div>
</div>
[% PROCESS "global/common-links.html.tmpl" no_find = 0 %]
</div>
template/en/default/global/common-links.html.tmpl 0 → 100644
View file @ 2f96220d
[%# 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>
template/en/default/global/header.html.tmpl
View file @ 2f96220d
...@@ -125,19 +125,27 @@ ...@@ -125,19 +125,27 @@
[% INCLUDE global/banner.html.tmpl %] [% INCLUDE global/banner.html.tmpl %]
<div id="header"> <table border="0" cellspacing="0" cellpadding="0" id="header">
<tr>
[% IF h1 %] [% IF h1 %]
<h1>[% h1 %]</h1> <td>
<h1>[% h1 %]</h1>
</td>
[% END %] [% END %]
[% IF h2 %] [% IF h2 %]
<h2>[% h2 %]</h2> <td>
<h2>[% h2 %]</h2>
</td>
[% END %] [% END %]
[% IF h3 %] [% IF h3 %]
<h3>[% h3 %]</h3> <td>
<h3>[% h3 %]</h3>
</td>
[% END %] [% END %]
</div> </tr>
</table>
[% IF message %] [% IF message %]
<div id="message">[% message %]</div> <div id="message">[% message %]</div>
......
template/en/default/global/useful-links.html.tmpl
View file @ 2f96220d
...@@ -28,57 +28,7 @@ ...@@ -28,57 +28,7 @@
<div id="useful-links"> <div id="useful-links">
<div id="links-actions"> <div id="links-actions">
<div class="label">Actions:</div> <div class="label">Actions:</div>
<div class="links"> [% PROCESS "global/common-links.html.tmpl" no_find = 0 %]
<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>
</div> </div>
[% IF user.login %] [% IF user.login %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment