summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-08-26 11:25:56 +0200
committerByron Jones <glob@mozilla.com>2014-08-26 11:25:56 +0200
commit84a7731d1b8da6e2c03581a9910f614b689b33f3 (patch)
treef8a0b9bf5d77ac69817fc50de7f7765b98db1e85
parent726d3c1b09a6563c2a8364204a68f5f05c41caa0 (diff)
downloadbugzilla-84a7731d1b8da6e2c03581a9910f614b689b33f3.tar.gz
bugzilla-84a7731d1b8da6e2c03581a9910f614b689b33f3.tar.xz
Bug 1058479: move the "mozilla employees" warning on bugzilla::admin next to the submit button
-rw-r--r--extensions/BMO/template/en/default/bug/create/user-message.html.tmpl40
-rw-r--r--extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl33
2 files changed, 38 insertions, 35 deletions
diff --git a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
index 8e33caec5..b548ba127 100644
--- a/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/user-message.html.tmpl
@@ -1,22 +1,9 @@
-<!-- 1.0@bugzilla.org -->
-[%# The contents of this file are subject to the Mozilla Public
- # License Version 1.1 (the "License"); you may not use this file
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.mozilla.org/MPL/
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
- # Software distributed under the License is distributed on an "AS
- # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- # implied. See the License for the specific language governing
- # rights and limitations under the License.
- #
- # The Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Netscape Communications
- # Corporation. Portions created by Netscape are
- # Copyright (C) 1998 Netscape Communications Corporation. All
- # Rights Reserved.
- #
- # Contributor(s): Matthew Tuck <matty@chariot.net.au>
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
#%]
[% PROCESS global/variables.none.tmpl %]
@@ -35,20 +22,3 @@
most frequently reported [% terms.bugs %]</a> and <a href="https://bugzilla.mozilla.org/query.cgi">
search through descriptions</a> of previously reported [% terms.bugs %].
</p>
-
-[% IF product.name == 'Bugzilla' &&
- (user.in_group('mozilla-corporation') || user.in_group('mozilla-foundation')) %]
- <div id="bug_create_warning">
- <div id="bug_create_warning_image">
- <img src="extensions/BMO/web/images/sign_warning.png" width="32" height="32">
- </div>
- <div id="bug_create_warning_text">
- <b>Mozilla employees</b><br>
- This is not the place to request configuration, permission, or
- account changes to this installation of [% terms.Bugzilla %] (bugzilla.mozilla.org).<br>
- File such changes under the appropriate component in the
- <a href="enter_bug.cgi?product=bugzilla.mozilla.org;component=Administration"><b>bugzilla.mozilla.org</b></a>
- product.
- </div>
- </div>
-[% END %]
diff --git a/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl b/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl
new file mode 100644
index 000000000..a152527ba
--- /dev/null
+++ b/extensions/BMO/template/en/default/hook/bug/create/create-end.html.tmpl
@@ -0,0 +1,33 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+ # This Source Code Form is "Incompatible With Secondary Licenses", as
+ # defined by the Mozilla Public License, v. 2.0.
+ #%]
+
+[% RETURN UNLESS product.name == 'Bugzilla' &&
+ (user.in_group('mozilla-corporation') || user.in_group('mozilla-foundation')) %]
+
+<div id="bug_create_warning">
+ <div id="bug_create_warning_image">
+ <img src="extensions/BMO/web/images/sign_warning.png" width="32" height="32">
+ </div>
+ <div id="bug_create_warning_text">
+ <b>Mozilla employees</b><br>
+ This is <i>not</i> the place to request configuration, permission, or
+ account changes to this installation of [% terms.Bugzilla %] (bugzilla.mozilla.org).<br>
+ This includes, but is not limited to:
+ <ul>
+ <li>New or updates to products and components</li>
+ <li>Changes to the values of existing fields (versions, milestones, etc)</li>
+ </ul>
+ Instead, please file such changes under
+ <a href="enter_bug.cgi?product=bugzilla.mozilla.org;component=Administration">
+ <b>
+ the Administration component in the bugzilla.mozilla.org
+ </b>
+ </a>
+ product.
+ </div>
+</div>