From 4fa178ae3f0f612cf91b26a2dea498602794be3b Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 31 Dec 2013 13:48:41 +0100 Subject: Bug 920681: Remove the cellspacing and cellpadding attributes from tables r/a=justdave --- describekeywords.cgi | 1 - skins/standard/admin.css | 82 ++++++--- skins/standard/attachment.css | 5 +- skins/standard/buglist.css | 41 ++++- skins/standard/enter_bug.css | 4 + skins/standard/global.css | 114 ++++++++++-- skins/standard/params.css | 10 +- skins/standard/reports.css | 52 ++---- skins/standard/summarize-time.css | 10 ++ template/en/default/account/prefs/email.html.tmpl | 2 +- .../default/account/prefs/saved-searches.html.tmpl | 83 +++------ .../en/default/account/prefs/settings.html.tmpl | 2 +- .../en/default/admin/classifications/add.html.tmpl | 3 +- .../en/default/admin/classifications/del.html.tmpl | 47 +++-- .../default/admin/classifications/edit.html.tmpl | 9 +- .../admin/classifications/reclassify.html.tmpl | 43 ++--- .../default/admin/classifications/select.html.tmpl | 27 ++- .../admin/components/confirm-delete.html.tmpl | 168 +++++++++--------- .../en/default/admin/components/create.html.tmpl | 11 +- .../default/admin/components/edit-common.html.tmpl | 12 +- .../en/default/admin/components/edit.html.tmpl | 33 ++-- template/en/default/admin/confirm-action.html.tmpl | 53 +++--- .../admin/custom_fields/confirm-delete.html.tmpl | 34 ++-- .../admin/custom_fields/edit-common.html.tmpl | 16 +- .../admin/fieldvalues/confirm-delete.html.tmpl | 58 +++---- .../en/default/admin/fieldvalues/create.html.tmpl | 5 +- .../en/default/admin/fieldvalues/edit.html.tmpl | 10 +- template/en/default/admin/flag-type/edit.html.tmpl | 2 +- template/en/default/admin/flag-type/list.html.tmpl | 68 ++++---- template/en/default/admin/groups/create.html.tmpl | 67 +++---- template/en/default/admin/groups/delete.html.tmpl | 25 ++- template/en/default/admin/groups/edit.html.tmpl | 184 +++++++++----------- .../admin/keywords/confirm-delete.html.tmpl | 21 ++- .../en/default/admin/keywords/create.html.tmpl | 9 +- template/en/default/admin/keywords/edit.html.tmpl | 3 +- .../admin/milestones/confirm-delete.html.tmpl | 52 +++--- .../en/default/admin/milestones/create.html.tmpl | 3 +- .../en/default/admin/milestones/edit.html.tmpl | 10 +- .../en/default/admin/params/editparams.html.tmpl | 15 +- .../admin/products/confirm-delete.html.tmpl | 115 ++++++------ .../en/default/admin/products/create.html.tmpl | 2 +- template/en/default/admin/products/edit.html.tmpl | 39 +++-- .../admin/products/groupcontrol/edit.html.tmpl | 6 +- template/en/default/admin/settings/edit.html.tmpl | 67 +++---- .../default/admin/users/responsibilities.html.tmpl | 2 +- .../admin/versions/confirm-delete.html.tmpl | 54 +++--- .../en/default/admin/versions/create.html.tmpl | 3 +- template/en/default/admin/versions/edit.html.tmpl | 20 ++- .../en/default/attachment/confirm-delete.html.tmpl | 40 ++--- template/en/default/attachment/diff-file.html.tmpl | 2 +- template/en/default/attachment/list.html.tmpl | 8 +- template/en/default/bug/activity/table.html.tmpl | 8 +- template/en/default/bug/comments.html.tmpl | 3 +- .../en/default/bug/create/create-guided.html.tmpl | 193 +++++++-------------- template/en/default/bug/edit.html.tmpl | 10 +- .../bug/process/verify-new-product.html.tmpl | 16 +- template/en/default/bug/summarize-time.html.tmpl | 10 +- template/en/default/filterexceptions.pl | 1 - template/en/default/global/code-error.html.tmpl | 15 +- .../en/default/global/confirm-user-match.html.tmpl | 22 +-- template/en/default/global/footer.html.tmpl | 27 +-- template/en/default/global/header.html.tmpl | 109 +++++------- template/en/default/global/tabs.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 12 +- template/en/default/list/edit-multiple.html.tmpl | 12 +- template/en/default/list/list.html.tmpl | 1 - template/en/default/list/quips.html.tmpl | 13 +- template/en/default/list/table.html.tmpl | 2 +- template/en/default/pages/quicksearch.html.tmpl | 4 +- template/en/default/pages/release-notes.html.tmpl | 10 +- template/en/default/pages/release-notes3.html.tmpl | 96 ++++++---- template/en/default/reports/components.html.tmpl | 26 +-- .../en/default/reports/duplicates-table.html.tmpl | 2 +- template/en/default/reports/keywords.html.tmpl | 40 ++--- template/en/default/reports/old-charts.html.tmpl | 18 +- template/en/default/reports/report-table.html.tmpl | 14 +- template/en/default/request/queue.html.tmpl | 2 +- .../en/default/search/search-specific.html.tmpl | 2 +- 78 files changed, 1205 insertions(+), 1217 deletions(-) diff --git a/describekeywords.cgi b/describekeywords.cgi index 4976fada1..2147ac47d 100755 --- a/describekeywords.cgi +++ b/describekeywords.cgi @@ -27,7 +27,6 @@ $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count(); if (!@{$vars->{keywords}}) { ThrowUserError("no_keywords"); } -$vars->{'caneditkeywords'} = $user->in_group("editkeywords"); print $cgi->header(); $template->process("reports/keywords.html.tmpl", $vars) diff --git a/skins/standard/admin.css b/skins/standard/admin.css index d0aaf368f..b5f36b654 100644 --- a/skins/standard/admin.css +++ b/skins/standard/admin.css @@ -6,14 +6,9 @@ * defined by the Mozilla Public License, v. 2.0. */ -.column_header { - background-color: #66f; -} - .warningmessages, .criticalmessages { background-color: white; - border-style: solid; - border-width: 1px; + border: 1px solid; padding: 1ex 1ex 1ex 4ex; margin: 1ex; } @@ -43,20 +38,30 @@ p.areyoureallyreallysure { font-weight: bold; } -#admin_table { +#admin_table, #flag_types_bugs, #flag_types_attachments { border-collapse: collapse; border: 1px solid black; } -#admin_table th { +#admin_table th, #flag_types_bugs th, #flag_types_attachments th { white-space: normal !important; } -#admin_table th, #admin_table td { +#admin_table th, #admin_table td, +#flag_types_bugs th , #flag_types_bugs td, +#flag_types_attachments th, #flag_types_attachments td { border: 1px solid black; padding: 0.3em; } +table.no-border th, table.no-border td { + border: 0 !important; +} + +table.no-border th { + text-align: left; +} + tr.disabled { background-color: lightgrey; } @@ -131,20 +136,8 @@ th.title { vertical-align: middle; } -#edit_custom_field tr { - vertical-align: top; -} - -#edit_custom_field th { - text-align: right; -} - -#edit_custom_field th.narrow_label { - white-space: normal; -} - -#flag_types_bugs tr th, #flag_types_attachments tr th { - text-align: left; +td.max-width { + width: 100%; } #flag_types_bugs .inactive, #flag_types_attachments .inactive { @@ -155,13 +148,27 @@ th.title { display: block; } -table.whining_list { +#flagtype_form div.inline { + white-space: nowrap; +} + +#flagtype_form label, #grant_table label { + font-weight:bold; +} + +table.whining_list, #group_settings_desc { border: 1px solid black; border-collapse: collapse; width: 100%; } -table.whining_list th, table.whining_list td { +#group_settings_desc th, #group_settings_desc td { + border: 1px solid black; + padding: 0.3em; +} + +table.whining_list th, table.whining_list td, +#admin_table_edit th, #admin_table_edit td { padding: 0.3em; } @@ -180,3 +187,28 @@ table.schedule_list th, table.search_list th { text-align: center; font-weight: bold !important; } + +#settings #update { + margin-top: 2em; +} + +#grant_table td, #grant_table th { + text-align: center; + padding: 0.5em; +} + +#grant_table th { + padding: 2em 3em 0.5em 3em; +} + +#grant_table tr:first-child th { + padding-top: 0.5em; +} + +#mass-remove { + max-width: 50%; +} + +#mass-remove legend { + white-space: nowrap; +} diff --git a/skins/standard/attachment.css b/skins/standard/attachment.css index 3c596623c..c765aa5a9 100644 --- a/skins/standard/attachment.css +++ b/skins/standard/attachment.css @@ -108,10 +108,7 @@ table.attachment_info td { padding-bottom: 0.4em; } -#attachment_attributes label, -#attachment_attributes span.label, -#attachment_actions span.label -{ +#attachment_attributes label { font-weight: bold; } diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css index 6d23fc8bb..75dafb9cf 100644 --- a/skins/standard/buglist.css +++ b/skins/standard/buglist.css @@ -63,7 +63,13 @@ /* Align columns in the "change multiple bugs" form to the right. */ table#form tr th { text-align: right; } -table.bz_buglist td, table.bz_buglist th { +table.bz_buglist { + border-collapse: collapse; + width: 100%; +} + +table.bz_buglist td, table.bz_buglist th { + padding: 0.4em; } /* we use a first-child class and not the pseudo-class because IE @@ -76,7 +82,7 @@ tr.bz_secure td.first-child, a.bz_secure { } th.first-child, td.first-child, a.bz_secure { - padding-left: 20px; + padding-left: 20px !important; } tr.bz_secure_mode_implied td.first-child { @@ -115,6 +121,26 @@ td.bz_total { color: inherit; } +#groups_edit_multiple, #quips { + border: 1px solid black; + border-collapse: collapse; +} + +#groups_edit_multiple th, #groups_edit_multiple td, +#quips th, #quips td { + border: 1px solid; + padding: 0.3em; +} + +#groups_edit_multiple th, #quips th { + text-align: center; + white-space: normal !important; +} + +#groups_edit_multiple th.narrow_column { + width: 8em; +} + /* The "filtering" table is specific to request.cgi. * Same for the "requests" class used for tables. */ @@ -126,6 +152,17 @@ td.bz_total { text-align: right; } +table.requests { + border: 1px solid black; + border-collapse: collapse; + width: 100%; +} + +table.requests th, table.requests td { + border: 1px solid; + padding: 0.5em; +} + table.requests th { text-align: left; } diff --git a/skins/standard/enter_bug.css b/skins/standard/enter_bug.css index 2aa094626..983ec6f66 100644 --- a/skins/standard/enter_bug.css +++ b/skins/standard/enter_bug.css @@ -71,6 +71,10 @@ form#Create #possible_duplicates td { vertical-align: middle; } height: 500px; } +#guided_form #description { + display: inline; +} + .good { color: #090; } diff --git a/skins/standard/global.css b/skins/standard/global.css index ecf39c6a8..d10fac026 100644 --- a/skins/standard/global.css +++ b/skins/standard/global.css @@ -12,7 +12,7 @@ color: #000; background: #fff url("global/body-back.gif") repeat-x; } - body, td, th, input { + body, td, th, input, dt, #titles { font-family: Verdana, sans-serif; font-size: small; } @@ -20,6 +20,11 @@ pre, code, kbd { font-size: medium; } + + #bugzilla-body { + clear: both; + } + /* global (end) */ /* header (begin) */ @@ -43,9 +48,14 @@ padding: 0.5em; } + #common_links { + clear: both; + } + #lang_links_container { float: right; } + #lang_links_container .links { border: none; padding: .5em; @@ -90,10 +100,9 @@ color: #fff; border-top-left-radius: 5px; border-top-right-radius: 5px; - font-size: 110%; margin: 0; - padding: 0.5em; vertical-align: bottom; + display: table; } #titles a { @@ -107,20 +116,25 @@ #titles #title { font-weight: bold; + padding: 0.5em; white-space: nowrap; + display: table-cell; } #titles #subtitle { font-weight: normal; - width: 100%; text-align: center; - } + padding: 0.5em; + display: table-cell; + } #titles #information { font-weight: normal; text-align: right; font-size: 90%; + padding: 0.5em; white-space: nowrap; + display: table-cell; } /* titles (end) */ @@ -177,6 +191,14 @@ /* link lists (end) */ /* tabs (begin) */ + table.tabs { + width: 100%; + } + + .tabs th, .tabs td { + padding: 1em; + } + .tabs td { background: #eee; text-align: center; @@ -289,6 +311,12 @@ div#docslinks { width: 50em; } +.bz_comment_text span.quote { + color: #65379c; + /* Make quoted text not wrap. */ + white-space: pre; +} + .bz_comment_user, .bz_comment_time, .bz_comment_number, .bz_private_checkbox, .bz_comment_actions { @@ -342,23 +370,48 @@ div#docslinks { display: none !important; } -.bz_comment_text span.quote { - color: #65379c; - /* Make quoted text not wrap. */ - white-space: pre; -} - table#flags th, table#flags td { vertical-align: middle; text-align: left; } -table#email_prefs th, -table#shared_search_prefs th, -table#saved_search_prefs th { +#email_prefs, #saved_search_prefs, #shared_search_prefs, +#bug_activity { + border: 1px solid black; + border-collapse: collapse; +} + +#email_prefs th, +#shared_search_prefs th, +#saved_search_prefs th { text-align: center; } + +#email_prefs th, #email_prefs td, +#shared_search_prefs th, #shared_search_prefs td, +#saved_search_prefs th, #saved_search_prefs td, +#bug_activity td { + border: 1px solid; + padding: 0.3em; +} + +#bug_activity td { + vertical-align: top; +} + +#user_prefs th, #user_prefs td { + padding: 0.5em; +} + +.column_header { + background-color: #66f; +} + +.column_header th { + text-align: center; +} + .flag_select { min-width: 3em; } @@ -371,16 +424,25 @@ input.requestee { font-size: x-large; } +#post_err_msg { + clear: both; +} + .warning { color: red; } .throw_error { - background-color: #ff0000; + background-color: red; color: black; font-size: 120%; - margin: 1em; + margin-bottom: 2em; padding: 0.5em 1em; + float: left; +} + +.label { + font-weight: bold; } .throw_error a:visited { @@ -419,6 +481,10 @@ dl dl > dt { border: 1px solid #333333; } +#attachment_table th, #attachment_table td { + padding: 0.3em; +} + .bz_attach_extra_info, .bz_info { font-size: smaller; } @@ -432,6 +498,16 @@ dl dl > dt { padding-left: 1em; } +#user_match_table { + border-collapse: collapse; +} + +#user_match_table td { + vertical-align: top; + border-bottom: 1px solid black; + padding: 1em 0.5em; +} + div.user_match { margin-bottom: 1em; } @@ -610,3 +686,9 @@ tr.shared_search { background-color: #fff7cd; color: #000; } + +.multi-columns { + columns: 3; + -moz-columns: 3; + -webkit-columns: 3; +} diff --git a/skins/standard/params.css b/skins/standard/params.css index 92bd6d0e1..428ace5ad 100644 --- a/skins/standard/params.css +++ b/skins/standard/params.css @@ -8,7 +8,6 @@ #menu { width: 10em; - margin-top: 1em; margin-right: 0.5em; border: solid thin; border-spacing: 0px; @@ -34,8 +33,13 @@ padding: 0.2em 0.5em; } -table td { - vertical-align: top; +div.table { + display: inline-table; +} + +div.cell { + display: table-cell; + vertical-align: top; } td.selected_section { diff --git a/skins/standard/reports.css b/skins/standard/reports.css index 4db7d2dac..7679e32fc 100644 --- a/skins/standard/reports.css +++ b/skins/standard/reports.css @@ -8,49 +8,17 @@ /* describecomponents.cgi */ -#components_header_table { - margin-bottom: 1em; -} - -.product_container { - width: 65%; -} - -.product_name { - font-weight: bold; - font-size: 150%; - margin: 0; -} - .product_desc { /* This is padding instead of margin because it looks better * with the scrollbar. */ padding: 0 2em; font-style: italic; - max-height: 5em; + max-height: 8em; overflow: auto; } -.instructions { - font-weight: bold; - font-size: 105%; +.component_table th { padding-right: 1em; -} - -.components_header { - margin: 0; - font-size: 140%; - font-weight: bold; -} - -.component_table { - margin-top: -1em; - margin-left: 2em; -} - -.component_table thead th { - padding-right: 1em; - vertical-align: bottom; text-align: left; } @@ -62,7 +30,7 @@ .component_table td.component_qa_contact { border: none; - padding-top: .5em; + padding-top: 0.5em; } .component_name { @@ -74,7 +42,7 @@ } .component_description { - padding-bottom: .5em; + padding-bottom: 0.5em; color: #333; } @@ -98,6 +66,17 @@ background-color: #cfffdf; /* light green */ } +#tabular_report { + border: 1px dotted black; + border-collapse: collapse; + text-align: center; +} + +#tabular_report th, #tabular_report td { + border: 1px dotted; + padding: 0.2em; +} + #graphical_report { max-width: 100%; height: auto; @@ -133,3 +112,4 @@ #edit_charts input#action-sum, #edit_charts input#action-remove { width: 7em; } + diff --git a/skins/standard/summarize-time.css b/skins/standard/summarize-time.css index c7ed96827..37b135b45 100644 --- a/skins/standard/summarize-time.css +++ b/skins/standard/summarize-time.css @@ -36,6 +36,16 @@ td.subtotal { .number .owner_header, .owner .bug_header { background: #ffffff } .number .owner_header2, .owner .bug_header2 { background: #EFEFEF } +table.owner, table.number, table.zeroitems { + width: 90%; + border-collapse: collapse; +} + +.owner th, .owner td, .number th, .number td, +.zeroitems th, .zeroitems td { + padding: 0.2em; +} + .warning_swapped_data { border: 1px solid red; margin: 1em; diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl index 9a5f22a8c..a085058c7 100644 --- a/template/en/default/account/prefs/email.html.tmpl +++ b/template/en/default/account/prefs/email.html.tmpl @@ -172,7 +172,7 @@ document.write(' +
When my relationship to this [% terms.bug %] is: diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl index 86df1e277..33df92255 100644 --- a/template/en/default/account/prefs/saved-searches.html.tmpl +++ b/template/en/default/account/prefs/saved-searches.html.tmpl @@ -31,57 +31,38 @@

Your saved searches are as follows:

- - - - - - - +
- Search - - Run - - Edit - - Forget - - Show in - Footer -
+ + + + + + [% may_share = user.in_group(Param('querysharegroup')) && queryshare_groups.size %] [% IF may_share %] - + [% END %] [% Hook.process('saved-header') %] + - - + + [% IF may_share %] - + [% END %] [% Hook.process('saved-row') %] + [% FOREACH q = user.queries %] @@ -102,7 +83,7 @@ [% issue_hash_token([q.id, q.name]) FILTER uri %]">Forget [% END %] -
SearchRunEditForgetShow in Footer - Share With a Group - Share With a Group
My [% terms.Bugs %] [% filtered_username = user.login FILTER uri %] Run -   - -   - - + - — - —
[% q.name FILTER html %] + You may use these searches saved and shared by others:

- - - - - - - - +
- Search - - Shared By - - Shared To - - Run - - Edit - - Show in - Footer -
+ + + + + + + + [% FOREACH q = user.queries_available %] @@ -185,7 +154,7 @@ Edit -
SearchShared ByShared ToRunEditShow in Footer
[% q.name FILTER html %] + [% END %] - +
[% FOREACH name = setting_names %] [% default_name = name _ '-isdefault' %] [% default_val = settings.${name}.default_value %] diff --git a/template/en/default/admin/classifications/add.html.tmpl b/template/en/default/admin/classifications/add.html.tmpl index d818d3166..d56275aa2 100644 --- a/template/en/default/admin/classifications/add.html.tmpl +++ b/template/en/default/admin/classifications/add.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Add new classification" + style_urls = ['skins/standard/admin.css'] %] -
+
[% PROCESS "admin/classifications/edit-common.html.tmpl" %] diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index f99d29632..24a39b4b6 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -11,30 +11,29 @@ style_urls = ['skins/standard/admin.css'] %] -
- - - - - - - - - - - - - - - - - +
PartValue
Classification:[% classification.name FILTER html %]
Description: - [% IF classification.description %] - [% classification.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] -
Sortkey:[% classification.sortkey FILTER html %]
+ + + + + + + + + + + + + + + +
FieldValue
Classification[% classification.name FILTER html %]
Description + [% IF classification.description %] + [% classification.description FILTER html_light %] + [% ELSE %] + description missing + [% END %] +
Sortkey[% classification.sortkey FILTER html %]

