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 --- skins/standard/IE-fixes.css | 33 +++ skins/standard/buglist.css | 10 + skins/standard/global.css | 223 +++++++++------------ template/en/default/account/prefs/prefs.html.tmpl | 9 +- .../en/default/admin/components/create.html.tmpl | 4 +- .../en/default/admin/fieldvalues/create.html.tmpl | 4 +- template/en/default/admin/groups/create.html.tmpl | 2 +- template/en/default/admin/groups/list.html.tmpl | 2 +- .../en/default/admin/keywords/create.html.tmpl | 2 +- .../en/default/admin/milestones/create.html.tmpl | 4 +- .../default/admin/products/edit-common.html.tmpl | 12 +- template/en/default/admin/settings/edit.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 16 +- .../en/default/admin/versions/create.html.tmpl | 4 +- template/en/default/attachment/create.html.tmpl | 8 +- .../en/default/attachment/diff-header.html.tmpl | 4 +- template/en/default/attachment/edit.html.tmpl | 33 +-- .../en/default/attachment/show-multiple.html.tmpl | 6 +- template/en/default/bug/activity/show.html.tmpl | 4 +- template/en/default/bug/comments.html.tmpl | 27 +-- .../en/default/bug/create/make-template.html.tmpl | 2 +- template/en/default/bug/dependency-graph.html.tmpl | 6 +- template/en/default/bug/dependency-tree.html.tmpl | 10 +- template/en/default/bug/edit.html.tmpl | 2 + template/en/default/bug/knob.html.tmpl | 8 +- template/en/default/bug/show.html.tmpl | 8 +- template/en/default/bug/summarize-time.html.tmpl | 8 +- .../en/default/bug/votes/list-for-bug.html.tmpl | 2 +- .../en/default/bug/votes/list-for-user.html.tmpl | 2 +- template/en/default/filterexceptions.pl | 14 +- .../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 ++++++------ template/en/default/index.html.tmpl | 4 +- template/en/default/list/quips.html.tmpl | 2 +- template/en/default/list/table.html.tmpl | 9 +- template/en/default/reports/chart.html.tmpl | 2 +- template/en/default/reports/edit-series.html.tmpl | 2 +- template/en/default/reports/report.html.tmpl | 2 +- .../en/default/search/search-advanced.html.tmpl | 6 +- .../en/default/search/search-specific.html.tmpl | 6 +- template/en/default/search/tabs.html.tmpl | 6 +- 47 files changed, 479 insertions(+), 359 deletions(-) create mode 100755 skins/standard/IE-fixes.css diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css new file mode 100755 index 000000000..b0f34141d --- /dev/null +++ b/skins/standard/IE-fixes.css @@ -0,0 +1,33 @@ +/* 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. + * + * Contributor(s): Marc Schumann + */ + +#footer #useful-links li { + padding-bottom: 0.8ex; +} + +#footer .label { + display: block; + float: left; + width: 8.2em; + padding-bottom: 0.1ex; +} + +#footer #links-actions .label { + padding-top: 0.35em; +} + +#footer .links { + display: inline; +} diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css index 45e4937d9..269f7427e 100644 --- a/skins/standard/buglist.css +++ b/skins/standard/buglist.css @@ -21,6 +21,16 @@ .bz_id_column { } +.bz_row_odd { + background-color: #F7F7F7; + color: #000000; +} + +.bz_row_even { + background-color: #FFFFFF; + color: #000000; +} + /* Style bug rows according to severity. */ .bz_blocker { color: red; font-weight: bold; } .bz_critical { color: red; } diff --git a/skins/standard/global.css b/skins/standard/global.css index 5111a4a4a..a2a25c717 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -19,30 +19,34 @@ * Christian Reis * Vitaly Harisov * Svetlana Harisova + * Marc Schumann */ -body -{ - color: #000; - background-color: #fff; -} +/* global (begin) */ + body { + font-family: sans-serif; + color: #000; + background: #fff url("global/body-back.gif") repeat-x; + } +/* global (end) */ /* header (begin) */ - #header - { + #header { margin-bottom: 1em; padding-bottom: 2px; } - #header form - { + #header form { font-size: 85%; display: inline; } - #header .links - { - font-family: sans-serif; + #header .btn, + #header .txt { + font-size: 80%; + } + + #header .links { font-size: 85%; border-left: 1px solid silver; border-right: 1px solid silver; @@ -52,8 +56,7 @@ body padding: 0.5em; } - #message - { + #message { border: 1px solid red; padding: 0.3em; @@ -63,46 +66,45 @@ body /* header (end) */ /* banner (begin) */ - #banner - { + #banner { } /* banner (end) */ /* titles (begin) */ - #titles - { + #titles { width: 100%; background-color: #404D6C; color: #fff; - -moz-border-radius: 5px; - font-family: sans-serif; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; font-size: 110%; margin: 0; padding: 0.5em; vertical-align: bottom; } - #titles a - { + #titles a { color: #fff; } - #titles #title - { + #titles p { + margin: 0; + padding: 0; + } + + #titles #title { font-weight: bold; white-space: nowrap; } - #titles #subtitle - { + #titles #subtitle { font-weight: normal; width: 100%; text-align: center; } - #titles #information - { + #titles #information { font-weight: normal; text-align: right; font-size: 90%; @@ -112,101 +114,82 @@ body /* titles (end) */ /* footer (begin) */ - #footer - { - float: left; + #footer { margin-top: 5px; width: 100%; - font-family: sans-serif; background: #edf2f2; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; } - #footer form - { + #footer form { display: inline; } - #footer .btn, #footer .txt - { - font-size: 0.8em; + #footer .btn, + #footer .txt { + font-size: 80%; } - #footer #useful-links - { - padding: 0.3em; - } - - /* hide from MSIE and NN4 */ - [id]#footer #useful-links - { - margin: 0.3em; + #footer #useful-links { display: table; + padding-left: 1ex; + padding-right: 1ex; } #footer #links-actions, #footer #links-edit, #footer #links-saved, - #footer #links-special - { + #footer #links-special { display: table-row; + list-style-type: none; } - #footer .label - { - width: 8.2em; - display: block; - float: left; - - vertical-align: baseline; - - padding: 0.1em 0.2em; - } - - #footer #links-actions .label - { - padding-top: 0.45em; + #footer .label { + display: table-cell; + white-space: nowrap; + vertical-align: top; } - /* hide from MSIE and NN4 */ - [id]#footer .label - { + #footer .links { display: table-cell; - float: none; - width: auto; - - padding-top: 0; + vertical-align: top; } +/* footer (end) */ - #footer .links - { - display: table-cell; +/* link lists (begin) */ + ul.links { + margin: 0; + padding: 0; + list-style-type: none; + } - padding: 0.1em 0.2em; + ul.links li { + display: inline; + white-space: nowrap; } +/* link lists (end) */ - /* hide from MSIE and NN4 */ - [id]#footer .links - { - padding-top: 0; +/* tabs (begin) */ + .tabs td { + background: #eee; + text-align: center; + border-style: solid; + border-color: black; + border-width: 0px 0px 2px 0px; + } - vertical-align: baseline; + .tabs td.selected { + background: white; + border-width: 2px 2px 0px 2px; } - /* hide from MSIE and NN4 */ - #footer+* - { - clear: both; + .tabs td.spacer { + background: white; } -/* footer (end) */ +/* tabs (end) */ /* generic (begin) */ - body - { - background: #fff url("global/body-back.gif") repeat-x; - } - :link { color: #039; } @@ -222,6 +205,10 @@ body :link:active, :link:active { color: #000; } + + .clickable_area { + cursor: pointer; + } /* generic (end) */ div#docslinks { @@ -235,60 +222,46 @@ div#docslinks { margin: 0; } -.bz_obsolete { text-decoration: line-through; } -.bz_inactive { text-decoration: line-through; } +.bz_obsolete { + text-decoration: line-through; +} +.bz_inactive { + text-decoration: line-through; +} .bz_closed, .bz_CLOSED td { text-decoration: line-through; } -.bz_private { color: darkred ; background : #f3eeee ; } -.bz_disabled { color: #a0a0a0 ; } - -.bz_row_odd -{ - background-color: #F7F7F7; - color: #000000; +.bz_private { + color: darkred; + background: #f3eeee; +} +.bz_disabled { + color: #a0a0a0; } -.bz_row_even -{ - background-color: #FFFFFF; - color: #000000; +.bz_comment { + margin-bottom: 2em; } -.bz_comment { background-color: #e0e0e0; } -.bz_comment_hilite pre -{ +.bz_comment_head { + background-color: #e0e0e0; +} +.bz_comment_hilite pre { background-color: lightgreen; margin: 0; padding: 1em 0; } -td.tab -{ - background: #eee; - text-align: center; - border-style: solid; - border-color: black; - border-width: 0px 0px 2px 0px; -} - -td.tab.selected -{ - background: white; - border-width: 2px 2px 0px 2px; -} - -td.tab.spacer -{ - background: white; -} - span.quote { color: #65379c; } -table#flags th, table#flags td { vertical-align: baseline; text-align: left; } +table#flags th, +table#flags td { + vertical-align: baseline; + text-align: left; +} .throw_error { background-color: #ff0000; diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index bb33bd6e8..bdab65e42 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -39,7 +39,7 @@ [% filtered_login = user.login FILTER html %] [% PROCESS global/header.html.tmpl title = "User Preferences" - h2 = filtered_login + subheader = filtered_login style_urls = ['skins/standard/admin.css'] %] @@ -61,7 +61,10 @@ [% END %] [% END %] -[% PROCESS global/tabs.html.tmpl %] +[% WRAPPER global/tabs.html.tmpl + tabs = tabs + current_tab = current_tab +%] [% IF changes_saved %]

