diff options
-rw-r--r-- | templates/web/base/auth/sign_out.html | 2 | ||||
-rw-r--r-- | templates/web/base/contact/submit.html | 2 | ||||
-rw-r--r-- | templates/web/base/questionnaire/completed.html | 2 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_alert.html | 2 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_problem.html | 1 | ||||
-rw-r--r-- | templates/web/base/tokens/confirm_update.html | 1 | ||||
-rw-r--r-- | templates/web/fixmystreet.com/next_steps.html | 24 | ||||
-rw-r--r-- | web/cobrands/fixmystreet.com/images/next-step-donate.png | bin | 0 -> 1034 bytes | |||
-rw-r--r-- | web/cobrands/fixmystreet.com/layout.scss | 1 |
9 files changed, 15 insertions, 20 deletions
diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html index c95efacf5..1a468b278 100644 --- a/templates/web/base/auth/sign_out.html +++ b/templates/web/base/auth/sign_out.html @@ -5,6 +5,6 @@ <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> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='signed out' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html index 4bf82dcd6..acb7caad9 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -16,6 +16,6 @@ [% END %] -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='contact form submitted' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html index 32aa8bd68..280cc33b8 100644 --- a/templates/web/base/questionnaire/completed.html +++ b/templates/web/base/questionnaire/completed.html @@ -16,6 +16,6 @@ [% END %] </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='questionnaire completed' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html index f0ad12ff8..0154f0225 100644 --- a/templates/web/base/tokens/confirm_alert.html +++ b/templates/web/base/tokens/confirm_alert.html @@ -14,6 +14,6 @@ </div> -[% INCLUDE next_steps.html %] +[% INCLUDE next_steps.html utm_content='email alert set up' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index a4573b5e6..ff9882d4b 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -36,6 +36,7 @@ [% INCLUDE next_steps.html, just_interacted = 1, + utm_content = 'problem confirmed', share_url = c.cobrand.base_url_for_report(report) _ report.url, twitter_comment = loc('I just reported a problem on @fixmystreet') %] diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html index 005a8a7ac..6b03308a5 100644 --- a/templates/web/base/tokens/confirm_update.html +++ b/templates/web/base/tokens/confirm_update.html @@ -20,6 +20,7 @@ END; [% INCLUDE next_steps.html, just_interacted = 1, + utm_content = 'update confirmed', share_url = c.cobrand.base_url_for_report(problem) _ problem.url, twitter_comment = loc('I just updated a problem on @fixmystreet') %] diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html index 2bfc23ddb..27d145e1d 100644 --- a/templates/web/fixmystreet.com/next_steps.html +++ b/templates/web/fixmystreet.com/next_steps.html @@ -2,23 +2,8 @@ [% DEFAULT share_url = c.cobrand.base_url %] [% DEFAULT twitter_comment = 'I just used @fixmystreet, you should try it!' %] -[% SET app_step = 1 IF NOT report OR NOT report.service %] -<div class="next-steps[% ' next-steps--two' IF NOT app_step %]"> - [% IF app_step %] - <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.com/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.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a> - </p> - </div> - [% END %] +<div class="next-steps"> <div class="next-steps__step next-steps__step--social"> [% IF just_interacted %] <h2>[% loc('Great work. Now spread the word!') %]</h2> @@ -32,6 +17,13 @@ <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a> </p> </div> + <div class="next-steps__step next-steps__step--donate"> + <h2>[% loc('Help support FixMyStreet') %]</h2> + <p>[% loc('Even a small donation of £5 today will help mySociety run sites like FixMyStreet.') %]</p> + <p class="next-steps__step__cta"> + <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.com&utm_content=[% utm_content | uri %]&utm_medium=link&utm_campaign=fms_thankyou_pages"><img src="/cobrands/fixmystreet.com/images/next-step-donate.png" alt="Donate now" width="138" 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"> diff --git a/web/cobrands/fixmystreet.com/images/next-step-donate.png b/web/cobrands/fixmystreet.com/images/next-step-donate.png Binary files differnew file mode 100644 index 000000000..20e136fd4 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-donate.png diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index ee9d8725e..60b65569f 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -179,6 +179,7 @@ body.frontpage { .next-steps { @include clearfix; + @include flex-container(); margin-bottom: 2em; // add some space between this and the footer } |