Add links to user survey to emails, front page and confirmation pages

Use the cross sell function to put an 'advert' for the survey on the
various confirmation pages
Create new alert email templates for fixmystreet co-brand so we can
include the survey link on those alone
All as one commit for ease of reverting when the survey is done.

8 files changed, 145 insertions, 0 deletions

diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm
index f9cde6936..231bb9361 100644
--- a/perllib/CrossSell.pm
+++ b/perllib/CrossSell.pm
@@ -142,6 +142,15 @@ details. You can unsubscribe at any time.</p>
 EOF
 }
 
+sub display_survey_link {
+    return <<EOF;
+<h1 style="padding-top:0.5em">User Survey</h1>
+<p>
+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 <a href="http://questions.mysociety.org/S/fms/w/" target="_blank">take part</a>.
+</p>
+EOF
+}
+
 # Not currently used, needs more explanation and testing; perhaps in future.
 sub display_gny_groups {
     my ($lon, $lat) = @_;
@@ -201,6 +210,11 @@ sub display_advert ($$;$%) {
 #EOF
 
     #unless (defined $data{done_tms} && $data{done_tms}==1) {
+    $c->stash->{scratch} = 'advert=survey';
+    return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">'
+        . display_survey_link()
+        . '</div>';
+
     $c->stash->{scratch} = 'advert=news';
     my $auth_signature = '';
     unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) {
diff --git a/templates/email/fixmystreet/alert-problem-area.txt b/templates/email/fixmystreet/alert-problem-area.txt
new file mode 100644
index 000000000..a02133118
--- /dev/null
+++ b/templates/email/fixmystreet/alert-problem-area.txt
@@ -0,0 +1,21 @@
+Subject: New problems in <?=$values['area_name']?> on FixMyStreet
+
+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 new problems have been added within
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+<?=$values['signature']?>
+
+To stop receiving emails when there are new problems in
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-council.txt b/templates/email/fixmystreet/alert-problem-council.txt
new file mode 100644
index 000000000..1f76796d3
--- /dev/null
+++ b/templates/email/fixmystreet/alert-problem-council.txt
@@ -0,0 +1,20 @@
+Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet
+
+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 new problems have been reported to <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+<?=$values['signature']?>
+
+To stop receiving emails when there are new problems reported to
+<?=$values['area_name']?>, please follow this link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-nearby.txt b/templates/email/fixmystreet/alert-problem-nearby.txt
new file mode 100644
index 000000000..99b018400
--- /dev/null
+++ b/templates/email/fixmystreet/alert-problem-nearby.txt
@@ -0,0 +1,19 @@
+Subject: New nearby problems on FixMyStreet
+
+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 nearby problems have been added:
+
+<?=$values['data']?>
+
+<?=$values['signature']?>
+
+To stop receiving emails when there are nearby problems,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-ward.txt b/templates/email/fixmystreet/alert-problem-ward.txt
new file mode 100644
index 000000000..d0ad6ba6d
--- /dev/null
+++ b/templates/email/fixmystreet/alert-problem-ward.txt
@@ -0,0 +1,21 @@
+Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet
+
+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 new problems have been reported to <?=$values['area_name']?>
+within <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+<?=$values['signature']?>
+
+To stop receiving emails when there are new problems reported to
+<?=$values['area_name']?> within <?=$values['ward_name']?>,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem.txt b/templates/email/fixmystreet/alert-problem.txt
new file mode 100644
index 000000000..588ffeeb6
--- /dev/null
+++ b/templates/email/fixmystreet/alert-problem.txt
@@ -0,0 +1,19 @@
+Subject: New problems on FixMyStreet
+
+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 new problems have been added:
+
+<?=$values['data']?>
+
+<?=$values['signature']?>
+
+To stop receiving emails when there are new problems,
+please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-update.txt b/templates/email/fixmystreet/alert-update.txt
new file mode 100644
index 000000000..80e081eb6
--- /dev/null
+++ b/templates/email/fixmystreet/alert-update.txt
@@ -0,0 +1,26 @@
+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']?>
+
+<?=$values['state_message']?>
+
+To view or reply to these updates, please visit the following URL:
+    <?=$values['problem_url']?>
+
+You cannot contact anyone by replying to this email.
+
+<?=$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/web/fixmystreet/around/postcode_form.html b/templates/web/fixmystreet/around/postcode_form.html
index ed5d700f0..c060c1a00 100644
--- a/templates/web/fixmystreet/around/postcode_form.html
+++ b/templates/web/fixmystreet/around/postcode_form.html
@@ -28,4 +28,9 @@
         </form>
         [% END %]
     </div>
+    [% IF c.cobrand.moniker == 'fixmystreet' %]
+        <div style="max-width: 30em; margin: 1em auto;">
+        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 <a href="http://questions.mysociety.org/S/fms/w/" target="_blank">take part</a>.
+        </div>
+    [% END %]
 </div>