@@ -104,4 +107,6 @@ [% END %] +[% END %] + [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index 9b4a19bf0..9e999839b 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -26,11 +26,11 @@ #%] [% title = BLOCK %]Add component to Product '[% product.name FILTER html %]'[% END %] -[% h2 = BLOCK %]This page allows you to add a new component to product +[% subheader = BLOCK %]This page allows you to add a new component to product '[% product.name FILTER html %]'.[% END %] [% PROCESS global/header.html.tmpl title = title - h2 = h2 + subheader = subheader %]

diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl index 2e87af053..635b63d4e 100644 --- a/template/en/default/admin/fieldvalues/create.html.tmpl +++ b/template/en/default/admin/fieldvalues/create.html.tmpl @@ -19,11 +19,11 @@ #%] [% title = BLOCK %]Add Value for the '[% field FILTER html %]' field[% END %] -[% h2 = BLOCK %]This page allows you to add a new value for the +[% subheader = BLOCK %]This page allows you to add a new value for the '[% field FILTER html %]' field.[% END %] [% PROCESS global/header.html.tmpl title = title - h2 = h2 + subheader = subheader %] diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl index d6422f769..fb255304c 100644 --- a/template/en/default/admin/groups/create.html.tmpl +++ b/template/en/default/admin/groups/create.html.tmpl @@ -28,7 +28,7 @@ [% PROCESS global/header.html.tmpl title = "Add group" - h2 = "This page allows you to define a new user group." + subheader = "This page allows you to define a new user group." %] diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index ef2c7486b..554ead771 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -34,7 +34,7 @@ [% PROCESS global/header.html.tmpl title = "Edit Groups" - h2 = "This lets you edit the groups available to put users in." + subheader = "This lets you edit the groups available to put users in." %] [% edit_contentlink = "editgroups.cgi?action=changeform&group=%%id%%" %] diff --git a/template/en/default/admin/keywords/create.html.tmpl b/template/en/default/admin/keywords/create.html.tmpl index 45d97819e..944014548 100755 --- a/template/en/default/admin/keywords/create.html.tmpl +++ b/template/en/default/admin/keywords/create.html.tmpl @@ -26,7 +26,7 @@ [% PROCESS global/header.html.tmpl title = "Add keyword" - h2 = "This page allows you to add a new keyword." + subheader = "This page allows you to add a new keyword." %] diff --git a/template/en/default/admin/milestones/create.html.tmpl b/template/en/default/admin/milestones/create.html.tmpl index edace52bf..a68a57bb4 100644 --- a/template/en/default/admin/milestones/create.html.tmpl +++ b/template/en/default/admin/milestones/create.html.tmpl @@ -25,11 +25,11 @@ #%] [% title = BLOCK %]Add Milestone to Product '[% product.name FILTER html %]'[% END %] -[% h2 = BLOCK %]This page allows you to add a new milestone to product +[% subheader = BLOCK %]This page allows you to add a new milestone to product '[% product.name FILTER html %]'.[% END %] [% PROCESS global/header.html.tmpl title = title - h2 = h2 + subheader = subheader onload = "document.forms['f'].milestone.focus()" %] diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl index afa15d73c..1a1ecab3f 100644 --- a/template/en/default/admin/products/edit-common.html.tmpl +++ b/template/en/default/admin/products/edit-common.html.tmpl @@ -102,12 +102,14 @@ - Number of votes [% terms.abug %] in this product needs to + Confirmation threshold: + + + Enter the number of votes [% terms.abug %] in this product needs to automatically get out of the [% status_descs.UNCONFIRMED FILTER html %] - state: - - + state.
+ diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl index 8881fc3dc..08a370c6a 100644 --- a/template/en/default/admin/settings/edit.html.tmpl +++ b/template/en/default/admin/settings/edit.html.tmpl @@ -55,7 +55,7 @@ page, and the Default Value will automatically apply to everyone. Preference Text Default Value Enabled - + [% FOREACH name = setting_names %] [% checkbox_name = name _ '-enabled' %] diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index b35390545..4b7b607e9 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -48,8 +48,9 @@ [% ELSE %] enter the login of [% END %] - the user to impersonate: + : [% INCLUDE global/userselect.html.tmpl + id => "target_login" name => "target_login" value => "$target_login_default" accesskey => "u" @@ -65,9 +66,10 @@ [% END %]

- Next, please take a moment to explain why you are doing this:
- + Next, please take a moment to explain

@@ -78,10 +80,12 @@ [% IF user.authorizer.can_login %]

- Finally, enter your [% terms.Bugzilla %] password: + Finally, enter : - +
This is done for two reasons. First of all, it is done to reduce the chances of someone doing large amounts of damage using your diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl index c421ab12b..5e17cd66e 100644 --- a/template/en/default/admin/versions/create.html.tmpl +++ b/template/en/default/admin/versions/create.html.tmpl @@ -25,11 +25,11 @@ #%] [% title = BLOCK %]Add Version to Product '[% product.name FILTER html %]'[% END %] -[% h2 = BLOCK %]This page allows you to add a new version to product +[% subheader = BLOCK %]This page allows you to add a new version to product '[% product.name FILTER html %]'.[% END %] [% PROCESS global/header.html.tmpl title = title - h2 = h2 + subheader = subheader %] diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 3547f6d2e..fa2692d85 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -26,14 +26,14 @@ [%# Define strings that will serve as the title and header of this page %] [% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %] -[% h1 = BLOCK %]Create New Attachment for +[% header = BLOCK %]Create New Attachment for [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %] -[% h2 = BLOCK %][% bugsummary FILTER html %][% END %] +[% subheader = BLOCK %][% bugsummary FILTER html %][% END %] [% PROCESS global/header.html.tmpl title = title - h1 = h1 - h2 = h2 + header = header + subheader = subheader onload="setContentTypeDisabledState(document.entryform);" style_urls = [ 'skins/standard/create_attachment.css' ] javascript_urls = [ "js/attachment.js" ] diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl index 3f2eed68d..97a6d0527 100644 --- a/template/en/default/attachment/diff-header.html.tmpl +++ b/template/en/default/attachment/diff-header.html.tmpl @@ -207,7 +207,7 @@ tbody.file pre:empty { [% BLOCK diffurl %][% PROCESS viewurl %]&action=diff[% END %] [% IF headers %] - [% h1 = BLOCK %] + [% header = BLOCK %] [% IF attachid %] Attachment #[% attachid %]: [% description FILTER html %] [% ELSE %] @@ -218,7 +218,7 @@ tbody.file pre:empty { [% END %] for [% terms.bug %] #[% bugid %] [% END %] - [% h2 = BLOCK %] + [% subheader = BLOCK %] [% bugsummary FILTER html %] [% END %] [% PROCESS global/header.html.tmpl %] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index b7d03a8b9..fbd6fcfe4 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -26,16 +26,16 @@ [% title = BLOCK %] Attachment [% attachment.id %] Details for [% terms.Bug %] [%+ attachment.bug_id %] [% END %] -[% h1 = BLOCK %] +[% header = BLOCK %] Attachment [% attachment.id %] Details for [%+ "$terms.Bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %] [% END %] -[% h2 = BLOCK %][% bugsummary FILTER html %][% END %] +[% subheader = BLOCK %][% bugsummary FILTER html %][% END %] [% PROCESS global/header.html.tmpl title = title - h1 = h1 - h2 = h2 + header = header + subheader = subheader style = " table.attachment_info th { text-align: right; vertical-align: top; } table.attachment_info td { text-align: left; vertical-align: top; } @@ -211,8 +211,9 @@ - Description:
+ :
[% INCLUDE global/textarea.html.tmpl + id = 'description' name = 'description' minrows = 3 cols = 25 @@ -226,8 +227,8 @@
[% ELSE %] - Filename:
- :
+
Size: [% IF attachment.datasize %] @@ -236,8 +237,9 @@ deleted [% END %]
- MIME Type:
- :
+
-
+ [% IF (Param("insidergroup") && user.in_group(Param("insidergroup"))) %] - private

- [% ELSE %]
+ +
[% END %] +
[% IF flag_types.size > 0 %] [% PROCESS "flag/list.html.tmpl" bug_id = attachment.bug_id @@ -259,8 +262,10 @@ [% END %]

- Comment (on the [% terms.bug %]):
+ (on the + [%+ terms.bug %]):
[% INCLUDE global/textarea.html.tmpl + id = 'comment' name = 'comment' minrows = 5 cols = 25 diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index ad0dfbafd..4f4520053 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -21,12 +21,12 @@ [% PROCESS global/variables.none.tmpl %] [% filtered_summary = bugsummary FILTER html %] -[% h1 = BLOCK %]View All Attachments for +[% header = BLOCK %]View All Attachments for [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %] [% PROCESS global/header.html.tmpl title = "View All Attachments for $terms.Bug #$bugid" - h1 = h1 - h2 = filtered_summary + header = header + subheader = filtered_summary style = " table.attachment_info th { text-align: right; vertical-align: top; } table.attachment_info td { text-align: left; vertical-align: top; } diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl index 91743247a..2acaf3af8 100644 --- a/template/en/default/bug/activity/show.html.tmpl +++ b/template/en/default/bug/activity/show.html.tmpl @@ -30,8 +30,8 @@ [% PROCESS global/header.html.tmpl title = "Changes made to $terms.bug $bug_id" - h1 = "Activity log" - h2 = "$terms.Bug $bug_id" + header = "Activity log" + subheader = "$terms.Bug $bug_id" %]
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl index a4671d89d..5add6d54f 100644 --- a/template/en/default/bug/comments.html.tmpl +++ b/template/en/default/bug/comments.html.tmpl @@ -26,11 +26,15 @@ [% END %] - + Opened: [% bug.creation_ts FILTER time %] [% ELSE %] -
- - ------- Comment + + ------- Comment #[% count %] From @@ -118,7 +121,7 @@ [% END %] - ------- + ------- [% END %] diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl index bf1e743c0..6a7ea6a3b 100644 --- a/template/en/default/bug/create/make-template.html.tmpl +++ b/template/en/default/bug/create/make-template.html.tmpl @@ -29,7 +29,7 @@ [% PROCESS global/header.html.tmpl title = "Bookmarks are your friend" - h1 = "Template constructed" + header = "Template constructed" %]

diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl index 48ca456c9..5c1eb8471 100644 --- a/template/en/default/bug/dependency-graph.html.tmpl +++ b/template/en/default/bug/dependency-graph.html.tmpl @@ -35,14 +35,14 @@ [% PROCESS global/variables.none.tmpl %] [% title = "Dependency Graph" - h1 = title + header = title %] [% IF NOT multiple_bugs AND NOT doall %] [% filtered_desc = short_desc FILTER html %] [% title = "$title for $terms.bug $bug_id" - h1 = "$h1 for $terms.bug $bug_id" - h2 = filtered_desc + header = "$header for $terms.bug $bug_id" + subheader = filtered_desc %] [% END %] diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index b9f2cde39..e01352a57 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -26,12 +26,12 @@ [% filtered_desc = blocked_tree.$bugid.short_desc FILTER html %] [% PROCESS global/header.html.tmpl - title = "Dependency tree for $terms.Bug $bugid" - h1 = "Dependency tree for - $terms.Bug $bugid" + title = "Dependency tree for $terms.Bug $bugid" + header = "Dependency tree for + $terms.Bug $bugid" javascript_urls = ["js/expanding-tree.js"] - style_urls = ["skins/standard/dependency-tree.css"] - h2 = filtered_desc + style_urls = ["skins/standard/dependency-tree.css"] + subheader = filtered_desc %] [% PROCESS depthControlToolbar %] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 12fcb05c8..c829a71f4 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -665,10 +665,12 @@

+
[% PROCESS bug/comments.html.tmpl comments = bug.longdescs mode = "edit" %] +
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index 02b5bed8a..8aa118adc 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -24,7 +24,9 @@ [%# *** Knob *** %] -
+
+
+
[% knum = 1 %] [% initial_action_shown = 0 %] @@ -155,7 +157,9 @@ [% END %] [% END %] [% END %] +
+

@@ -179,6 +183,8 @@ value="[% Param("move-button-text") %]"> [% END %]

+
+
[%# Common actions %] diff --git a/template/en/default/bug/show.html.tmpl b/template/en/default/bug/show.html.tmpl index 07b71c8fa..8e877c8f2 100644 --- a/template/en/default/bug/show.html.tmpl +++ b/template/en/default/bug/show.html.tmpl @@ -31,10 +31,10 @@ [% filtered_desc = bug.short_desc FILTER html %] [% filtered_timestamp = bug.delta_ts FILTER time %] [% PROCESS global/header.html.tmpl - title = "$terms.Bug $bug.bug_id - $filtered_desc" - h1 = "$terms.Bug $bug.bug_id" - h2 = filtered_desc - h3 = "Last modified: $filtered_timestamp" + title = "$terms.Bug $bug.bug_id – $filtered_desc" + header = "$terms.Bug $bug.bug_id" + subheader = filtered_desc + header_addl_info = "Last modified: $filtered_timestamp" bodyclasses = ['bz_bug', "bz_status_$bug.bug_status", "bz_component_$bug.component", diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 8090aa319..535b486e7 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -21,17 +21,17 @@ [% title = "Time Summary " %] [% IF do_depends %] [% title = title _ "for " %] - [% h1 = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %] + [% header = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %] [% title = title _ "$terms.Bug $ids.0: " %] - [% h1 = (h1 _ " (and $terms.bugs blocking it)") IF do_depends %] + [% header = (header _ " (and $terms.bugs blocking it)") IF do_depends %] [% ELSE %] [% title = title _ "($ids.size $terms.bugs selected)" %] - [% h1 = title %] + [% header = title %] [% END %] [% PROCESS global/header.html.tmpl title = title - h1 = h1 + header = header style_urls = ["skins/standard/summarize-time.css"] %] diff --git a/template/en/default/bug/votes/list-for-bug.html.tmpl b/template/en/default/bug/votes/list-for-bug.html.tmpl index 4b4514a90..d23205f1e 100644 --- a/template/en/default/bug/votes/list-for-bug.html.tmpl +++ b/template/en/default/bug/votes/list-for-bug.html.tmpl @@ -30,7 +30,7 @@ [% PROCESS global/header.html.tmpl title = "Show Votes" - h2 = "$terms.Bug $bug_id" + subheader = "$terms.Bug $bug_id" %] [% total = 0 %] diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl index 82d8cb658..6a0e90ebb 100644 --- a/template/en/default/bug/votes/list-for-user.html.tmpl +++ b/template/en/default/bug/votes/list-for-user.html.tmpl @@ -39,7 +39,7 @@ [% PROCESS global/variables.none.tmpl %] [% IF !header_done %] - [% h2 = voting_user.login FILTER html %] + [% subheader = voting_user.login FILTER html %] [% IF canedit %] [% title = "Change Votes" %] [% IF bug_id %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 0c37234ff..a2d4b4d2b 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -85,6 +85,10 @@ 'status.name', ], +'search/tabs.html.tmpl' => [ + 'content', +], + 'request/queue.html.tmpl' => [ 'column_headers.$group_field', 'column_headers.$column', @@ -233,9 +237,9 @@ 'style', 'onload', 'title', - 'h1', - 'h2', - 'h3', + '" – $header" IF header', + 'subheader', + 'header_addl_info', 'message', ], @@ -249,6 +253,10 @@ 'size', ], +'global/tabs.html.tmpl' => [ + 'content', +], + 'global/common-links.html.tmpl' => [ 'email', ], 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 | +
    +
  • Home
    • +
  • | New
    • +
  • | Search
    • -
    + | + -
    | + [%-# Work around FF bug: keep this on one line %] - Reports +
  • | Reports
    • - [% IF user.id %] - [% email = user.login FILTER url_quote %] - | My Requests - [% ELSE %] - | Requests - [% END %] +
  • + | + [% IF user.id %] + [% email = user.login FILTER url_quote %] + My Requests + [% ELSE %] + Requests + [% END %] + [%-# Work around FF bug: keep this on one line %]
    • [% IF user.id && Param('usevotes') %] - | My Votes +
  • | 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 %] + [% '
  • | 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 %] + [%-# Work around FF bug: keep this on one line %]
    • [% ELSE %] [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] - | New Account +
  • | New Account
    • [% END %] [% IF user.authorizer.can_login %] - | Log In +
  • | Log In
    • [% END %] [% END %] -
+ 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 %] - + diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 61f724b41..9c3a88b2f 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -31,8 +31,8 @@ [% PROCESS global/header.html.tmpl title = "$terms.Bugzilla Main Page" - h1 = "Main Page" - h3 = "version $constants.BUGZILLA_VERSION" + header = "Main Page" + header_addl_info = "version $constants.BUGZILLA_VERSION" style_urls = [ 'skins/standard/index.css' ] onload = 'document.forms[\'f\'].quicksearch.focus();' %] diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl index a752dce5f..32529f4cc 100644 --- a/template/en/default/list/quips.html.tmpl +++ b/template/en/default/list/quips.html.tmpl @@ -31,7 +31,7 @@ [% PROCESS global/header.html.tmpl title = "$terms.Bugzilla Quip System" - h1 = "Add your own clever headline" + header = "Add your own clever headline" %] [% IF added_quip %] diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index b025cd14a..6f88cd909 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -160,14 +160,16 @@ [% tableheader %] [% END %] - + " + onClick="document.location='show_bug.cgi?id=[% bug.bug_id %]'"> [% IF dotweak %] @@ -176,7 +178,8 @@ [% END %] - [% bug.bug_id %] + [% bug.bug_id %] [%+ '[SEC]' IF bug.secure_mode %] diff --git a/template/en/default/reports/chart.html.tmpl b/template/en/default/reports/chart.html.tmpl index 8547c3592..821b6b0b6 100644 --- a/template/en/default/reports/chart.html.tmpl +++ b/template/en/default/reports/chart.html.tmpl @@ -28,7 +28,7 @@ [% PROCESS global/header.html.tmpl title = "Chart" - h3 = time2str("%Y-%m-%d %H:%M:%S", time) + header_addl_info = time2str("%Y-%m-%d %H:%M:%S", time) %]
diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl index 4d3526e3c..690e24305 100644 --- a/template/en/default/reports/edit-series.html.tmpl +++ b/template/en/default/reports/edit-series.html.tmpl @@ -20,7 +20,7 @@ #%] [% title = "Edit Series" %] -[% h2 = BLOCK %] +[% subheader = BLOCK %] [% default.category FILTER html %] / [%+ default.subcategory FILTER html %] / [%+ default.name FILTER html %] diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index cf4dda827..5e7d74dac 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -74,7 +74,7 @@ .t4 { background-color: #c3d3ed } /* darker blue */ .ttotal { background-color: #cfffdf } /* light green */ " - h3 = time2str("%Y-%m-%d %H:%M:%S", time) + header_addl_info = time2str("%Y-%m-%d %H:%M:%S", time) %] [% IF debug %] diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index e746df09b..c9cac7643 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -37,7 +37,7 @@ var queryform = "queryform" [% PROCESS global/header.html.tmpl title = "Search for $terms.bugs" - h1 = "" + header = "" onload = "doOnSelectProduct(0); initHelp();" javascript = js_data javascript_urls = [ "js/productform.js" ] @@ -46,7 +46,7 @@ var queryform = "queryform" }" %] -[% PROCESS search/tabs.html.tmpl %] +[% WRAPPER search/tabs.html.tmpl %] [% button_name = "Search" %] @@ -84,4 +84,6 @@ var queryform = "queryform" [% PROCESS "search/search-help.html.tmpl" IF cgi.param("help") %] +[% END %] + [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index 8288b76e3..e09caca7f 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -23,10 +23,10 @@ [% PROCESS global/header.html.tmpl title = "Find a Specific " _ terms.Bug - h1 = "" + header = '' %] -[% PROCESS search/tabs.html.tmpl %] +[% WRAPPER search/tabs.html.tmpl %]

Find a specific [% terms.bug %] by entering words that describe it. @@ -116,5 +116,7 @@ for "crash secure SSL flash". +[% END %] + [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl index 00358cb59..2fe05fa84 100644 --- a/template/en/default/search/tabs.html.tmpl +++ b/template/en/default/search/tabs.html.tmpl @@ -24,10 +24,14 @@ # This template has no interface. #%] -[% PROCESS global/tabs.html.tmpl +[% WRAPPER global/tabs.html.tmpl tabs = [ { name => 'specific', label => "Find a Specific $terms.Bug", link => "query.cgi?format=specific" }, { name => 'advanced', label => "Advanced Search", link => "query.cgi?format=advanced" } ] current_tab_name = query_format || format || "advanced" %] + +[% content %] + +[% END %] -- cgit v1.2.3-24-g4f1b