From ec4862650f2da6ef3b0cdcb1ca135a64879c6b31 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sun, 22 Dec 2013 15:51:18 +0100 Subject: Bug 322402: Inline styling using bgcolor=x or color=x should be replaced by CSS styles r/a=justdave --- .../en/default/account/profile-activity.html.tmpl | 1 + .../en/default/admin/classifications/del.html.tmpl | 5 +- .../default/admin/classifications/edit.html.tmpl | 10 +-- .../admin/classifications/reclassify.html.tmpl | 2 +- .../default/admin/classifications/select.html.tmpl | 5 +- .../admin/components/confirm-delete.html.tmpl | 4 +- .../en/default/admin/components/list.html.tmpl | 1 + .../admin/components/select-product.html.tmpl | 1 + .../admin/custom_fields/confirm-delete.html.tmpl | 2 +- .../en/default/admin/custom_fields/list.html.tmpl | 1 + .../admin/fieldvalues/confirm-delete.html.tmpl | 2 +- .../en/default/admin/fieldvalues/list.html.tmpl | 1 + .../admin/fieldvalues/select-field.html.tmpl | 1 + template/en/default/admin/flag-type/list.html.tmpl | 9 +-- template/en/default/admin/groups/list.html.tmpl | 1 + template/en/default/admin/keywords/list.html.tmpl | 1 + .../admin/milestones/confirm-delete.html.tmpl | 2 +- .../en/default/admin/milestones/list.html.tmpl | 1 + .../admin/milestones/select-product.html.tmpl | 1 + template/en/default/admin/params/common.html.tmpl | 6 +- .../admin/products/confirm-delete.html.tmpl | 23 ++----- template/en/default/admin/products/edit.html.tmpl | 14 ++-- .../admin/products/groupcontrol/edit.html.tmpl | 7 +- .../admin/products/list-classifications.html.tmpl | 1 + template/en/default/admin/products/list.html.tmpl | 1 + template/en/default/admin/table.html.tmpl | 2 +- template/en/default/admin/users/list.html.tmpl | 2 +- .../admin/versions/confirm-delete.html.tmpl | 2 +- template/en/default/admin/versions/list.html.tmpl | 1 + .../admin/versions/select-product.html.tmpl | 1 + .../en/default/attachment/confirm-delete.html.tmpl | 5 +- .../en/default/attachment/show-multiple.html.tmpl | 2 +- .../en/default/bug/create/create-guided.html.tmpl | 79 +++++++++------------- template/en/default/bug/create/create.html.tmpl | 4 +- template/en/default/bug/dependency-tree.html.tmpl | 2 +- template/en/default/bug/navigate.html.tmpl | 8 +-- template/en/default/filterexceptions.pl | 1 - .../en/default/global/confirm-user-match.html.tmpl | 11 +-- template/en/default/global/messages.html.tmpl | 6 ++ template/en/default/reports/edit-series.html.tmpl | 8 --- template/en/default/reports/keywords.html.tmpl | 3 +- template/en/default/whine/mail.html.tmpl | 2 +- 42 files changed, 107 insertions(+), 135 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl index b8a58d596..ff989c6a5 100644 --- a/template/en/default/account/profile-activity.html.tmpl +++ b/template/en/default/account/profile-activity.html.tmpl @@ -28,6 +28,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% PROCESS admin/users/listselectvars.html.tmpl diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 83e0812ab..f99d29632 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Delete classification" + style_urls = ['skins/standard/admin.css'] %] - + @@ -25,7 +26,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - description missing + description missing [% END %] diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index fddcb3f96..68fd046f2 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -26,18 +26,12 @@ [% FOREACH product = classification.products %] - + [% END %]
Part Value
[% product.name FILTER html %] - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] - [% product.description FILTER html_light %]
[% ELSE %] - none + none [% END %] diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl index 3e12d3e42..ac4a09b14 100644 --- a/template/en/default/admin/classifications/reclassify.html.tmpl +++ b/template/en/default/admin/classifications/reclassify.html.tmpl @@ -22,7 +22,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - description missing + description missing [% END %] diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index 8a033a950..02a3cd413 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -8,10 +8,11 @@ [% PROCESS global/header.html.tmpl title = "Select classification" + style_urls = ['skins/standard/admin.css'] %] - + @@ -26,7 +27,7 @@ [% IF cl.description %] [% cl.description FILTER html_light %] [% ELSE %] - none + none [% END %] diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index bbd5ce200..6644acca8 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -23,7 +23,7 @@ from '[% product.name FILTER html %]' product %]
Edit Classification ... Description Sortkey [% cl.sortkey FILTER html %]
- + @@ -114,7 +114,7 @@ from '[% product.name FILTER html %]' product

