diff options
| -rwxr-xr-x | sanitycheck.cgi | 2 | ||||
| -rw-r--r-- | skins/standard/global.css | 82 | ||||
| -rw-r--r-- | template/en/default/admin/params/editparams.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/show.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/banner.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 25 | ||||
| -rw-r--r-- | template/en/default/index.html.tmpl | 1 |
7 files changed, 62 insertions, 64 deletions
diff --git a/sanitycheck.cgi b/sanitycheck.cgi index 500c6a863..f0f794194 100755 --- a/sanitycheck.cgi +++ b/sanitycheck.cgi @@ -95,7 +95,7 @@ print $cgi->header(); my @row; -$template->put_header("Bugzilla Sanity Check"); +$template->put_header("Sanity Check"); ########################################################################### # Fix vote cache diff --git a/skins/standard/global.css b/skins/standard/global.css index 65ff85a64..aa303fc7e 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -27,53 +27,55 @@ body background-color: #fff; } -/* banner (begin) */ - #banner - { - width: 100%; - background: #fff; - padding-bottom: 1em; - } - - #banner p +/* header (begin) */ + #header { - margin: 0; - margin-bottom: 1px; - padding: 0; + margin-bottom: 1em; + padding-bottom: 2px; } - #banner-name + #header form { - font-size: 0px; - height: 48px; - background: transparent no-repeat url(global/header.png); + font-size: 85%; + display: inline; } - #banner .links + #header .links { font-family: sans-serif; font-size: 85%; - background: #fff; + border-left: 1px solid silver; + border-right: 1px solid silver; + border-bottom: 1px solid silver; + -moz-border-radius-bottomleft: 5px; + -moz-border-radius-bottomright: 5px; + padding: 0.5em; } - #banner form + #message { - font-size: 85%; - display: inline; + border: 1px solid red; + + padding: 0.3em; + color: green; } -/* banner (end) */ -/* header (begin) */ - #header +/* header (end) */ + +/* banner (begin) */ + #banner { - width: 100%; - background-color: #edf2f2; - border: 1px solid #ddd; - margin-bottom: 1em; } - #header h1,h2,h3 +/* banner (end) */ + +/* titles (begin) */ + #titles { + width: 100%; + background-color: #404D6C; + color: #fff; + -moz-border-radius: 5px; font-family: sans-serif; font-size: 110%; margin: 0; @@ -81,33 +83,33 @@ body vertical-align: bottom; } - #header h1 + #titles a + { + color: #fff; + } + + #titles #title { font-weight: bold; + white-space: nowrap; } - #header h2 + #titles #subtitle { font-weight: normal; width: 100%; text-align: center; } - #header h3 + #titles #information { font-weight: normal; text-align: right; font-size: 90%; + white-space: nowrap; } - #message - { - border: 1px solid red; - - padding: 0.3em; - color: green; - } -/* header (end) */ +/* titles (end) */ /* footer (begin) */ #footer 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 $bug.bug_id" + h1 = "$terms.Bug $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();' |