Confirmation

diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index 68fd046f2..b1f6ce225 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -8,14 +8,15 @@ [% PROCESS global/header.html.tmpl title = "Edit classification" + style_urls = ['skins/standard/admin.css'] %] - +
[% PROCESS "admin/classifications/edit-common.html.tmpl" %] - + - + - + - + [% IF Param('useqacontact') %] - + [% END %] - + diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index 748175b75..9998845e2 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -18,45 +18,44 @@ [% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] %] -
Edit Products: @@ -25,8 +26,8 @@ [% FOREACH product = classification.products %] - - + + [% END %]
[% product.name FILTER html %][% product.description FILTER html_light %][% product.name FILTER html %][% product.description FILTER html_light %]
diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl index ac4a09b14..b230d670c 100644 --- a/template/en/default/admin/classifications/reclassify.html.tmpl +++ b/template/en/default/admin/classifications/reclassify.html.tmpl @@ -8,38 +8,39 @@ [% PROCESS global/header.html.tmpl title = "Reclassify products" + style_urls = ['skins/standard/admin.css'] %] - +
- - - + + + - - - + + - - - + + + - + - - - + + + - + + - - + +
Classification:[% classification.name FILTER html %]
[% classification.name FILTER html %]
Description: + [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] description missing [% END %]
Sortkey:[% classification.sortkey FILTER html %]
[% classification.sortkey FILTER html %]
Products:Other ClassificationsOther Classifications This Classification
This Classification
- + +

