From 2b574f4d63e4ada0db82ca5a56773b3acf771d78 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 7 Jan 2014 11:42:19 +0100 Subject: Bug 840407: Remove the "align" and "valign" attributes r/a=justdave --- skins/contrib/Dusk/global.css | 6 - skins/standard/admin.css | 21 +-- skins/standard/attachment.css | 9 +- skins/standard/buglist.css | 17 +- skins/standard/global.css | 32 ++++ skins/standard/params.css | 10 +- skins/standard/reports.css | 11 +- skins/standard/search_form.css | 31 ++++ skins/standard/summarize-time.css | 16 +- template/en/default/account/create.html.tmpl | 26 +-- template/en/default/account/prefs/email.html.tmpl | 159 +++++++--------- .../en/default/account/prefs/permissions.html.tmpl | 48 ++--- .../default/account/prefs/saved-searches.html.tmpl | 5 +- .../en/default/account/prefs/settings.html.tmpl | 2 +- .../en/default/admin/components/list.html.tmpl | 2 +- .../admin/components/select-product.html.tmpl | 2 +- .../admin/flag-type/confirm-delete.html.tmpl | 29 ++- template/en/default/admin/keywords/list.html.tmpl | 2 +- .../en/default/admin/milestones/list.html.tmpl | 2 +- .../admin/milestones/select-product.html.tmpl | 2 +- .../en/default/admin/params/editparams.html.tmpl | 24 ++- template/en/default/admin/params/index.html.tmpl | 42 ++--- .../admin/products/list-classifications.html.tmpl | 2 +- template/en/default/admin/products/list.html.tmpl | 2 +- template/en/default/admin/table.html.tmpl | 8 +- template/en/default/admin/versions/list.html.tmpl | 2 +- .../admin/versions/select-product.html.tmpl | 2 +- .../en/default/admin/workflow/comment.html.tmpl | 15 +- template/en/default/admin/workflow/edit.html.tmpl | 14 +- .../en/default/attachment/show-multiple.html.tmpl | 9 +- template/en/default/bug/summarize-time.html.tmpl | 200 ++++++++++----------- .../default/global/choose-classification.html.tmpl | 10 +- .../en/default/global/choose-product.html.tmpl | 8 +- template/en/default/list/edit-multiple.html.tmpl | 8 +- template/en/default/list/list.html.tmpl | 85 ++++----- template/en/default/reports/chart.html.tmpl | 2 +- template/en/default/reports/create-chart.html.tmpl | 10 +- template/en/default/reports/duplicates.html.tmpl | 23 +-- template/en/default/reports/report-table.html.tmpl | 10 +- template/en/default/reports/report.html.tmpl | 72 ++++---- .../default/search/search-report-graph.html.tmpl | 122 ++++++------- .../default/search/search-report-table.html.tmpl | 48 +++-- template/en/default/whine/mail.html.tmpl | 10 +- 43 files changed, 567 insertions(+), 593 deletions(-) diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css index f051a3b58..4f6e00341 100644 --- a/skins/contrib/Dusk/global.css +++ b/skins/contrib/Dusk/global.css @@ -66,12 +66,6 @@ hr { /* edit */ -#bugzilla-body th { - font-weight: bold; - vertical-align: top; - white-space: nowrap; -} - #bug-form td { padding-top: 2px; } diff --git a/skins/standard/admin.css b/skins/standard/admin.css index b5f36b654..9367e2a4f 100644 --- a/skins/standard/admin.css +++ b/skins/standard/admin.css @@ -43,10 +43,6 @@ p.areyoureallyreallysure { border: 1px solid black; } -#admin_table th, #flag_types_bugs th, #flag_types_attachments th { - white-space: normal !important; -} - #admin_table th, #admin_table td, #flag_types_bugs th , #flag_types_bugs td, #flag_types_attachments th, #flag_types_attachments td { @@ -88,12 +84,9 @@ td.admin_links dt.forbidden a, td.admin_links dd.forbidden a { cursor: default; } -.col-header { +.open-status, .closed-status { width: 8em; -} - -.checkbox-cell { - border: 1px black solid; + padding: 0.3em; } /* Grey-green color */ @@ -175,7 +168,6 @@ table.whining_list th, table.whining_list td, table.whining_list th { text-align: right; font-weight: normal !important; - white-space: normal !important; } table.whining_list th.subtitle { @@ -212,3 +204,12 @@ table.schedule_list th, table.search_list th { #mass-remove legend { white-space: nowrap; } + +#workflow { + border-collapse: collapse; +} + +#workflow td { + border: 1px dotted black; + text-align: center; +} diff --git a/skins/standard/attachment.css b/skins/standard/attachment.css index c765aa5a9..b08cb6136 100644 --- a/skins/standard/attachment.css +++ b/skins/standard/attachment.css @@ -207,8 +207,13 @@ div#update_container { margin-left: 2%; } -.viewall_desc { +.viewall_frame_container { width: 75%; + margin: 2em auto; +} + +.viewall_desc { + width: 100%; border: 1px solid black; border-spacing: 0px; border-collapse: collapse; @@ -220,7 +225,7 @@ div#update_container { } .viewall_frame { - width: 75%; + width: 100%; height: 350px; } diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css index 75dafb9cf..963d82965 100644 --- a/skins/standard/buglist.css +++ b/skins/standard/buglist.css @@ -5,7 +5,8 @@ * This Source Code Form is "Incompatible With Secondary Licenses", as * defined by the Mozilla Public License, v. 2.0. */ -.bz_query_head { + +#groups_edit_multiple th, .bz_query_head { text-align: center; } @@ -121,6 +122,15 @@ td.bz_total { color: inherit; } +.buglist_menu { + margin-top: 1em; +} + +.buglist_menu div { + display: inline-block; + vertical-align: middle; +} + #groups_edit_multiple, #quips { border: 1px solid black; border-collapse: collapse; @@ -132,11 +142,6 @@ td.bz_total { padding: 0.3em; } -#groups_edit_multiple th, #quips th { - text-align: center; - white-space: normal !important; -} - #groups_edit_multiple th.narrow_column { width: 8em; } diff --git a/skins/standard/global.css b/skins/standard/global.css index cf4fe57bf..05a111428 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -25,6 +25,11 @@ clear: both; } + #bugzilla-body th { + font-weight: bold; + vertical-align: top; + } + /* global (end) */ /* header (begin) */ @@ -402,6 +407,10 @@ table#flags td { padding: 0.3em; } +#email_prefs th.role_header { + width: 10%; +} + #bug_activity td { vertical-align: top; } @@ -410,6 +419,25 @@ table#flags td { padding: 0.5em; } +#permissions { + margin-left: auto; + margin-right: auto; + width: 40em; +} + +#permissions p { + margin-top: 2em; + margin-bottom: 0.5em; +} + +#permissions li { + list-style-type: none; +} + +#permissions table td { + vertical-align: top; +} + .column_header { background-color: #66f; } @@ -684,6 +712,10 @@ form th { text-align: right; } +.middle { + vertical-align: middle; +} + .inline { display: inline; } diff --git a/skins/standard/params.css b/skins/standard/params.css index 428ace5ad..491a8a47a 100644 --- a/skins/standard/params.css +++ b/skins/standard/params.css @@ -33,13 +33,17 @@ padding: 0.2em 0.5em; } +#params_index { + padding-left: 1em; +} + div.table { - display: inline-table; + display: inline-table; } div.cell { - display: table-cell; - vertical-align: top; + display: table-cell; + vertical-align: top; } td.selected_section { diff --git a/skins/standard/reports.css b/skins/standard/reports.css index 7679e32fc..904b8ed26 100644 --- a/skins/standard/reports.css +++ b/skins/standard/reports.css @@ -66,13 +66,20 @@ background-color: #cfffdf; /* light green */ } -#tabular_report { +.tabular_report_container { + /* Force tables to be horizontally centered */ + margin-left: auto; + margin-right: auto; + text-align: center; +} + +.tabular_report { border: 1px dotted black; border-collapse: collapse; text-align: center; } -#tabular_report th, #tabular_report td { +.tabular_report th, .tabular_report td { border: 1px dotted; padding: 0.2em; } diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css index 0381730af..c4570bc31 100644 --- a/skins/standard/search_form.css +++ b/skins/standard/search_form.css @@ -192,3 +192,34 @@ div.bz_section_title span { .bz_simple_search_form th { text-align: right; } + +#tabular_reports_menu, #graphical_reports_menu { + width: 30em; + margin: 2em auto; +} + +#tabular_reports_menu th, #graphical_reports_menu th { + vertical-align: middle; + white-space: nowrap; + padding: 0.3em; +} + +#tabular_reports_menu th { + text-align: center; +} + +#graphical_reports_menu th { + text-align: left; +} + +#graphical_reports_menu label { + font-weight: normal; +} + +th#reports_menu_multiple_tables { + text-align: center; + width: 15em; + height: 15em; + border: 1px solid black; + border-collapse: collapse; +} diff --git a/skins/standard/summarize-time.css b/skins/standard/summarize-time.css index 37b135b45..84a27c736 100644 --- a/skins/standard/summarize-time.css +++ b/skins/standard/summarize-time.css @@ -6,8 +6,6 @@ * defined by the Mozilla Public License, v. 2.0. */ -td { vertical-align: top } - table.zeroitems, table.realitems { margin-left: 2.0em; margin-top: 2px; @@ -22,6 +20,9 @@ tr.section_total { td.subtotal { background: #B0C0D9; + text-align: right; + font-weight: bold; + width: 8em; } .zeroitems .bug_header { background: #d0e0f0 } @@ -51,3 +52,14 @@ table.owner, table.number, table.zeroitems { margin: 1em; padding: 0.5em; } + +th.bug_id, th.bug_status { + white-space: nowrap; + text-align: left; + padding-right: 2em; + width: 6em; +} + +.time_info { + padding-right: 3em; +} diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl index 2fbf845d5..21b19b0ee 100644 --- a/template/en/default/account/create.html.tmpl +++ b/template/en/default/account/create.html.tmpl @@ -68,24 +68,14 @@ [% END %]
- - - - - -
- - [% IF Param('emailsuffix') %] - Login: - [% ELSE %] - Email address: - [% END %] - - - - [% Param('emailsuffix') FILTER html %] -
-
+ + [% IF Param('emailsuffix') %] + Login: + [% ELSE %] + Email address: + [% END %] + + [% Param('emailsuffix') FILTER html %]
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index a085058c7..1eeb4c721 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -60,61 +60,36 @@ function SetCheckboxes(setting) { } } } - -document.write('\n'); -document.write('\n'); // --> + + +
- - - - +

