diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/web/base/auth/sign_out.html | 7 | ||||
| -rw-r--r-- | templates/web/base/contact/submit.html | 16 | ||||
| -rw-r--r-- | templates/web/base/questionnaire/completed-open.html | 12 | ||||
| -rw-r--r-- | templates/web/base/questionnaire/completed.html | 25 | ||||
| -rw-r--r-- | templates/web/base/tokens/confirm_alert.html | 19 | ||||
| -rw-r--r-- | templates/web/base/tokens/confirm_problem.html | 37 | ||||
| -rw-r--r-- | templates/web/base/tokens/confirm_update.html | 23 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/questionnaire/completed-open.html | 16 |
8 files changed, 61 insertions, 94 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 ce57f648f..5adb87e2d 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -1,18 +1,18 @@ [% 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> + <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 %] 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’re sorry to hear that. We have two -suggestions: why not try writing to your local representatives or, if -it’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’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 1373a084f..32aa8bd68 100644 --- a/templates/web/base/questionnaire/completed.html +++ b/templates/web/base/questionnaire/completed.html @@ -1,24 +1,21 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Questionnaire') %] -[% advert_outcome = 1 %] +<div class="confirmation-header"> -[% 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>') %] + <h1>[% loc('Thank you for your feedback') %]</h1> -[% 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 %] + [% 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 been_fixed == 'Yes' %] - [% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>') %] + [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] + [% INCLUDE 'questionnaire/completed-open.html' %] -[% END %] + [% ELSIF been_fixed == 'Yes' %] + <p>[% loc('Glad to hear it’s been fixed!') %]</p> -[% IF advert_outcome %] - [% INCLUDE next_steps.html %] + [% END %] -[% END %] +</div> +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html index d7fbe4d7c..f0ad12ff8 100644 --- a/templates/web/base/tokens/confirm_alert.html +++ b/templates/web/base/tokens/confirm_alert.html @@ -1,17 +1,16 @@ [% 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> diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 3346ce287..524339cf6 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -1,35 +1,20 @@ [% 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( problem ) %][% problem.url %]">[% problem.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 problem is [% problem.id %], please quote it in any enquiries.</p> -[% ELSE %] + [% ELSE %] + <h2>[% loc('Thank you for reporting this issue!') %]</h2> + [% IF problem.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 %] @@ -39,7 +24,7 @@ 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' + 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 a89da8555..a230894ef 100644 --- a/templates/web/base/tokens/confirm_update.html +++ b/templates/web/base/tokens/confirm_update.html @@ -1,21 +1,16 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Confirmation') %] -<div class="confirmation-header"> - <h1>[% loc('Your update has been confirmed!') %]</h1> - -<p class="confirmed"> [% IF creator_fixed %] -[% - tprintf(loc('Thank you — you can <a href="%s">view your updated problem</a> on the site.'), - c.uri_for( '/report', problem_id ) ); -%] + [% problem_url = 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 ); -%] + [% problem_url = c.uri_for( '/report', update.problem.id ) _ '#update_' _ update.id %] [% END %] -</p> + +<div class="confirmation-header"> + + <h1><a href="[% problem_url %]">[% update.problem.title %]</a></h1> + + <h2>[% loc('Thank you for updating this issue!') %]</h2> </div> @@ -23,7 +18,7 @@ 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' + twitter_comment = loc('I just updated a problem on @fixmystreet') %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index df8e2d271..073fb0438 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -1,23 +1,19 @@ -[% IF c.cobrand.is_council %] - <p style="font-size: 150%"> - Thank you very much for filling in our questionnaire. - </p> -[% ELSE %] - <p style="font-size:150%">We’re sorry to hear that your problem hasn't been fixed.</p> +[% IF ! c.cobrand.is_council %] + <h2>We’re sorry to hear that your problem hasn’t been fixed.</h2> <p> - FixMyStreet helps you send a report to your council, but we're not responsible for fixing things. - If you'd like to chase your issue, please search your inbox for the latest reply, or auto-reply + FixMyStreet helps you send a report to your council, but we’re not responsible for fixing things. + If you’d like to chase your issue, please search your inbox for the latest reply, or auto-reply from your council, and respond to that. </p> <p> - Meanwhile, if you're getting nowhere, you might consider writing to your local councillor or other + Meanwhile, if you’re getting nowhere, you might consider writing to your local councillor or other representative to see if they can help. </p> <p> - You can do this on <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>, another + You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another useful mySociety website. </p> [% END %] |