move survey advert beneath alert text to reduce user confusion

6 files changed, 47 insertions, 35 deletions

diff --git a/templates/email/fixmystreet/alert-problem-area.txt b/templates/email/fixmystreet/alert-problem-area.txt
index a02133118..4f1176685 100644
--- a/templates/email/fixmystreet/alert-problem-area.txt
+++ b/templates/email/fixmystreet/alert-problem-area.txt
@@ -1,5 +1,12 @@
 Subject: New problems in <?=$values['area_name']?> on FixMyStreet
 
+The following new problems have been added within
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+-------
+
 We're running a survey to help us understand who uses our sites. 
 If you have 10-15 minutes to spare then we'd be grateful if you 
 could take part: 
@@ -7,12 +14,7 @@ could take part:
 
 Thank you!
 
-------
-
-The following new problems have been added within
-<?=$values['area_name']?>:
-
-<?=$values['data']?>
+-------
 
 <?=$values['signature']?>
 
diff --git a/templates/email/fixmystreet/alert-problem-council.txt b/templates/email/fixmystreet/alert-problem-council.txt
index 1f76796d3..7c17ae163 100644
--- a/templates/email/fixmystreet/alert-problem-council.txt
+++ b/templates/email/fixmystreet/alert-problem-council.txt
@@ -1,5 +1,11 @@
 Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet
 
+The following new problems have been reported to <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+-------
+
 We're running a survey to help us understand who uses our sites. 
 If you have 10-15 minutes to spare then we'd be grateful if you 
 could take part: 
@@ -7,11 +13,7 @@ could take part:
 
 Thank you!
 
-------
-
-The following new problems have been reported to <?=$values['area_name']?>:
-
-<?=$values['data']?>
+-------
 
 <?=$values['signature']?>
 
diff --git a/templates/email/fixmystreet/alert-problem-nearby.txt b/templates/email/fixmystreet/alert-problem-nearby.txt
index 99b018400..44fbae742 100644
--- a/templates/email/fixmystreet/alert-problem-nearby.txt
+++ b/templates/email/fixmystreet/alert-problem-nearby.txt
@@ -1,5 +1,11 @@
 Subject: New nearby problems on FixMyStreet
 
+The following nearby problems have been added:
+
+<?=$values['data']?>
+
+-------
+
 We're running a survey to help us understand who uses our sites. 
 If you have 10-15 minutes to spare then we'd be grateful if you 
 could take part: 
@@ -9,10 +15,6 @@ Thank you!
 
 -------
 
-The following nearby problems have been added:
-
-<?=$values['data']?>
-
 <?=$values['signature']?>
 
 To stop receiving emails when there are nearby problems,
diff --git a/templates/email/fixmystreet/alert-problem-ward.txt b/templates/email/fixmystreet/alert-problem-ward.txt
index d0ad6ba6d..308f52ddd 100644
--- a/templates/email/fixmystreet/alert-problem-ward.txt
+++ b/templates/email/fixmystreet/alert-problem-ward.txt
@@ -1,5 +1,12 @@
 Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet
 
+The following new problems have been reported to <?=$values['area_name']?>
+within <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+-------
+
 We're running a survey to help us understand who uses our sites. 
 If you have 10-15 minutes to spare then we'd be grateful if you 
 could take part: 
@@ -7,12 +14,7 @@ could take part:
 
 Thank you!
 
-------
-
-The following new problems have been reported to <?=$values['area_name']?>
-within <?=$values['ward_name']?>:
-
-<?=$values['data']?>
+-------
 
 <?=$values['signature']?>
 
diff --git a/templates/email/fixmystreet/alert-problem.txt b/templates/email/fixmystreet/alert-problem.txt
index 588ffeeb6..3902f723b 100644
--- a/templates/email/fixmystreet/alert-problem.txt
+++ b/templates/email/fixmystreet/alert-problem.txt
@@ -1,5 +1,11 @@
 Subject: New problems on FixMyStreet
 
+The following new problems have been added:
+
+<?=$values['data']?>
+
+-------
+
 We're running a survey to help us understand who uses our sites. 
 If you have 10-15 minutes to spare then we'd be grateful if you 
 could take part: 
@@ -7,11 +13,7 @@ could take part:
 
 Thank you!
 
-------
-
-The following new problems have been added:
-
-<?=$values['data']?>
+-------
 
 <?=$values['signature']?>
 
diff --git a/templates/email/fixmystreet/alert-update.txt b/templates/email/fixmystreet/alert-update.txt
index 80e081eb6..c9054fe10 100644
--- a/templates/email/fixmystreet/alert-update.txt
+++ b/templates/email/fixmystreet/alert-update.txt
@@ -1,14 +1,5 @@
 Subject: New updates on problem - '<?=$values['title']?>'
 
-We're running a survey to help us understand who uses our sites. 
-If you have 10-15 minutes to spare then we'd be grateful if you 
-could take part: 
-    http://questions.mysociety.org/S/fms/e/
-
-Thank you!
-
-------
-
 The following updates have been left on this problem:
 
 <?=$values['data']?>
@@ -20,6 +11,17 @@ To view or reply to these updates, please visit the following URL:
 
 You cannot contact anyone by replying to this email.
 
+-------
+
+We're running a survey to help us understand who uses our sites.
+If you have 10-15 minutes to spare then we'd be grateful if you
+could take part:
+    http://questions.mysociety.org/S/fms/e/
+
+Thank you!
+
+-------
+
 <?=$values['signature']?>
 
 To stop receiving emails when there are new updates on this problem,