aboutsummaryrefslogtreecommitdiffstats
path: root/templates/email
diff options
context:
space:
mode:
Diffstat (limited to 'templates/email')
-rw-r--r--templates/email/bromley/questionnaire.txt4
-rw-r--r--templates/email/bromley/signature.txt3
-rw-r--r--templates/email/default/alert-confirm.txt7
-rw-r--r--templates/email/default/alert-problem-area.txt3
-rw-r--r--templates/email/default/alert-problem-council.txt3
-rw-r--r--templates/email/default/alert-problem-nearby.txt3
-rw-r--r--templates/email/default/alert-problem-ward.txt3
-rw-r--r--templates/email/default/alert-problem.txt3
-rw-r--r--templates/email/default/alert-update.txt3
-rw-r--r--templates/email/default/login.txt3
-rw-r--r--templates/email/default/partial.txt3
-rw-r--r--templates/email/default/problem-confirm.txt7
-rw-r--r--templates/email/default/questionnaire.txt3
-rw-r--r--templates/email/default/reply-autoresponse2
-rw-r--r--templates/email/default/signature.txt2
-rw-r--r--templates/email/default/submit-brent.txt5
-rw-r--r--templates/email/default/submit-example.txt2
-rw-r--r--templates/email/default/submit.txt5
-rw-r--r--templates/email/default/update-confirm.txt5
19 files changed, 29 insertions, 40 deletions
diff --git a/templates/email/bromley/questionnaire.txt b/templates/email/bromley/questionnaire.txt
index 7cdc10131..4328479e1 100644
--- a/templates/email/bromley/questionnaire.txt
+++ b/templates/email/bromley/questionnaire.txt
@@ -11,9 +11,7 @@ updating the status of your problem:
This email has been sent automatically from an unmonitored
mailbox, please do not reply.
-Customer Service Centre
-London Borough of Bromley
-Email: csc@bromley.gov.uk
+[% INCLUDE 'signature.txt' %]
Your problem was as follows:
diff --git a/templates/email/bromley/signature.txt b/templates/email/bromley/signature.txt
new file mode 100644
index 000000000..776ba3527
--- /dev/null
+++ b/templates/email/bromley/signature.txt
@@ -0,0 +1,3 @@
+Customer Service Centre
+London Borough of Bromley
+Email: csc@bromley.gov.uk
diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt
index fae3f2963..abf7801f5 100644
--- a/templates/email/default/alert-confirm.txt
+++ b/templates/email/default/alert-confirm.txt
@@ -1,14 +1,13 @@
-Subject: Confirm your alert on FixMyStreet
+Subject: Confirm your alert on [% c.cobrand.site_name %]
Hi,
Please click on the link below to confirm the alert you just
-asked to subscribe to on FixMyStreet:
+asked to subscribe to on [% c.cobrand.site_name %]:
[% token_url %]
If you can't click the link, please copy and paste it to the
address bar of your web browser.
-Yours,
-The FixMyStreet team
+[% INCLUDE 'signature.txt' %]
diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt
index 8c41aaf5e..3696c87d4 100644
--- a/templates/email/default/alert-problem-area.txt
+++ b/templates/email/default/alert-problem-area.txt
@@ -5,8 +5,7 @@ The following new problems have been added within
<?=$values['data']?>
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are new problems in
<?=$values['area_name']?>, please follow this link:
diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt
index 572e057a6..5544a2043 100644
--- a/templates/email/default/alert-problem-council.txt
+++ b/templates/email/default/alert-problem-council.txt
@@ -4,8 +4,7 @@ The following new problems have been reported to <?=$values['area_name']?>:
<?=$values['data']?>
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are new problems reported to
<?=$values['area_name']?>, please follow this link:
diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt
index 0bf8483a7..0c88dab5a 100644
--- a/templates/email/default/alert-problem-nearby.txt
+++ b/templates/email/default/alert-problem-nearby.txt
@@ -4,8 +4,7 @@ The following nearby problems have been added:
<?=$values['data']?>
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are nearby problems,
please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt
index efcf15993..9793bcdac 100644
--- a/templates/email/default/alert-problem-ward.txt
+++ b/templates/email/default/alert-problem-ward.txt
@@ -5,8 +5,7 @@ within <?=$values['ward_name']?>:
<?=$values['data']?>
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are new problems reported to
<?=$values['area_name']?> within <?=$values['ward_name']?>,
diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt
index 8369b8e28..01e184e0a 100644
--- a/templates/email/default/alert-problem.txt
+++ b/templates/email/default/alert-problem.txt
@@ -4,8 +4,7 @@ The following new problems have been added:
<?=$values['data']?>
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are new problems,
please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index ac0ddd50a..1140de1fa 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -11,8 +11,7 @@ To view or reply to these updates, please visit the following URL:
You cannot contact anyone by replying to this email.
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
To stop receiving emails when there are new updates on this problem,
please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt
index d24f1cc4f..608d99ee9 100644
--- a/templates/email/default/login.txt
+++ b/templates/email/default/login.txt
@@ -5,6 +5,5 @@ able to view your problem reports and manage them more easily.
[% c.uri_for_action( 'auth/token', token ) %]
-Yours,
-The FixMyStreet.com team
+[% INCLUDE 'signature.txt' %]
diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt
index 279d76ea0..82bc0cf0e 100644
--- a/templates/email/default/partial.txt
+++ b/templates/email/default/partial.txt
@@ -10,5 +10,4 @@ please visit the following URL:
Thanks!
-Yours,
-The FixMyStreet team
+[% INCLUDE 'signature.txt' %]
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index 58c1c75d1..5f5bd511a 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Confirm your problem on FixMyStreet
+Subject: Confirm your problem on [% c.cobrand.site_name %]
Hi [% report.name %],
Please click on the link below to confirm the problem you just
-added to FixMyStreet:
+added to [% c.cobrand.site_name %]:
[% token_url %]
@@ -16,5 +16,4 @@ Your problem had the title:
And details:
[% report.detail %]
-Yours,
-The FixMyStreet team
+[% INCLUDE 'signature.txt' %]
diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt
index 7ff184c41..88d4cc1b5 100644
--- a/templates/email/default/questionnaire.txt
+++ b/templates/email/default/questionnaire.txt
@@ -13,8 +13,7 @@ updating the status of your problem:
Please do not reply to this email; there is a public comment
box on the questionnaire.
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
Your problem was as follows:
diff --git a/templates/email/default/reply-autoresponse b/templates/email/default/reply-autoresponse
index 672c1f3c9..f984c66b0 100644
--- a/templates/email/default/reply-autoresponse
+++ b/templates/email/default/reply-autoresponse
@@ -19,5 +19,5 @@ unsubscribe link at the bottom of the email.
If you have a question or comment about the site, please send your
email to team@fixmystreet.com
-Yours,
+Yours,
The FixMyStreet team
diff --git a/templates/email/default/signature.txt b/templates/email/default/signature.txt
new file mode 100644
index 000000000..69ee38767
--- /dev/null
+++ b/templates/email/default/signature.txt
@@ -0,0 +1,2 @@
+Yours,
+The FixMyStreet team
diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt
index 4b3e20968..c94e6e1e4 100644
--- a/templates/email/default/submit-brent.txt
+++ b/templates/email/default/submit-brent.txt
@@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?>
Replies to this email will go to the user who submitted the problem.
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
This message was sent via FixMyStreet, a project of UKCOD, registered charity
number 1076346. If there is a more appropriate email address for messages about
@@ -40,5 +39,5 @@ also welcome any other feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.fixmystreet.com/for-councils
+Read more here: http://www.mysociety.org/for-councils/fixmystreet/
diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt
index 6d1815cd1..4956a7a93 100644
--- a/templates/email/default/submit-example.txt
+++ b/templates/email/default/submit-example.txt
@@ -57,5 +57,5 @@ feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.fixmystreet.com/for-councils
+Read more here: http://www.mysociety.org/for-councils/fixmystreet/
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index 20fa17096..a956b4add 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -29,8 +29,7 @@ Longitude: <?=$values['longitude']?>
Replies to this email will go to the user who submitted the problem.
-Yours,
-The FixMyStreet team
+<?=$values['signature']?>
This message was sent via FixMyStreet, a project of UKCOD, registered charity
number 1076346. If there is a more appropriate email address for messages about
@@ -40,5 +39,5 @@ also welcome any other feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.fixmystreet.com/for-councils
+Read more here: http://www.mysociety.org/for-councils/fixmystreet/
diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt
index c7571e76c..fdcd68edb 100644
--- a/templates/email/default/update-confirm.txt
+++ b/templates/email/default/update-confirm.txt
@@ -1,4 +1,4 @@
-Subject: Confirm your update on FixMyStreet
+Subject: Confirm your update on [% c.cobrand.site_name %]
Hi [% update.name %],
@@ -14,5 +14,4 @@ Your update reads:
[% update.text %]
-Yours,
-The FixMyStreet team
+[% INCLUDE 'signature.txt' %]