Global options

+ +[% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] + + +
+[% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] + + - - - - - - - - [% IF user.is_global_watcher %] - - - - +

+ You are watching all [% terms.bugs %]. To be removed from this role, contact + [% Param("maintainer") %]. +

[% END %] -
- Global options: -
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %] - - -
-
- [% prefname = "email-$constants.REL_ANY-$constants.EVT_REQUESTED_FLAG" %] - - -
-
- You are watching all [% terms.bugs %]. To be removed from this role, - contact - [% Param("maintainer") %]. -
-Field/recipient specific options: -
-
+ +

Field/recipient specific options

[% events = [ { id = constants.EVT_ADDED_REMOVED, @@ -173,39 +148,33 @@ document.write(' - - - When my relationship to this [% terms.bug %] is: - - - I want to receive mail when: - + + + When my relationship to this [% terms.bug %] is: + + I want to receive mail when: [% FOREACH relationship = relationships %] - - [% relationship.description FILTER html %] - + [% relationship.description FILTER html %] [% END %] - + [% FOREACH event = events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - - + + [% END %] @@ -213,38 +182,30 @@ document.write(' -   - - - but not when (overrides above): - + + +   + but not when (overrides above): [% FOREACH event = neg_events %] [% count = loop.count() %] [% FOREACH relationship = relationships %] - - + + [% END %] - - [% event.description FILTER html %] - + [% event.description FILTER html %] [% END %] -
-User Watching + +

User Watching

If you watch a user, it is as if you are standing in their shoes for the @@ -253,22 +214,22 @@ preferences for their relationship to the [% terms.bug %] (e.g. Assignee).

-

[% IF watchedusers.size %] -You are watching everyone in the following list: -

+

You are watching everyone in the following list:


+ +
+

[% ELSE %] -You are currently not watching any users. +

You are currently not watching any users.

[% END %] -

+

Add users to my watch list (comma separated list): [% INCLUDE global/userselect.html.tmpl @@ -278,7 +239,7 @@ You are currently not watching any users. size => 60 multiple => 5 %] -

+

Users watching you:
[% IF watchers.size %] @@ -290,7 +251,9 @@ You are currently not watching any users. [% END %]

-Ignore [% terms.Bugs %] +
+ +

Ignore [% terms.Bugs %]

You can specify a list of [% terms.bugs %] from which you never want to get @@ -324,6 +287,8 @@ You are currently not watching any users.

[% END %] -

Add [% terms.bugs %]:
+

+ Add [% terms.bugs %]:

+ name="add_ignored_bugs" size="60"> +

diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl index 450765afc..53583f35b 100644 --- a/template/en/default/account/prefs/permissions.html.tmpl +++ b/template/en/default/account/prefs/permissions.html.tmpl @@ -17,12 +17,11 @@ # other people. #%] - - -
+
[% IF has_bits.size %] - You have the following permission bits set on your account: - +

You have the following permission bits set on your account:

+ +
[% FOREACH bit_description = has_bits %] @@ -34,46 +33,47 @@ [% FOREACH privs = ["editcomponents", "canconfirm", "editbugs"] %] [% SET products = ${"local_$privs"} %] [% IF products && products.size %] -

You also have local '[% privs FILTER html %]' privileges for the following products:

-

+

    [% FOREACH product = products %] - [% product.name FILTER html %]
    +
  • [% product.name FILTER html %]
    • [% END %] -

    +
[% END %] [% END %] [% ELSE %] - There are no permission bits set on your account. +

There are no permission bits set on your account.

[% END %] [% IF user.in_group('editusers') %] -
- You have editusers privileges. You can turn on and off - all permissions for all users. +

+ You have editusers privileges. You can turn on and off all + permissions for all users. +

[% ELSIF set_bits.size %] -
- And you can turn on or off the following bits for - other users: -
[% bit_description.name FILTER html %]
+

+ And you can turn on or off the following bits for + other users: +

+ +
[% FOREACH bit_description = set_bits %] [% END %] -
[% bit_description.name FILTER html %] [% bit_description.desc FILTER html_light %]
+
[% END %] [% IF user.in_group('bz_sudoers') %] -
- You are a member of the bz_sudoers group, so you can - impersonate someone else. +

+ You are a member of the bz_sudoers group, so you can + impersonate someone else. +

[% END %] - - - + diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 33df92255..76e553381 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -30,7 +30,6 @@

Your saved searches are as follows:

-
@@ -53,7 +52,7 @@ - @@ -120,12 +119,12 @@ [% END %]
Search +
+ [% IF user.can_bless %]

Note that for every search that has the "Add to footer" selected, a link to the shared search is added to the footer of every user that is a direct member of the group at the time you click Submit Changes.

[% END %] -
[% IF user.queries_available.size %]

You may use these searches saved and shared by others:

diff --git a/template/en/default/account/prefs/settings.html.tmpl b/template/en/default/account/prefs/settings.html.tmpl index d54441ddb..a7055c67f 100644 --- a/template/en/default/account/prefs/settings.html.tmpl +++ b/template/en/default/account/prefs/settings.html.tmpl @@ -34,7 +34,7 @@ [% default_name = name _ '-isdefault' %] [% default_val = settings.${name}.default_value %] - + [% setting_descs.$name OR name FILTER html %] diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index 949f56b1e..91808fbae 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -69,7 +69,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 3651ec570..a152415c3 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -35,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 70f5efb3d..74ceb2201 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -10,6 +10,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] doc_section = "flags-overview.html#flags-delete" %] @@ -26,24 +27,14 @@ in the database but will not appear in the [% terms.Bugzilla %] UI.

- - - - - - - - -
- Do you really want to delete this type? -
- Yes, delete - - - - No, don't delete - -
+

+ Do you really want to delete this type? +

+ +

+ Yes, delete - + No, don't delete +

[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index d3391d939..c3f4a5292 100644 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -33,7 +33,7 @@ { name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?keywords=%%name%%" }, { diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 20e4f6138..aa377d88e 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -53,7 +53,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index ccc7e193b..e2784127e 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -35,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 50a0a2ea5..00fb27ba4 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -68,19 +68,17 @@
- [% IF curpanel == -1 %] - [% PROCESS admin/params/index.html.tmpl panels = panels %] - [% ELSE %] - -
Note: - B[% %]ugzilla is developed entirely by volunteers. - The best way to give back to the B[% %]ugzilla project is to - contribute - yourself! - You don't have to be a programmer to contribute, there are lots of - things that we need. -
+
Note: + B[% %]ugzilla is developed entirely by volunteers. + The best way to give back to the B[% %]ugzilla project is to + contribute yourself! + You don't have to be a programmer to contribute, there are lots of + things that we need. +
+ [% IF curpanel == -1 %] + [% PROCESS admin/params/index.html.tmpl panels = panels %] + [% ELSE %]

This lets you edit the basic operating parameters of [% terms.Bugzilla %]. Be careful!
@@ -95,7 +93,7 @@ - [% END %] + [% END %]

diff --git a/template/en/default/admin/params/index.html.tmpl b/template/en/default/admin/params/index.html.tmpl index 65aa398eb..ee64eca9f 100644 --- a/template/en/default/admin/params/index.html.tmpl +++ b/template/en/default/admin/params/index.html.tmpl @@ -6,33 +6,23 @@ # defined by the Mozilla Public License, v. 2.0. #%] -

- All parameters are displayed below, per section. - If you cannot find one from here, then the parameter does not exist. -

+
+

+ All parameters are displayed below, per section. + If you cannot find one from here, then the parameter does not exist. +

-
- - - - - - [% FOREACH panel = panels %] + [% FOREACH panel = panels %] +

[% panel.title FILTER html %]

+ +
    [% FOREACH param = panel.param_list.sort('name') %] -
- - - +
  • + + [% param.name FILTER html %] +
    • [% END %] - - - - [% END %] -
    ParameterSection
    - - [% param.name FILTER html %] - - [% panel.title FILTER html %] -
      
    + + [% END %]
    diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index a13d2be0f..39f3ee1c1 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -32,7 +32,7 @@ }, { name => "product_count" - align => "right" + class => "right" heading => "Product Count" } ] diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index d09a552e2..58edaa7bd 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -58,7 +58,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bug Count" - align => 'right' + class => 'right' contentlink => 'buglist.cgi?product=%%name%%' }) %] diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index 3981ef4bb..993181c7f 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -25,8 +25,6 @@ # field_descs hash will be used instead of "content." # See fieldvalues/select-field for an example of use. # This content WILL be HTML-filtered in this case. - # align: left/center/right. Controls the horizontal alignment of the - # text in the column. # allow_html_content: if defined, then this column allows some html content # and so it will be only partially filtered. # yesno_field: Turn the data from 0/!0 into Yes/No @@ -89,7 +87,6 @@ [% contentlink = c.contentlink content = c.content content_use_field = c.content_use_field - align = c.align class = c.class allow_html_content = c.allow_html_content yesno_field = c.yesno_field @@ -121,8 +118,7 @@ [% END %] [% END %] - + [% IF contentlink %] [% FOREACH m = contentlink.match('%%(.+?)%%', 1) %] @@ -155,7 +151,7 @@ [% END %] [% IF data.size == 0 %] - <none> + <none> [% END %] diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index ee69ee03e..43a14f9ee 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -45,7 +45,7 @@ [% columns.push({ name => "bug_count" heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => bug_count_contentlink }) %] diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index e19aa18cc..119ec9a71 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -35,7 +35,7 @@ [% columns.push({ name => 'bug_count' heading => "$terms.Bugs" - align => "right" + class => "right" contentlink => "buglist.cgi?product=%%name%%" }) %] diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl index 94218c8fa..19762d154 100644 --- a/template/en/default/admin/workflow/comment.html.tmpl +++ b/template/en/default/admin/workflow/comment.html.tmpl @@ -15,9 +15,9 @@ @@ -28,7 +28,7 @@

    - +
    @@ -38,7 +38,7 @@ [% FOREACH status = statuses %] - [% END %] @@ -54,22 +54,21 @@ [% FOREACH new_status = statuses %] [% IF workflow.${status.id}.${new_status.id}.defined %] - [% ELSE %] - + [% END %] [% END %] [% END %]
      ToFrom   + [% display_value("bug_status", status.name) FILTER html %]   
    -

    +

    - diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl index 4ae613ef5..1904b487e 100644 --- a/template/en/default/admin/workflow/edit.html.tmpl +++ b/template/en/default/admin/workflow/edit.html.tmpl @@ -15,9 +15,9 @@ @@ -33,7 +33,7 @@

    - +
    @@ -43,7 +43,7 @@ [% FOREACH status = statuses %] - [% END %] @@ -61,7 +61,7 @@ [% IF status.id != new_status.id %] [% checked = workflow.${status.id}.${new_status.id}.defined ? 1 : 0 %] [% mandatory = (status.id && new_status.name == Param("duplicate_or_move_bug_status")) ? 1 : 0 %] - [% ELSE %] - + [% END %] [% END %] @@ -87,7 +87,7 @@ page and editing the duplicate_or_move_bug_status parameter.

    -

    +

    - diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 173133199..ae2fb8f3b 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -26,11 +26,9 @@ click here. [% END %] -
    [% FOREACH a = attachments %] - -

    +
      ToFrom   + [% display_value("bug_status", status.name) FILTER html %]   
    @@ -91,10 +89,7 @@ Download the attachment instead.

    [% END %] - - -

    - + [% END %] [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 9a32c0a71..f65ca088f 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -35,15 +35,13 @@ [% FOREACH workdata = part_list %] [%# parts contains date ranges (from, to). %] [% part = parts.shift %] -
    -

    - [% IF part.0 or part.1 %] - [% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %] - [% ELSE %] - Full summary (no period specified) - [% END %] -

    -
    +

    + [% IF part.0 or part.1 %] + [% part.0 OR "Up" FILTER html %] to [% part.1 OR "now" FILTER html %] + [% ELSE %] + Full summary (no period specified) + [% END %] +

    [% IF group_by == "number" %] [% INCLUDE number_report %] [% ELSE %] @@ -112,11 +110,10 @@ [% subtotal = subtotal + bugdata.total_time %] [% END %] - - - [% global.total = global.total + subtotal %] + + + [% global.total = global.total + subtotal %] [% END %] [%# @@ -156,51 +153,42 @@ - [% END %] [% END %] - - - + + [% global.total = global.total + subtotal %] [% END %] [% BLOCK bug_header %] - - + + [% IF extra %] - + [% END %] [% IF detailed %] [% IF extra %] @@ -236,8 +224,8 @@ [% IF global.total > 0 %] - - + + [% ELSE %] @@ -254,7 +242,7 @@ #%] [% BLOCK query_form %] -
    +
    @@ -268,68 +256,67 @@ [% END %]
    Attachment #[% a.id %]
    Total: - [% subtotal FILTER format("%.2f") %]Total:[% subtotal FILTER format("%.2f") %]
      [% login_name FILTER html %] + [% work_time FILTER format("%.2f") %]
      - Total: - - [% subtotal FILTER format("%.2f") %] - Total:[% subtotal FILTER format("%.2f") %]
    - [% "$terms.Bug $id" FILTER bug_link(id) FILTER none %] - [% display_value("bug_status", bugs.$id.bug_status) FILTER html %][% "$terms.Bug $id" FILTER bug_link(id) FILTER none %] + [% display_value("bug_status", bugs.$id.bug_status) FILTER html %] + [% bugs.$id.short_desc FILTER html %][% bugdata.total_time FILTER html %][% bugdata.total_time FILTER html %]
      - - - - - - -
    - Estimated: [% bugs.$id.estimated_time FILTER format("%.2f") %]h - - Remaining: [% bugs.$id.remaining_time FILTER format("%.2f") %]h - - Deadline: [% bugs.$id.deadline || "Not set" %] -
    + + Estimated: [% bugs.$id.estimated_time FILTER format("%.2f") %]h + + + Remaining: [% bugs.$id.remaining_time FILTER format("%.2f") %]h + + + Deadline: [% bugs.$id.deadline || "Not set" %] +     		 
    Totals[% additional FILTER html %][% global.total FILTER format("%.2f") %][% additional FILTER html %][% global.total FILTER format("%.2f") %]
    - - - - - - -
    - : - - - -
    -   - and : - - -
    -    		 - -
      - (Dates are optional, and in YYYY-MM-DD format) -
    - Group by: - - - - - : -
      - - - [%# XXX: allow splitting by other intervals %] -   - - -   - - -
    + + + : + + + + + + and : + + + +
    + (Dates are optional, and in YYYY-MM-DD format) + + + + + + Group by: + + + + + + + + : + + + + + +   + + + + [%# XXX: allow splitting by other intervals %] + + + + + + +
    -
    + //--> + +
    [% END %] diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index 0ecd68dc2..1a59f6d89 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -20,16 +20,16 @@ [% PROCESS global/header.html.tmpl %]

    First, you must pick a classification on which to enter [% terms.abug %]:

    - +
    - - + @@ -37,7 +37,7 @@ [% FOREACH class = classifications %] - [% IF class.description %] - + [% END %] [% END %] diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index 30de0f9fd..b6b75fdbc 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -32,7 +32,7 @@

    [% h2 FILTER html %]

    -
    + All:  Show all productsShow all products
     
    + @@ -45,7 +45,7 @@  [% class.description FILTER html_light %][% class.description FILTER html_light %]
    +
    [% FOREACH c = classifications %] [% IF c.object %] @@ -44,14 +44,14 @@ [% FOREACH p = c.products %] - - + [% END %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 25192b68f..cc340d28b 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -260,11 +260,11 @@ [% IF Param('usestatuswhiteboard') %] - + diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index d1425c593..ec8604ef0 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -172,8 +172,6 @@ [% END %] -
    - [%############################################################################%] [%# Rest of Change Form #%] [%############################################################################%] @@ -188,10 +186,9 @@ [%# Navigation Bar #%] [%############################################################################%] -
    + [% p.name FILTER html FILTER no_break %]:  [% p.description FILTER html_light %][% p.description FILTER html_light %]
    - Status Whiteboard: - + + -
    - - [% IF bugs.size > 0 %] - - - - - - - [% IF searchtype == "saved" %] - - [% ELSE %] - - - - [% END %] - -
    + [% IF bugs.size > 0 %] +
    +
    [% id = buglist.join(",") %] @@ -213,19 +210,19 @@
    [% IF time_summary_limited %] - - Time Summary will only include the [% terms.bugs %] shown above. In order to - to see a time summary for all [% terms.bugs %] found by the search, you can + + Time Summary will only include the [% terms.bugs %] shown above. + In order to see a time summary for all [% terms.bugs %] found + by the search, you can - Show all search results. + show all search results. + [% END %] [% END %] -
    		  + + +
    CSV | - [% END %] - -
    		- Edit Search - - | - + Edit Search + + + [% IF searchtype == "saved" %] +
    + | - Forget Search '[% searchname FILTER html %]' -
    		  -
    - as - - - - - -
    -
    + Forget Search '[% searchname FILTER html %]' +
    + [% ELSE %] +
    +
    + as + + + + + +
    +
    + [% END %] + + [% END %] [% IF one_product.defined && bugs.size %]

    diff --git a/template/en/default/reports/chart.html.tmpl b/template/en/default/reports/chart.html.tmpl index 3276f31e0..dfab725e6 100644 --- a/template/en/default/reports/chart.html.tmpl +++ b/template/en/default/reports/chart.html.tmpl @@ -20,7 +20,7 @@ header_addl_info = time %] -

    +
    [% imageurl = BLOCK %]chart.cgi? [% imagebase FILTER html %]&ctype=png&action=plot&width= diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl index 948939e7a..c4e554210 100644 --- a/template/en/default/reports/create-chart.html.tmpl +++ b/template/en/default/reports/create-chart.html.tmpl @@ -134,11 +134,11 @@ function subcatSelected() { [% labelidx = labelidx + 1 %] [% NEXT %] [% END %] - + [% FOREACH series = line %] [% IF loop.first %] - + @@ -160,7 +160,7 @@ function subcatSelected() { value="[% series.series_id %]"> - + [% IF user.id == series.creator_id OR user.in_group("admin") %] Edit | @@ -172,7 +172,7 @@ function subcatSelected() { [% series.subcategory FILTER uri %]%20/%20 [% series.name FILTER uri -%]&series_id= [% series.series_id %]&remaction=runseries">Run Search - + [% END %] [% labelidx = labelidx + 1 %] @@ -181,7 +181,7 @@ function subcatSelected() { [% IF chart.gt %] - + diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl index 4efdcf9f5..9d3fc698b 100644 --- a/template/en/default/reports/duplicates.html.tmpl +++ b/template/en/default/reports/duplicates.html.tmpl @@ -51,6 +51,19 @@ + + + + + - - diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index abf770f29..57e998b1d 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -116,7 +116,7 @@ YAHOO.util.Event.addListener(window, "load", function() { return parseFloat(res[1]); }; - this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("tabular_report")); + this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("tabular_report_[% tbl FILTER html FILTER js %]")); this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE; this.myDataSource.responseSchema = { fields: [ @@ -137,7 +137,7 @@ YAHOO.util.Event.addListener(window, "load", function() {

    [% tbl_disp FILTER email FILTER html %]

    [% END %] -
    Restrict to products: + +
    When sorting or restricting, work with: @@ -66,16 +79,6 @@ currently visible list Restrict to products: - -
    +
    @@ -147,7 +147,7 @@ YAHOO.util.Event.addListener(window, "load", function() { -
    + [% row_field_disp FILTER html %] @@ -158,7 +158,7 @@ YAHOO.util.Event.addListener(window, "load", function() { [% row_idx = 0 %] [% total_key = '-total-' %]
    - +
    [% IF col_field %] @@ -234,7 +234,7 @@ YAHOO.util.Event.addListener(window, "load", function() {
    - +
    diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index 2ca5dd90f..195e92e89 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -66,9 +66,8 @@ [% END %] [% END %] -
    - - [% FOREACH tbl = tbl_names %] +
    + [% FOREACH tbl = tbl_names %] [% IF tbl == "-total-" %] [% tbl_disp = "Total" %] [% ELSE %] @@ -108,45 +107,38 @@ { name => "table", description => "Table" } ] %] [% formaturl = "report.cgi?$switchbase&width=$width&height=$height&action=wrap" %] - [% FOREACH other_format = formats %] - [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] - [% UNLESS other_format.name == format %] - +

    + [% FOREACH other_format = formats %] + [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] + [% UNLESS other_format.name == format %] + + [% END %] + [% other_format.description FILTER html %] + [% "" UNLESS other_format.name == format %] | [% END %] - [% other_format.description FILTER html %] - [% "" UNLESS other_format.name == format %] | + CSV +

    + + [% IF format == "table" %] + Edit this report + [% ELSE %] + + Edit this report + [% END %] + | + [% IF saved_report_id %] + Forget this report + [% ELSE %] +
    + as + + + + +
    [% END %] - CSV - - - - - - - -
    - [% IF format == "table" %] - Edit this report - [% ELSE %] - - Edit this report - [% END %] - | - [% IF saved_report_id %] - Forget this report - [% ELSE %] -
    - as - - - - -
    - [% END %] -
    -
    [% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 698132ee6..71876ef42 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -52,71 +52,63 @@ var queryform = "reportform" [% button_name = "Generate Report" %]
    - - - - - - - - - - - - - -
    - Vertical Axis:
    - - [% PROCESS select name = 'y_axis_field' %]
    -
    - Plot Data Sets:
    - - Individually
    - - Stacked -     		- - - - -
    - Multiple Images:
    - [% PROCESS select name = 'z_axis_field' %] -
    -     		- Format:
    - [% chart_formats = [ - { name => "line", description => "Line Graph" }, - { name => "bar", description => "Bar Chart" }, - { name => "pie", description => "Pie Chart" } ] %] - [% default.chart_format.0 = default.chart_format.0 || "bar" %] - - [% FOREACH chart_format = chart_formats %] - - [% chart_format.description FILTER html %]
    - [% END %] -
    - - Horizontal Axis: - [% PROCESS select name = 'x_axis_field' %]
    - - -     		-
    - -
    - -[% PROCESS search/form.html.tmpl %] - -[% PROCESS "search/boolean-charts.html.tmpl" %] + + + + + + + + + + + + +
    + Vertical Axis:
    + [% PROCESS select name = 'y_axis_field' %]
    +
    + Plot Data Sets:
    + +
    + + +     		+ Multiple Images:
    + [% PROCESS select name = 'z_axis_field' %] +     		+ Format:
    + [% chart_formats = [ + { name => "line", description => "Line Graph" }, + { name => "bar", description => "Bar Chart" }, + { name => "pie", description => "Pie Chart" } ] %] + [% default.chart_format.0 = default.chart_format.0 || "bar" %] + + [% FOREACH chart_format = chart_formats %] + +
    + [% END %] +
    + Horizontal Axis:
    + [% PROCESS select name = 'x_axis_field' %]
    + + +
    + +
    + + [% PROCESS search/form.html.tmpl %] + + [% PROCESS "search/boolean-charts.html.tmpl" %]
    + + + + + -
    + Horizontal Axis:
    + [% PROCESS select name = 'x_axis_field' %] +
    - - - - + + + + +
    - - Horizontal Axis: - [% PROCESS select name = 'x_axis_field' %] -
    + Vertical Axis:
    + [% PROCESS select name = 'y_axis_field' %] +     		+ Multiple Tables:
    + [% PROCESS select name = 'z_axis_field' %] +
    - - - Vertical Axis:
    - [% PROCESS select name = 'y_axis_field' %] - - - - - - -
    - Multiple Tables:
    - [% PROCESS select name = 'z_axis_field' %] -
    - - - - -
    +
    [% PROCESS search/form.html.tmpl %] diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index f3b148f80..3a2fc65a6 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -31,7 +31,7 @@ [% body FILTER html %] -

    +

    [% IF author.login == recipient.login %] Click here to edit your whine schedule @@ -45,7 +45,7 @@

    [%+ query.title FILTER html %] ([% query.bugs.size %] [%+ terms.bugs %])

    - +
    [% FOREACH col = query.columnlist %] @@ -56,18 +56,18 @@ [% FOREACH bug=query.bugs %] - [% FOREACH col = query.columnlist %] [% NEXT IF col == 'bug_id' %] - + [% END %] [% END %]
    ID
    [% bug.bug_id %][% display_value(col, bug.$col) FILTER html %][% display_value(col, bug.$col) FILTER html %]
    [% IF author.login == recipient.login %] -

    +

    View as [% terms.bug %] list

    [% END %] -- cgit v1.2.3-24-g4f1b