[% ELSE %] -
Field Value
+
There [% IF comp.bug_count > 1 %] are [% comp.bug_count %] [%+ terms.bugs %] diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl index fc36bcdd2..949f56b1e 100644 --- a/template/en/default/admin/components/list.html.tmpl +++ b/template/en/default/admin/components/list.html.tmpl @@ -16,6 +16,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editcomponents.cgi?action=edit&product= diff --git a/template/en/default/admin/components/select-product.html.tmpl b/template/en/default/admin/components/select-product.html.tmpl index 55600d9cd..3651ec570 100644 --- a/template/en/default/admin/components/select-product.html.tmpl +++ b/template/en/default/admin/components/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit components for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ 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 0b7c8814c..579806137 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -24,7 +24,7 @@ %] - + diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl index e6ec0c283..7d54926b0 100644 --- a/template/en/default/admin/custom_fields/list.html.tmpl +++ b/template/en/default/admin/custom_fields/list.html.tmpl @@ -14,6 +14,7 @@ [% PROCESS global/header.html.tmpl title = "Custom Fields" + style_urls = ['skins/standard/admin.css'] doc_section = "custom-fields.html" %] diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl index a37ff73d4..39c20e325 100644 --- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl +++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl @@ -23,7 +23,7 @@ %]
Field Value
- + diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl index 01c5717b8..109665131 100644 --- a/template/en/default/admin/fieldvalues/list.html.tmpl +++ b/template/en/default/admin/fieldvalues/list.html.tmpl @@ -23,6 +23,7 @@ ([% field.name FILTER html %]) field[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editvalues.cgi?action=edit&field= diff --git a/template/en/default/admin/fieldvalues/select-field.html.tmpl b/template/en/default/admin/fieldvalues/select-field.html.tmpl index 099eebab6..b3e1d97b6 100644 --- a/template/en/default/admin/fieldvalues/select-field.html.tmpl +++ b/template/en/default/admin/fieldvalues/select-field.html.tmpl @@ -17,6 +17,7 @@ [% PROCESS global/header.html.tmpl title = "Edit values for which field?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 7a0293866..a3d26a0d0 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -10,12 +10,7 @@ [% PROCESS global/header.html.tmpl title = 'Administer Flag Types' - style = " - table#flag_types_bugs tr th, - table#flag_types_attachments tr th { text-align: left; } - .inactive { color: #787878; } - .multiplicable { display: block; } - " + style_urls = ['skins/standard/admin.css'] onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');" javascript_urls=["js/productform.js"] doc_section = "flags-overview.html#flag-types" @@ -98,7 +93,7 @@ [% BLOCK display_flag_types %]
Field Value
- + diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index af7da33a6..ba61da3ee 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -19,6 +19,7 @@ [% PROCESS global/header.html.tmpl title = "Edit Groups" subheader = "This lets you edit the groups available to put users in." + style_urls = ['skins/standard/admin.css'] doc_section = "groups.html" %] diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl index ea98ca773..d3391d939 100644 --- a/template/en/default/admin/keywords/list.html.tmpl +++ b/template/en/default/admin/keywords/list.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select keyword" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index 7efee02b9..2318a76bb 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -22,7 +22,7 @@ %]
Edit name ... Description Sortkey
- + diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl index 16382799f..20e4f6138 100644 --- a/template/en/default/admin/milestones/list.html.tmpl +++ b/template/en/default/admin/milestones/list.html.tmpl @@ -19,6 +19,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editmilestones.cgi?action=edit&product= diff --git a/template/en/default/admin/milestones/select-product.html.tmpl b/template/en/default/admin/milestones/select-product.html.tmpl index 18bb88c7e..ccc7e193b 100644 --- a/template/en/default/admin/milestones/select-product.html.tmpl +++ b/template/en/default/admin/milestones/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit milestones for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl index bf2675b16..5f6f1bfc0 100644 --- a/template/en/default/admin/params/common.html.tmpl +++ b/template/en/default/admin/params/common.html.tmpl @@ -107,10 +107,10 @@ [% END %] [% ELSE %] - + Unknown param type [% param.type FILTER html %]!!! - - [% END %] + + [% END %]

[% UNLESS param.no_reset %]

diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index f1d6aa429..626513526 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -25,7 +25,7 @@ %]

Field Value
- + @@ -42,7 +42,7 @@ [% IF classification.description %] [% classification.description FILTER html_light %] [% ELSE %] - missing + missing [% END %] @@ -59,13 +59,7 @@ [%# descriptions are intentionally not filtered to allow html content %] - + [% IF Param('usetargetmilestone') %] @@ -111,14 +105,7 @@ [% FOREACH c = product.components %] - [%# descriptions are intentionally not filtered to allow html content %] - + [% END %]
Field Value
Description: - [% IF product.description %] - [% product.description FILTER html_light %] - [% ELSE %] - missing - [% END %] - [% product.description FILTER html_light %]
[% c.name FILTER html %]: - [% IF c.description %] - [% c.description FILTER html_light %] - [% ELSE %] - missing - [% END %] - [% c.description FILTER html_light %]
@@ -214,7 +201,7 @@ [% ELSE %] - +
@@ -70,7 +66,7 @@ versions:
[% END %] [% ELSE %] - missing + missing [% END %] @@ -87,7 +83,7 @@ versions:
[% END %] [% ELSE %] - missing + missing [% END %] diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 1ba600271..62e1439ad 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -10,7 +10,8 @@ Edit Group Controls for [% product.name FILTER html %] [% END %] [% PROCESS global/header.html.tmpl - title = title + title = title + style_urls = ['skins/standard/admin.css'] %] [% display_headers = 1 %] @@ -24,7 +25,7 @@
There diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index 713f30aeb..fdbbe42c2 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -45,16 +45,12 @@ [% FOREACH component = product.components %] [% component.name FILTER html %]:  - [% IF component.description %] - [% component.description FILTER html_light %] - [% ELSE %] - description missing - [% END %] + [%- component.name FILTER uri %]">[% component.name FILTER html %]: + [% component.description FILTER html_light %]
[% END %] [% ELSE %] - missing + missing [% END %]
- + @@ -37,7 +38,7 @@ [% END %] [% IF !group.group.isactive %] - + diff --git a/template/en/default/admin/products/list-classifications.html.tmpl b/template/en/default/admin/products/list-classifications.html.tmpl index ea32a0057..a13d2be0f 100644 --- a/template/en/default/admin/products/list-classifications.html.tmpl +++ b/template/en/default/admin/products/list-classifications.html.tmpl @@ -16,6 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select Classification" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 364cf79e9..d09a552e2 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -26,6 +26,7 @@ [% PROCESS global/header.html.tmpl title = "Select product $classification_title" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl index abc0e5775..b8492dcb2 100644 --- a/template/en/default/admin/table.html.tmpl +++ b/template/en/default/admin/table.html.tmpl @@ -68,7 +68,7 @@ [%################### TABLE HEADER ######################%]
Group Entry MemberControl
[% group.group.name FILTER html %] Disabled [% group.bug_count FILTER html %]
- + [% FOREACH c = columns %] [%# Default to align left for headers %]
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index ff23b7727..38f36f57f 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -16,7 +16,7 @@ [% PROCESS global/header.html.tmpl title = "Select user" - style_urls = ['skins/standard/editusers.css'] + style_urls = ['skins/standard/admin.css', 'skins/standard/editusers.css'] doc_section = "useradmin.html" %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index 85c297647..ca5b4ef21 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -22,7 +22,7 @@ %] - + diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl index 1cf3e8643..ee69ee03e 100644 --- a/template/en/default/admin/versions/list.html.tmpl +++ b/template/en/default/admin/versions/list.html.tmpl @@ -15,6 +15,7 @@ '[% product.name FILTER html %]'[% END %] [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] [% edit_contentlink = BLOCK %]editversions.cgi?action=edit&product= diff --git a/template/en/default/admin/versions/select-product.html.tmpl b/template/en/default/admin/versions/select-product.html.tmpl index e40e4086c..e19aa18cc 100644 --- a/template/en/default/admin/versions/select-product.html.tmpl +++ b/template/en/default/admin/versions/select-product.html.tmpl @@ -13,6 +13,7 @@ [% PROCESS global/header.html.tmpl title = "Edit versions for which product?" + style_urls = ['skins/standard/admin.css'] %] [% columns = [ diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl index 9eaaa7b28..c03d58641 100644 --- a/template/en/default/attachment/confirm-delete.html.tmpl +++ b/template/en/default/attachment/confirm-delete.html.tmpl @@ -17,11 +17,12 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] doc_section = "attachments.html" %]
Field Value
- + @@ -55,7 +56,7 @@

Confirmation

-
Field Value
+
The content of this attachment will be deleted in an irreversible way. diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 8791e0dfe..be946ee89 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -33,7 +33,7 @@
- diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index 68bb95b3d..181b76e62 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -16,25 +16,9 @@ [% PROCESS global/header.html.tmpl title = "Enter $terms.ABug" onload = "PutDescription()" - style = "#somebugs { width: 100%; height: 500px }" + style_urls = ['skins/standard/enter_bug.css'] %] -[% style = "" %] - -

- - This is a template used on mozilla.org. This template, and the - comment-guided.txt.tmpl template that formats the data submitted via - the form in this template, are included as a demo of what it's - possible to do with custom templates in general, and custom [% terms.bug %] - entry templates in particular. As much of the text will not apply, - you should alter it - if you want to use this form on your [% terms.Bugzilla %] installation. - -

- -[% tablecolour = "#FFFFCC" %] - [%# This script displays the descriptions for selected components. %]
+