diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 8d5e7c3eb71..dafe41fa9b2 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8501 \ No newline at end of file +8502 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/skins/standard/admin.css b/mozilla/webtools/bugzilla/skins/standard/admin.css index 0b138642c14..c2b822bbeb1 100644 --- a/mozilla/webtools/bugzilla/skins/standard/admin.css +++ b/mozilla/webtools/bugzilla/skins/standard/admin.css @@ -27,6 +27,12 @@ background-color: inherit; } +.confirmation { + background-color: red; + padding: 3ex; + width: 70%; +} + p.areyoureallyreallysure { color: red; font-size: 120%; diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl index f69efd9eca6..d85e17c12c8 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/components/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl index b1efc94a79a..85338c0034f 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/custom_fields/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/admin/milestones/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/milestones/confirm-delete.html.tmpl index 5ab10c52c44..d0b69b8aca6 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/milestones/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/admin/products/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/products/confirm-delete.html.tmpl index 8d0d55c4238..3b1c05fe2ae 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/template/en/default/admin/versions/confirm-delete.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/versions/confirm-delete.html.tmpl index 3be08968235..e6f39226fa2 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/versions/confirm-delete.html.tmpl +++ b/mozilla/webtools/bugzilla/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 %]