Add new "next steps" to bottom of success pages.

Remove the old CrossSell code. Fixes #972.

8 files changed, 73 insertions, 21 deletions

diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html
index fc416c2d7..ce57f648f 100644
--- a/templates/web/base/contact/submit.html
+++ b/templates/web/base/contact/submit.html
@@ -1,13 +1,12 @@
-[% INCLUDE 'header.html', title = loc('Contact Us'), bodyclass = 'fullwidthpage' %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Contact Us') %]
 
 <h1>[% loc('Contact the team') %]</h1>
- 
+
 [% IF success %]
 
     <p>
     [% loc("Thanks for your feedback.  We'll get back to you as soon as we can!") %]
     </p>
-    [% display_crosssell_advert( em, form_name, 'emailunvalidated', 1 ) %]
 
 [% ELSE %]
 
@@ -17,4 +16,6 @@
 
 [% END %]
 
+[% INCLUDE next_steps.html %]
+
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/next_steps.html b/templates/web/base/next_steps.html
new file mode 100644
index 000000000..9d5b22c80
--- /dev/null
+++ b/templates/web/base/next_steps.html
@@ -0,0 +1,5 @@
+[%#
+Override this file in your cobrand to show promotions or suggested next steps
+to your users after they perform major interactions like confirming or updating
+problem reports, setting up local area alerts, or signing out.
+%]
diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html
index 4d848a63c..1373a084f 100644
--- a/templates/web/base/questionnaire/completed.html
+++ b/templates/web/base/questionnaire/completed.html
@@ -1,28 +1,24 @@
-[%
-    INCLUDE 'header.html', title = loc('Questionnaire')
-%]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Questionnaire') %]
 
 [% advert_outcome = 1 %]
 
 [% IF been_fixed == 'Unknown' %]
-
-[% loc('<p>Thank you very much for filling in our questionnaire; if you
-get some more information about the status of your problem, please come back to the
-site and leave an update.</p>') %]
+    [% loc('<p>Thank you very much for filling in our questionnaire; if you
+    get some more information about the status of your problem, please come back to the
+    site and leave an update.</p>') %]
 
 [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %]
-
-[% INCLUDE 'questionnaire/completed-open.html' %]
-[% advert_outcome = 0 %]
+    [% INCLUDE 'questionnaire/completed-open.html' %]
+    [% advert_outcome = 0 %]
 
 [% ELSIF been_fixed == 'Yes' %]
-
-[% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>') %]
+    [% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>') %]
 
 [% END %]
 
 [% IF advert_outcome %]
-    [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.bodies_str ) %]
+    [% INCLUDE next_steps.html %]
+
 [% END %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html
index a33f7e92a..d7fbe4d7c 100644
--- a/templates/web/base/tokens/confirm_alert.html
+++ b/templates/web/base/tokens/confirm_alert.html
@@ -15,6 +15,6 @@
 
 </div>
 
-[% display_crosssell_advert( alert.user.email, alert.user.name ) %]
+[% INCLUDE next_steps.html %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html
index 8c92c874a..3346ce287 100644
--- a/templates/web/base/tokens/confirm_problem.html
+++ b/templates/web/base/tokens/confirm_problem.html
@@ -35,6 +35,11 @@
 
 </div>
 
-[% display_crosssell_advert( problem.user.email, problem.name ) %]
+[% INCLUDE
+  next_steps.html,
+  just_interacted = 1,
+  share_url = c.cobrand.base_url_for_report(problem) _ problem.url,
+  twitter_comment = 'I just reported a problem on @fixmystreet'
+%]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html
index 21fcfc4ff..a89da8555 100644
--- a/templates/web/base/tokens/confirm_update.html
+++ b/templates/web/base/tokens/confirm_update.html
@@ -19,6 +19,11 @@
 
 </div>
 
-[% display_crosssell_advert( update.user.email, update.name ) %]
+[% INCLUDE
+  next_steps.html,
+  just_interacted = 1,
+  share_url = c.cobrand.base_url_for_report(update.problem) _ update.problem.url,
+  twitter_comment = 'I just updated a problem on @fixmystreet'
+%]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html
new file mode 100644
index 000000000..1c286827d
--- /dev/null
+++ b/templates/web/fixmystreet.com/next_steps.html
@@ -0,0 +1,42 @@
+[%# A trio of suggested steps, shown on completion pages across FMS.com %]
+
+[% DEFAULT share_url = c.cobrand.base_url %]
+[% DEFAULT twitter_comment = 'I just used @fixmystreet, you should try it!' %]
+
+<div class="next-steps">
+  <div class="next-steps__step next-steps__step--apps">
+    [% IF just_interacted %]
+      <h2>[% loc('Next time, try our mobile app!') %]</h2>
+    [% ELSE %]
+      <h2>[% loc('Have you tried our mobile app?') %]</h2>
+    [% END %]
+    <p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p>
+    <p class="next-steps__step__cta">
+      <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a>
+      <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a>
+    </p>
+  </div>
+  <div class="next-steps__step next-steps__step--social">
+    [% IF just_interacted %]
+      <h2>[% loc('Great work. Now spread the word!') %]</h2>
+      <p>[% loc('Share your report on Twitter and Facebook, and let your friends join the conversation.') %]</p>
+    [% ELSE %]
+      <h2>[% loc('Spread the word about FixMyStreet!') %]</h2>
+      <p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p>
+    [% END %]
+    <p class="next-steps__step__cta">
+      <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&amp;url=[% share_url | uri %]&amp;related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a>
+      <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a>
+    </p>
+  </div>
+  <div class="next-steps__step next-steps__step--goodies">
+    <h2>[% loc('Free FixMyStreet goodies for you!') %]</h2>
+    <a href="/posters">
+      <img src="/cobrands/fixmystreet/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview">
+    </a>
+    <p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p>
+    <p class="next-steps__step__cta">
+      <a href="/posters"><img src="/cobrands/fixmystreet/images/next-step-download.png" alt="Download" width="120" height="37"></a>
+    </p>
+  </div>
+</div>
diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html
index 117d2d1bc..d5b6075ff 100644
--- a/templates/web/hart/tokens/confirm_problem.html
+++ b/templates/web/hart/tokens/confirm_problem.html
@@ -16,6 +16,4 @@ Note that Hart District Council is not responsible for this type of problem.  Ho
 <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.
 </p>
 
-[% display_crosssell_advert( problem.user.email, problem.name ) %]
-
 [% INCLUDE 'footer.html' %]