From 84973470df08a269632287e66c52aa30f515ccc1 Mon Sep 17 00:00:00 2001 From: "wurblzap%gmail.com" <> Date: Wed, 18 Oct 2006 02:58:34 +0000 Subject: Bug 321556: Prepare Bugzilla to ship with at least 2 skins. Patch by Marc Schumann ; r=myk, a=justdave --- .../default/global/choose-classification.html.tmpl | 8 +- .../en/default/global/choose-product.html.tmpl | 4 +- template/en/default/global/common-links.html.tmpl | 71 +++++++----- template/en/default/global/footer.html.tmpl | 3 + template/en/default/global/header.html.tmpl | 79 +++++++++---- .../en/default/global/per-bug-queries.html.tmpl | 14 +-- template/en/default/global/tabs.html.tmpl | 24 ++-- template/en/default/global/useful-links.html.tmpl | 125 +++++++++++---------- 8 files changed, 193 insertions(+), 135 deletions(-) (limited to 'template/en/default/global') diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index df0c37911..1ef99d4d8 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -23,7 +23,7 @@ [% IF target == "enter_bug.cgi" %] [% title = "Select Classification" %] - [% h2 = "Please select the classification." %] + [% subheader = "Please select the classification." %] [% END %] [% DEFAULT title = "Choose the classification" %] @@ -33,20 +33,20 @@ [% IF Param('showallproducts') %] - + All: -  Show all products +  Show all products [% END %] [% FOREACH class = classifications %] - + diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index da47332c2..0d4a451b6 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -31,10 +31,10 @@ [% IF target == "enter_bug.cgi" %] [% title = "Enter $terms.Bug" %] - [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %] + [% subheader = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]. [% END %] [% ELSIF target == "describecomponents.cgi" %] [% title = "$terms.Bugzilla Component Descriptions" %] - [% h2 = "Please specify the product whose components you want described." %] + [% subheader = "Please specify the product whose components you want described." %] [% END %] [% DEFAULT title = "Choose a Product" %] diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index 252b895cb..cfb7458e0 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -22,54 +22,63 @@ [% DEFAULT btn_id = "find" %] -
- Home | - New | - Search | +
+ diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl index fc1016621..7de84aa70 100644 --- a/template/en/default/global/footer.html.tmpl +++ b/template/en/default/global/footer.html.tmpl @@ -27,6 +27,8 @@ [% INCLUDE "global/help.html.tmpl" %] + + [%# Migration note: below this point, this file corresponds to the old Param # 'footerhtml' #%] @@ -45,3 +47,4 @@ + diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 9b9420ced..d629a6c23 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -25,9 +25,9 @@ [%# INTERFACE: # (All the below interface elements are optional.) # title: string. Page title. - # h1: string. Main page header. - # h2: string. Page subheader. - # h3: string. Right-aligned subheader. + # header: string. Main page header. + # subheader: string. Page subheader. + # header_addl_info: string. Additional header information. # bodyclasses: array of extra CSS classes for the # onload: string. JavaScript code to run when the page finishes loading. # javascript: string. Javascript to go in the header. @@ -43,20 +43,20 @@ [% END %] [% DEFAULT - h2 = "" - h3 = "" + subheader = "" + header_addl_info = "" onload = "" style_urls = [] %] -[%# We should be able to set the default value of the h1 variable +[%# We should be able to set the default value of the header variable # to the value of the title variable using the DEFAULT directive, - # but that doesn't work if a caller sets h1 to the empty string - # to avoid h1 inheriting the value of title, since DEFAULT - # mistakenly treats empty strings as undefined and gives h1 the + # but that doesn't work if a caller sets header to the empty string + # to avoid header inheriting the value of title, since DEFAULT + # mistakenly treats empty strings as undefined and gives header the # value of title anyway. To get around that problem we explicitly - # set h1's default value here only if it is undefined. %] -[% IF !h1.defined %][% h1 = title %][% END %] + # set header's default value here only if it is undefined. %] +[% IF !header.defined %][% header = title %][% END %] @@ -106,6 +106,14 @@ rel="stylesheet" type="text/css"> [% END %] + [%# CSS cascade, part 2: Standard Bugzilla stylesheet set (selectable) # Present if skin selection is enabled. @@ -117,6 +125,16 @@ title="[% setting_descs.standard FILTER html %]" type="text/css"> [% END %] + [% END %] [%# CSS cascade, part 3: Third-party stylesheet set (selectable). @@ -145,6 +163,16 @@ type="text/css"> [% END %] [% END %] + [% END %] [% END %] @@ -166,6 +194,14 @@ FILTER html %]" rel="stylesheet" type="text/css"> [% END %] [% END %] + [%# this puts the live bookmark up on firefox for the Atom feed %] [% IF atomlink %] @@ -200,19 +236,20 @@ - + - [% IF h2 %] + [% IF subheader %] [% END %] - [% IF h3 %] + [% IF header_addl_info %] [% END %] @@ -220,6 +257,10 @@ [% PROCESS "global/common-links.html.tmpl" btn_id = "find_top" %] + + +
+ [% IF Param('announcehtml') %] [% Param('announcehtml') FILTER none %] [% END %] @@ -227,5 +268,3 @@ [% IF message %]
[% message %]
[% END %] - -
diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl index 631fb8509..a9b4e44db 100644 --- a/template/en/default/global/per-bug-queries.html.tmpl +++ b/template/en/default/global/per-bug-queries.html.tmpl @@ -58,10 +58,9 @@ [% lists_of_bugs.push(q.name) %] [% END %] - + + [% END %] diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl index 6f8601b86..25b931de3 100644 --- a/template/en/default/global/tabs.html.tmpl +++ b/template/en/default/global/tabs.html.tmpl @@ -18,6 +18,7 @@ # # Contributor(s): Gervase Markham # Myk Melez + # Marc Schumann #%] [%# INTERFACE: @@ -28,20 +29,25 @@ # current_tab_name: string. name of the currently selected tab #%] -
-
- [% terms.Bugzilla %][% IF h1 %] - [% h1 %] [% END %] - +

[% terms.Bugzilla %] + [% " – $header" IF header %]

+ 		- [% h2 %] +

[% subheader %]

 - [% h3 %] +

[% header_addl_info %]

+
+
- + [% FOREACH tab = tabs %] [% IF tab.name == current_tab_name %] - + [% ELSE %] - + [% END %] [% END %] - - -
  [% tab.label FILTER html %][% tab.label FILTER html %][% tab.label FILTER html %][% tab.label FILTER html %] 
- +   + + + +
+ [% content %] +
+ + diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl index e1bb2affe..8faed2875 100644 --- a/template/en/default/global/useful-links.html.tmpl +++ b/template/en/default/global/useful-links.html.tmpl @@ -26,86 +26,87 @@ [% PROCESS global/variables.none.tmpl %] - + -- cgit v1.2.3-24-g4f1b