From b3821a27575b9df948e7387b9499a020e4a2dd34 Mon Sep 17 00:00:00 2001 From: Sunil Joshi Date: Sun, 2 Dec 2012 19:23:58 +0100 Subject: Bug 460372: The confirmation thrown when deleting a custom field, component, version or product must have a red background if the deletion affects bugs r/a=LpSolit --- template/en/default/admin/components/confirm-delete.html.tmpl | 3 ++- template/en/default/admin/custom_fields/confirm-delete.html.tmpl | 3 ++- template/en/default/admin/milestones/confirm-delete.html.tmpl | 8 +++----- template/en/default/admin/products/confirm-delete.html.tmpl | 2 +- template/en/default/admin/versions/confirm-delete.html.tmpl | 3 ++- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl index f69efd9ec..d85e17c12 100644 --- a/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/template/en/default/admin/components/confirm-delete.html.tmpl @@ -19,6 +19,7 @@ from '[% product.name FILTER html %]' product [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] @@ -92,7 +93,7 @@ from '[% product.name FILTER html %]' product [% IF comp.bug_count %] [% IF !Param("allowbugdeletion") %] -

+

Sorry, there [% IF comp.bug_count > 1 %] 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 b1efc94a7..85338c003 100644 --- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl @@ -19,6 +19,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] doc_section = "custom-fields.html#delete-custom-fields" %] @@ -43,7 +44,7 @@

Confirmation

-

+

Are you sure you want to remove this field from the database?
This action will only be successful if the field is obsolete, and has never been used in [% terms.abug FILTER html %]. diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl index 5ab10c52c..d0b69b8ac 100644 --- a/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl @@ -18,6 +18,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %]

@@ -53,8 +54,7 @@ [% IF milestone.bug_count %] -
- -
+

There [% IF milestone.bug_count > 1 %] are [% milestone.bug_count FILTER none %] [%+ terms.bugs %] @@ -65,9 +65,7 @@ ALL of these [% terms.bugs %] will be retargeted to [% product.default_milestone FILTER html %], the default milestone for the [% product.name FILTER html %] product. -

- +

[% END %]

Do you really want to delete this milestone?

diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index 8d0d55c42..3b1c05fe2 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -194,7 +194,7 @@ [% IF !Param("allowbugdeletion") %] -

Sorry, there +

Sorry, there [% IF product.bug_count > 1 %] are [% product.bug_count FILTER html %] [%+ terms.bugs %] diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl index 3be089682..e6f39226f 100644 --- a/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/template/en/default/admin/versions/confirm-delete.html.tmpl @@ -18,6 +18,7 @@ [% PROCESS global/header.html.tmpl title = title + style_urls = ['skins/standard/admin.css'] %] @@ -52,7 +53,7 @@

Confirmation

[% IF version.bug_count %] -

+

Sorry, there [% IF version.bug_count > 1 %] are [% version.bug_count FILTER none %] outstanding [% terms.bugs %] -- cgit v1.2.3-24-g4f1b