diff options
Diffstat (limited to 'templates/web')
| -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/reports/_list-filters.html | 12 | ||||
| -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 | ||||
| -rwxr-xr-x | templates/web/fixmystreet.com/about/faq-en-gb.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/contact/who.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/footer_extra.html | 6 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/next_steps.html | 24 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/questionnaire/completed-open.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/static/unresponsive.html | 2 |
13 files changed, 33 insertions, 27 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/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 73afe64f4..ef7c7ad78 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -9,9 +9,21 @@ <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option> <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option> [% END %] + [% IF c.user_exists AND c.user.is_superuser OR c.user.belongs_to_body(body.id) %] + <option value="confirmed"[% ' selected' IF filter_status.confirmed %]>[% loc('Open') %]</option> + <option value="investigating"[% ' selected' IF filter_status.investigating %]>[% loc('Investigating') %]</option> + <option value="in progress"[% ' selected' IF filter_status.in_progress %]>[% loc('In progress') %]</option> + <option value="action scheduled"[% ' selected' IF filter_status.action_scheduled %]>[% loc('Action scheduled') %]</option> + <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option> + <option value="unable to fix"[% ' selected' IF filter_status.unable_to_fix %]>[% loc('No further action') %]</option> + <option value="not responsible"[% ' selected' IF filter_status.not_responsible %]>[% loc('Not responsible') %]</option> + <option value="internal referral"[% ' selected' IF filter_status.internal_referral %]>[% loc('Internal referral') %]</option> + <option value="duplicate"[% ' selected' IF filter_status.duplicate %]>[% loc('Duplicate') %]</option> + [% ELSE %] <option value="open"[% ' selected' IF filter_status.open %]>[% loc('Unfixed reports') %]</option> <option value="closed"[% ' selected' IF filter_status.closed %]>[% loc('Closed reports') %]</option> <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option> + [% END %] </select> [% END %] 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/about/faq-en-gb.html b/templates/web/fixmystreet.com/about/faq-en-gb.html index f9bffdf01..fddac7952 100755 --- a/templates/web/fixmystreet.com/about/faq-en-gb.html +++ b/templates/web/fixmystreet.com/about/faq-en-gb.html @@ -318,7 +318,7 @@ correspondence to you – or if you only have an auto-response, you may be able to find further contact details there. <p>If you still have no joy, we suggest starting a new FixMyStreet report. You may also like to use another useful mySociety website, <a -href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=static_links&utm_medium=link&utm_content=help+what_now">WriteToThem</a>, +href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=static_links&utm_medium=link&utm_content=help+what_now">WriteToThem</a>, to contact your local councillors and ask them to help. </dd> diff --git a/templates/web/fixmystreet.com/contact/who.html b/templates/web/fixmystreet.com/contact/who.html index 5fad05dd2..e16809e48 100644 --- a/templates/web/fixmystreet.com/contact/who.html +++ b/templates/web/fixmystreet.com/contact/who.html @@ -44,7 +44,7 @@ <p> <strong>If you're not having any luck getting your community problems fixed</strong>, you could try contacting your local councillor, using another useful mySociety site: - <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=contact_workflow_links&utm_medium=link&utm_content=contact+not_fixed">WriteToThem</a>. + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=contact_workflow_links&utm_medium=link&utm_content=contact+not_fixed">WriteToThem</a>. </p> [% END %] diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html index 0eee4a802..4d14d8fb5 100644 --- a/templates/web/fixmystreet.com/footer_extra.html +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -47,7 +47,7 @@ <div class="col-sm-3"> <div class="mysoc-footer__donate"> <p>Your donations keep this site and others like it running</p> - <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.com&utm_content=footer+donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a> + <a href="https://www.mysociety.org/donate?utm_source=fixmystreet.com&utm_content=footer+donate+now&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__donate__button">Donate now</a> </div> </div> @@ -59,7 +59,7 @@ <div class="mysoc-footer__orgs"> <p class="mysoc-footer__org"> Built by - <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> + <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+logo&utm_medium=link&utm_campaign=mysoc_footer" class="mysoc-footer__org__logo mysoc-footer__org__logo--mysociety">mySociety</a> </p> <p class="mysoc-footer__org"> Powered by @@ -70,7 +70,7 @@ <div class="col-sm-4"> <div class="mysoc-footer__legal"> - <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p> + <p>mySociety Limited is a project of UK Citizens Online Democracy, a registered charity in England and Wales. For full details visit <a href="https://www.mysociety.org?utm_source=fixmystreet.com&utm_content=footer+full+legal+details&utm_medium=link&utm_campaign=mysoc_footer">mysociety.org</a>.</p> </div> </div> diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html index 2bfc23ddb..e561b9d98 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/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index f10d5d266..86ea4742a 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -13,7 +13,7 @@ </p> <p> - You can do this on <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=completed+unfixed">WriteToThem</a>, another + You can do this on <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=completed+unfixed">WriteToThem</a>, another useful mySociety website. </p> [% END %] diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html index 8014ab8e1..5d9b4bfab 100644 --- a/templates/web/fixmystreet.com/static/unresponsive.html +++ b/templates/web/fixmystreet.com/static/unresponsive.html @@ -26,7 +26,7 @@ <h2>If you’d prefer to use FixMyStreet next time:</h2> - <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=unresponsive_council+cta" class="unresponsive-council-cta"> + <a href="https://www.writetothem.com/?utm_source=fixmystreet.com&utm_campaign=workflow_links&utm_medium=link&utm_content=unresponsive_council+cta" class="unresponsive-council-cta"> <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay </a> |