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 --- .../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 +- 4 files changed, 80 insertions(+), 82 deletions(-) (limited to 'template/en/default/admin/products') diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index 626513526..2e02068a4 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -24,20 +24,19 @@ style_urls = ['skins/standard/admin.css'] %] - +
- - + + [% IF Param('useclassification') %] - + - - [%# descriptions are intentionally not filtered to allow html content %] + - - + - - [%# descriptions are intentionally not filtered to allow html content %] - + + [% IF Param('usetargetmilestone') %] - + - +
FieldValueFieldValue
Classification:Classification [% classification.name FILTER html %]
Classification Description:Classification Description [% IF classification.description %] [% classification.description FILTER html_light %] @@ -49,22 +48,21 @@ [% END %]
Product: + Product [% product.name FILTER html %]
Description:[% product.description FILTER html_light %]Description[% product.description FILTER html_light %]
Milestone URL:Milestone URL [% IF product.milestone_url %] @@ -78,7 +76,7 @@ [% END %]
Closed for [% terms.bugs %]:Closed for [% terms.bugs %] [% IF product.is_active %] open @@ -93,15 +91,15 @@ [% IF product.components.size > 0 %] - Components: + Components [% ELSE %] - Components: + Components [% END %] [% IF product.components.size > 0 %] - +
[% FOREACH c = product.components %] @@ -119,17 +117,19 @@ - - +
[% c.name FILTER html %]: [% IF product.versions.size > 0 %] - Versions: + Versions [% ELSE %] - Versions: + Versions [% END %] [% IF product.versions.size > 0 %] - [% FOREACH v = product.versions %] - [% v.name FILTER html %]
- [% END %] +
+ [% FOREACH v = product.versions %] + [% v.name FILTER html %]
+ [% END %] +
[% ELSE %] none [% END %] @@ -139,20 +139,22 @@ [% IF Param('usetargetmilestone') %]
+ [% IF product.milestones.size > 0 %] - Milestones: + Milestones [% ELSE %] - Milestones: + Milestones [% END %] [% IF product.milestones.size > 0 %] - [% FOREACH m = product.milestones %] - [% m.name FILTER html %]
- [% END %] +
+ [% FOREACH m = product.milestones %] + [% m.name FILTER html %]
+ [% END %] +
[% ELSE %] none [% END %] @@ -161,7 +163,7 @@ [% END %]
[% terms.Bugs %]:[% terms.Bugs %] [% IF product.bug_count %] Sorry, there - - [% IF product.bug_count > 1 %] - are [% product.bug_count FILTER html %] [%+ terms.bugs %] - [% ELSE %] - is 1 [% terms.bug %] - [% END %] - - outstanding for this product. You must reassign - - [% IF product.bug_count > 1 %] - those [% terms.bugs %] - [% ELSE %] - that [% terms.bug %] - [% END %] - - to another product before you can delete this one.

+

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

[% ELSE %] - - - - -
- There - [% IF product.bug_count > 1 %] - are [% product.bug_count FILTER html %] [%+ terms.bugs %] - [% ELSE %] - is 1 [% terms.bug %] - [% END %] - entered for this product! When you delete this - product, ALL stored [% terms.bugs %] and - their history will be deleted, too. -
+

+ There + [% IF product.bug_count > 1 %] + are [% product.bug_count FILTER html %] [%+ terms.bugs %] + [% ELSE %] + is 1 [% terms.bug %] + [% END %] + entered for this product! When you delete this product, ALL + stored [% terms.bugs %] and their history will be deleted, too. +

[% END %] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index 576e216d6..da63a2ff5 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -30,7 +30,7 @@ %]
- +
[% PROCESS "admin/products/edit-common.html.tmpl" %] diff --git a/template/en/default/admin/products/edit.html.tmpl b/template/en/default/admin/products/edit.html.tmpl index fdbbe42c2..21689d9a7 100644 --- a/template/en/default/admin/products/edit.html.tmpl +++ b/template/en/default/admin/products/edit.html.tmpl @@ -30,12 +30,12 @@ %] -
+
[% PROCESS "admin/products/edit-common.html.tmpl" %] - - [% IF Param('usetargetmilestone') %] - [% END %] - - +
+ Edit components: @@ -55,16 +55,16 @@
- Edit -versions: + + Edit versions: [%- IF product.versions.size -%] - [% FOREACH v = product.versions %] - [% v.name FILTER html %] -
- [% END %] +
+ [% FOREACH v = product.versions %] + [% v.name FILTER html %]
+ [% END %] +
[% ELSE %] missing [% END %] @@ -72,16 +72,17 @@ versions:
+ Edit milestones: [%- IF product.milestones.size -%] - [%- FOREACH m = product.milestones -%] - [% m.name FILTER html %] -
- [% END %] +
+ [%- FOREACH m = product.milestones -%] + [% m.name FILTER html %]
+ [% END %] +
[% ELSE %] missing [% END %] @@ -89,7 +90,7 @@ versions:
+ Edit Group Access Controls: @@ -98,7 +99,7 @@ versions: [% IF product.group_controls.size %] [% FOREACH g = product.group_controls.values.sort("name") %] - [% g.group.name FILTER html %]:  + [% g.group.name FILTER html %]: [% IF g.group.isactive %] [% group_control.${g.membercontrol} FILTER html %]/ [% group_control.${g.othercontrol} FILTER html %] @@ -119,8 +120,10 @@ versions:
[% terms.Bugs %]: - [% product.bug_count FILTER html %] + + [% product.bug_count FILTER html %] +
diff --git a/template/en/default/admin/products/groupcontrol/edit.html.tmpl b/template/en/default/admin/products/groupcontrol/edit.html.tmpl index 62e1439ad..876d95f92 100644 --- a/template/en/default/admin/products/groupcontrol/edit.html.tmpl +++ b/template/en/default/admin/products/groupcontrol/edit.html.tmpl @@ -24,7 +24,7 @@ - +
@@ -40,7 +40,7 @@ [% IF !group.group.isactive %] - + [% ELSE %] @@ -167,7 +167,7 @@ indicate which [% terms.bugs %] will be placed in this group according to the following definitions.

-
Group Entry
[% group.group.name FILTER html %]DisabledDisabled [% group.bug_count FILTER html %]
+
MemberControl -- cgit v1.2.3-24-g4f1b