10 files changed, 92 insertions, 119 deletions
diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html
index 571e13f9f..c95efacf5 100644
--- a/templates/web/base/auth/sign_out.html
+++ b/templates/web/base/auth/sign_out.html
@@ -1,7 +1,10 @@
 [% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
 
-<h1>[% loc('You have been signed out') %]</h1>
+<div class="confirmation-header">
+  <h1>[% loc('You have been signed out') %]</h1>
+  <p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p>
+</div>
 
-<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p>
+[% INCLUDE next_steps.html %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html
index fc416c2d7..5adb87e2d 100644
--- a/templates/web/base/contact/submit.html
+++ b/templates/web/base/contact/submit.html
@@ -1,20 +1,21 @@
-[% 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 ) %]
+  <div class="confirmation-header">
+    <h1>[% loc('Thank you for your feedback') %]</h1>
+    <p>[% loc('We’ll get back to you as soon as we can.') %]</p>
+  </div>
 
 [% ELSE %]
 
-    <p>
-    [% tprintf( loc('Failed to send message.  Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %]
-    </p>
+  <div class="confirmation-header confirmation-header--failure">
+    <h1>[% loc('Failed to send message') %]</h1>
+    <p>[% loc('Try emailing us directly:') %] <a href="mailto:[% contact_email %]">[% contact_email %]</a></p>
+  </div>
 
 [% 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-open.html b/templates/web/base/questionnaire/completed-open.html
index c860b7341..0be40ac86 100644
--- a/templates/web/base/questionnaire/completed-open.html
+++ b/templates/web/base/questionnaire/completed-open.html
@@ -1,11 +1,3 @@
-[% IF c.cobrand.is_council %]
-<p style="font-size: 150%">
-Thank you very much for filling in our questionnaire.
-</p>
-[% ELSE %]
-[% loc('<p style="font-size:150%">We&rsquo;re sorry to hear that. We have two
-suggestions: why not try writing to your local representatives or, if
-it&rsquo;s a problem that could be fixed by local people working together, why
-not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>?
-</p>') %]
+[% IF ! c.cobrand.is_council %]
+    <p>[% loc('We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?') %]</p>
 [% END %]
diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html
index 4d848a63c..32aa8bd68 100644
--- a/templates/web/base/questionnaire/completed.html
+++ b/templates/web/base/questionnaire/completed.html
@@ -1,28 +1,21 @@
-[%
-    INCLUDE 'header.html', title = loc('Questionnaire')
-%]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Questionnaire') %]
 
-[% advert_outcome = 1 %]
+<div class="confirmation-header">
 
-[% IF been_fixed == 'Unknown' %]
+  <h1>[% loc('Thank you for your feedback') %]</h1>
 
-[% 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>') %]
+  [% IF been_fixed == 'Unknown' %]
+    <p>[% loc('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) %]
+  [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %]
+    [% INCLUDE 'questionnaire/completed-open.html' %]
 
-[% INCLUDE 'questionnaire/completed-open.html' %]
-[% advert_outcome = 0 %]
+  [% ELSIF been_fixed == 'Yes' %]
+    <p>[% loc('Glad to hear it’s been fixed!') %]</p>
 
-[% ELSIF been_fixed == 'Yes' %]
+  [% END %]
 
-[% 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 ) %]
-[% END %]
+</div>
+[% INCLUDE next_steps.html %]
 
 [% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html
index 6b15cbef9..41984dd9a 100644
--- a/templates/web/base/report/new/category_extras.html
+++ b/templates/web/base/report/new/category_extras.html
@@ -5,24 +5,21 @@
         [%- FOR meta IN category_extras.$category %]
         [%- meta_name = meta.code -%]
 
-[% IF field_errors.$meta_name %]
-    <div class='form-error'>[% field_errors.$meta_name %]</div>
-[% END -%]
-
-    <div class="form-field">
-        <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
-        [% IF meta.variable != 'false' %]
-            [% IF meta.exists('values') 
-            <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
-                [% FOR option IN meta.values.value.value %]
-                    <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+            <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
+            [% IF field_errors.$meta_name %]
+                <p class='form-error'>[% field_errors.$meta_name %]</p>
+            [% END -%]
+            [% IF meta.variable != 'false' %]
+                [% IF meta.exists('values') %]
+                    <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+                        [% FOR option IN meta.values.value %]
+                            <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
+                        [% END %]
+                    </select>
+                [% ELSE %]
+                    <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
                 [% END %]
-            </select>
-            [% ELSE %]
-            <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
             [% END %]
-        [% END %]
-    </div>
         [%- END %]
     [%- END %]
 </div>
diff --git a/templates/web/base/report_created.html b/templates/web/base/report_created.html
deleted file mode 100644
index 81083654b..000000000
--- a/templates/web/base/report_created.html
+++ /dev/null
@@ -1,9 +0,0 @@
-[% INCLUDE 'header.html', title => loc('Report created') %]
-
-<h1>[% loc("Report created") %]</h1>
-
-<p>
-[% loc('Your report has been created and will shortly be sent.') %] 
-</p>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html
index a33f7e92a..f0ad12ff8 100644
--- a/templates/web/base/tokens/confirm_alert.html
+++ b/templates/web/base/tokens/confirm_alert.html
@@ -1,20 +1,19 @@
 [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title =>  loc('Local RSS feeds and email alerts') %]
 
 <div class="confirmation-header">
-    <h1>[% loc('Local RSS feeds and email alerts') %]</h1>
 
-<p>
-[% IF confirm_type == 'subscribe' %]
-  [% loc('You have successfully confirmed your alert.') %]
-[% ELSIF confirm_type == 'unsubscribe' %]
-  [% loc('You have successfully deleted your alert.') %]
-[% ELSIF confirm_type == 'created' %]
-  [% loc('You have successfully created your alert.') %]
-[% END %]
-</p>
+  [% IF confirm_type == 'subscribe' || confirm_type == 'created' %]
+    <h1>[% loc('Email alert created') %]</h1>
+    <p>[% loc('Why stop there? <a href="/alert">Set up more alerts</a> for free.') %]</p>
+
+  [% ELSIF confirm_type == 'unsubscribe' %]
+    <h1>[% loc('Email alert deleted') %]</h1>
+    <p>[% loc('Inbox zero, here we come!') %]</p>
+
+  [% END %]
 
 </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..5892d0f9e 100644
--- a/templates/web/base/tokens/confirm_problem.html
+++ b/templates/web/base/tokens/confirm_problem.html
@@ -1,40 +1,30 @@
 [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation') %]
 
 <div class="confirmation-header">
-  <h1>[% loc('Your problem has been confirmed!') %]</h1>
 
-[% IF c.cobrand.is_council %]
+  <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1>
 
-  <p>
-    Thank you. You have successfully confirmed your report
-    and this will now be investigated by the council.
-    You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>.
-  </p>
-  <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p>
+  [% IF c.cobrand.is_council %]
+    <h2>Your issue is on its way to the council.</h2>
+    <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p>
 
-[% ELSE %]
+  [% ELSE %]
+    <h2>[% loc('Thank you for reporting this issue!') %]</h2>
+    [% IF report.bodies_str %]
+      <p>[% loc('It’s on its way to the council right now.') %]</p>
+    [% END %]
 
-  <p>
-    [% loc('Thank you for reporting this issue') %].
-    [% IF problem.bodies_str;
-         loc('<strong>We will now send it to the council</strong>.');
-     END; %]
-  </p>
-
-  <p>
-    [% tprintf(
-         loc( 'You can <a href="%s%s">view the problem on this site</a>.' ),
-         c.cobrand.base_url_for_report( problem ),
-         problem.url
-    ); %]
-  </p>
-
-[% END %]
+  [% END %]
 
 [% TRY %][% INCLUDE 'tokens/_extras_confirm.html' %][% CATCH file %][% END %]
 
 </div>
 
-[% display_crosssell_advert( problem.user.email, problem.name ) %]
+[% INCLUDE
+  next_steps.html,
+  just_interacted = 1,
+  share_url = c.cobrand.base_url_for_report(report) _ report.url,
+  twitter_comment = loc('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..01ac992ab 100644
--- a/templates/web/base/tokens/confirm_update.html
+++ b/templates/web/base/tokens/confirm_update.html
@@ -1,24 +1,26 @@
-[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Confirmation') %]
+[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation');
 
-<div class="confirmation-header">
-  <h1>[% loc('Your update has been confirmed!') %]</h1>
+DEFAULT problem = update.problem;
+SET problem_url = c.uri_for('/report', problem.id);
+IF update;
+    problem_url = problem_url _ '#update_' _ update.id;
+END;
 
-<p class="confirmed">
-[% IF creator_fixed %]
-[%
-    tprintf(loc('Thank you &mdash; you can <a href="%s">view your updated problem</a> on the site.'),
-        c.uri_for( '/report', problem_id ) );
-%]
-[% ELSE %]
-[%
-    tprintf( loc('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'),
-        c.uri_for( '/report', update.problem.id ) _ '#update_' _ update.id );
 %]
-[% END %]
-</p>
+
+<div class="confirmation-header">
+
+  <h1><a href="[% problem_url %]">[% problem.title %]</a></h1>
+
+  <h2>[% loc('Thank you for updating this issue!') %]</h2>
 
 </div>
 
-[% display_crosssell_advert( update.user.email, update.name ) %]
+[% INCLUDE
+  next_steps.html,
+  just_interacted = 1,
+  share_url = c.cobrand.base_url_for_report(problem) _ problem.url,
+  twitter_comment = loc('I just updated a problem on @fixmystreet')
+%]
 
 [% INCLUDE 'footer.html' %]