summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorMarcus von Appen <mva@FreeBSD.org>2016-09-12 18:33:42 +0200
committerGervase Markham <gerv@mozilla.org>2016-09-12 18:33:42 +0200
commit3d7f4c7c6d6c9c8b478d67ec7ef4fe69e30a2184 (patch)
treec842bf1b2d5ed1db89ece53da062e03a4de7654f /template/en/default
parenta43b2bbd196e4afe9c8d77dc5e4d0b09e1c1f3bd (diff)
downloadbugzilla-3d7f4c7c6d6c9c8b478d67ec7ef4fe69e30a2184.tar.gz
bugzilla-3d7f4c7c6d6c9c8b478d67ec7ef4fe69e30a2184.tar.xz
Bug 1070122 - add option to send test email to Params page
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/params/editparams.html.tmpl3
-rw-r--r--template/en/default/email/mta-test.txt.tmpl18
-rw-r--r--template/en/default/global/messages.html.tmpl10
3 files changed, 31 insertions, 0 deletions
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 4e1946dd8..a8b272039 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -93,6 +93,9 @@
<input type="hidden" name="action" value="save">
<input type="hidden" name="token" value="[% token FILTER html %]">
<input type="submit" id="save-params" value="Save Changes">
+ [% IF panel.name == "mta" %]
+ <input type="submit" id="save-and-test-mta-params" name="save-and-test-mta-params" value="Save Changes And Send Test Email">
+ [% END %]
</form>
[% END %]
</div>
diff --git a/template/en/default/email/mta-test.txt.tmpl b/template/en/default/email/mta-test.txt.tmpl
new file mode 100644
index 000000000..9add094b1
--- /dev/null
+++ b/template/en/default/email/mta-test.txt.tmpl
@@ -0,0 +1,18 @@
+[%# 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.
+ #%]
+
+Content-Type: text/plain
+From: [% Param('mailfrom') %]
+To: [% user.email %]
+Subject: [% terms.Bugzilla %] Email System Test Message
+X-Bugzilla-Type: admin
+
+Dear [% terms.Bugzilla %] administrator,
+
+This is a test email from your [% terms.Bugzilla %] system. If you can
+read this, your [% terms.Bugzilla %] can send email.
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 9f6464601..5db6aeb93 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -544,6 +544,16 @@
No changes made to milestone <em>[% milestone.name FILTER html %]</em>.
[% END %]
+ [% ELSIF message_tag == "mta_param_tests_run" %]
+ [% title = "Parameters Updated And Test Email Sent" %]
+ [% IF param_changed.size > 0 %]
+ [% FOREACH param = param_changed %]
+ Changed <em>[% param FILTER html %]</em>.<br>
+ [% END %]
+ <br>
+ [% END %]
+ Test mail sent to [% user.email %].
+
[% ELSIF message_tag == "parameters_updated" %]
[% title = "Parameters Updated" %]
[% IF param_changed.size > 0 %]