+
diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index 02a3cd413..ffe183cfa 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -11,9 +11,9 @@ style_urls = ['skins/standard/admin.css'] %] - +
- + @@ -22,26 +22,35 @@ [% FOREACH cl = classifications %] - - + - + [% IF (cl.id == 1) %] - + [% ELSE %] - + [% END %] [%# don't allow user to delete the default id. %] [% IF (cl.id == 1) %] - + [% ELSE %] - + [% END %] [% END %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index 6644acca8..9018dcda2 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -22,101 +22,96 @@ from '[% product.name FILTER html %]' product style_urls = ['skins/standard/admin.css'] %] -
Edit Classification ...Edit Classification... Description Sortkey Products
[% cl.name FILTER html %] + + + [% cl.name FILTER html %] + + [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] none [% END %] [% cl.sortkey FILTER html %][% cl.sortkey FILTER html %][% cl.product_count FILTER html %][% cl.product_count FILTER html %]reclassify ([% cl.product_count FILTER html %]) + + reclassify ([% cl.product_count FILTER html %]) +  delete + delete +
- - - - - - - - - - - - - - - - -[% IF Param('useqacontact') %] - - - - -[% END %] - - - - - - -[% IF product.description %] - - - - -[% END %] +
FieldValue
Component:[% comp.name FILTER html %]
Component Description:[% comp.description FILTER html_light %]
Default assignee:[% comp.default_assignee.login FILTER html %]
Default QA contact:[% comp.default_qa_contact.login FILTER html %]
Component of Product:[% product.name FILTER html %]
Product Description:[% product.description FILTER html_light %]
+ + + + + + + + + + + + + + + + + + [% IF Param('useqacontact') %] + + + + + [% END %] -[% IF Param('usetargetmilestone') %] - - - - -[% END %] + + + + - - - - - - - - - + [% IF product.description %] + + + + + [% END %] + + [% IF Param('usetargetmilestone') %] + + + + + [% END %] + + + + + + + + +
FieldValue
Component[% comp.name FILTER html %]
Component Description[% comp.description FILTER html_light %]
Default assignee[% comp.default_assignee.login FILTER html %]
Default QA contact[% comp.default_qa_contact.login FILTER html %]
Product Milestone URL: - - [% product.milestone_url FILTER html %] - -
Component of Product[% product.name FILTER html %]
Open for [% terms.bugs %]:[% IF product.is_active && comp.isactive %]Yes[% ELSE %]No[% END %]
[% terms.Bugs %]: -[% IF comp.bug_count %] - [% comp.bug_count %] -[% ELSE %] - None -[% END %] -
Product Description[% product.description FILTER html_light %]
Product Milestone URL + + [% product.milestone_url FILTER html %] +
Open for [% terms.bugs %][% IF product.is_active && comp.isactive %]Yes[% ELSE %]No[% END %]
[% terms.Bugs %] + [% IF comp.bug_count %] + [% comp.bug_count %] + [% ELSE %] + None + [% END %] +

Confirmation

- + [% IF comp.bug_count %] [% IF !Param("allowbugdeletion") %] -

- Sorry, there - - [% IF comp.bug_count > 1 %] - are [% comp.bug_count %] [%+ terms.bugs %] - [% ELSE %] - is [% comp.bug_count %] [%+ terms.bug %] - [% END %] - - outstanding for this component. You must reassign - - [% IF comp.bug_count > 1 %] - those [% terms.bugs %] - [% ELSE %] - that [% terms.bug %] - [% END %] +

+ Sorry, there + [% IF comp.bug_count > 1 %] + are [% comp.bug_count %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + outstanding for this component. You must reassign - to another component before you can delete this one. -

+ [% IF comp.bug_count > 1 %] + those [% terms.bugs %] + [% ELSE %] + that [% terms.bug %] + [% END %] + to another component before you can delete this one. +

[% ELSE %] - -
- - There [% IF comp.bug_count > 1 %] +

+ There + [% IF comp.bug_count > 1 %] are [% comp.bug_count %] [%+ terms.bugs %] [% ELSE %] is 1 [% terms.bug %] @@ -124,8 +119,7 @@ from '[% product.name FILTER html %]' product entered for this component! When you delete this component, ALL stored [% terms.bugs %] and their history will be deleted too. -

- +

[% END %] [% END %] diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index f281160c0..4db4a489c 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -10,21 +10,22 @@ # product: object; Bugzilla::Product object representing the product to # which the component belongs. #%] - + [% title = BLOCK %]Add component to the [% product.name FILTER html %] product[% END %] [% PROCESS global/header.html.tmpl + title = title + style_urls = ['skins/standard/admin.css'] yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] - title = title %] - +
[% PROCESS "admin/components/edit-common.html.tmpl" %] - +
-
+ diff --git a/template/en/default/admin/components/edit-common.html.tmpl b/template/en/default/admin/components/edit-common.html.tmpl index 6ff4e07e6..00b80baa8 100644 --- a/template/en/default/admin/components/edit-common.html.tmpl +++ b/template/en/default/admin/components/edit-common.html.tmpl @@ -15,12 +15,12 @@ [% DEFAULT desc_name = "description" %]
[% INCLUDE global/textarea.html.tmpl name = desc_name @@ -33,7 +33,7 @@
[% INCLUDE global/userselect.html.tmpl name => "initialowner" @@ -45,7 +45,7 @@
[% INCLUDE global/userselect.html.tmpl name => "initialqacontact" @@ -58,7 +58,7 @@
[% INCLUDE global/userselect.html.tmpl name => "initialcc" @@ -69,7 +69,7 @@ %]
[% IF !Param("usemenuforusers") %] - Enter user names for the CC list as a comma-separated list. + Enter user names for the CC list as a comma-separated list. [% END %]
+
[% PROCESS "admin/components/edit-common.html.tmpl" %] - + - + -
[% terms.Bugs %]:[% terms.Bugs %]: -[% IF comp.bug_count > 0 %] - [% comp.bug_count %] -[% ELSE %] - None -[% END %] + [% IF comp.bug_count > 0 %] + [% comp.bug_count %] + [% ELSE %] + None + [% END %]
- or Delete this component. - + or + Delete this component. [% PROCESS admin/components/footer.html.tmpl diff --git a/template/en/default/admin/confirm-action.html.tmpl b/template/en/default/admin/confirm-action.html.tmpl index e3b9ef5f7..ecc162540 100644 --- a/template/en/default/admin/confirm-action.html.tmpl +++ b/template/en/default/admin/confirm-action.html.tmpl @@ -15,8 +15,9 @@ # if he declines submission. #%] -[% PROCESS global/header.html.tmpl title = "Suspicious Action" - style_urls = ['skins/standard/global.css'] %] +[% PROCESS global/header.html.tmpl + title = "Suspicious Action" +%] [% IF abuser %]
@@ -27,37 +28,27 @@ is incorrect, meaning that it looks like you didn't come from the right page. The following token has been used :

- - [% IF token_action != expected_action %] - - - - - - - - - [% END %] + [% IF token_action != expected_action %] +

+ Action stored: + [%+ token_action FILTER html %] +
+ This action doesn't match the one expected ([% expected_action FILTER html %]). +

+ [% END %] - [% IF abuser != user.identity %] - - - - - - - - - [% END %] -
Action stored:[% token_action FILTER html %]
  - This action doesn't match the one expected ([% expected_action FILTER html %]). -
Generated by:[% abuser FILTER html %]
  - This token has not been generated by you. It is possible that someone - tried to trick you! -
- -

Please report this problem to [%+ Param("maintainer") FILTER html %].

+ [% IF abuser != user.identity %] +

+ Generated by: + [%+ abuser FILTER html %] +
+ This token has not been generated by you. It is possible that someone + tried to trick you! +

+ [% END %]
+ +

Please report this problem to [% Param("maintainer") FILTER html %].

[% ELSE %]
It looks like you didn't come from the right page (you have no valid token for diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl index 579806137..471d7a1c4 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -23,23 +23,23 @@ doc_section = "custom-fields.html#delete-custom-fields" %] - - - - - - - - - - - - - - - - - +
FieldValue
Custom Field:[% field.name FILTER html %]
Description:[% field.description FILTER html %]
Type:[% field_types.${field.type} FILTER html %]
+ + + + + + + + + + + + + + + +
FieldValue
Custom Field[% field.name FILTER html %]
Description[% field.description FILTER html %]
Type[% field_types.${field.type} FILTER html %]

Confirmation

diff --git a/template/en/default/admin/custom_fields/edit-common.html.tmpl b/template/en/default/admin/custom_fields/edit-common.html.tmpl index b08b7f23d..f54073cfe 100644 --- a/template/en/default/admin/custom_fields/edit-common.html.tmpl +++ b/template/en/default/admin/custom_fields/edit-common.html.tmpl @@ -12,9 +12,9 @@ [% PROCESS "global/field-descs.none.tmpl" %] - +
- + - + - + - + - + [% ELSE %] -
[% IF field %] [% field.name FILTER html %] @@ -34,7 +34,7 @@
@@ -50,7 +50,7 @@
[% IF field %] [% field_types.${field.type} FILTER html %] @@ -72,7 +72,7 @@
@@ -86,7 +86,7 @@
Long Description:Long Description: [% INCLUDE global/textarea.html.tmpl name = 'long_desc' @@ -147,7 +147,7 @@ Edit legal values for this field. + @@ -164,7 +164,7 @@ [% END %] [% IF !field || field.is_select %] - +