diff options
| -rw-r--r-- | perllib/FixMyStreet/Map/Bristol.pm | 4 | ||||
| -rw-r--r-- | templates/email/bexley/_problem-confirm_footer.html | 12 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.html | 7 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.txt | 6 | ||||
| -rw-r--r-- | templates/email/default/problem-confirm.html | 1 | ||||
| -rw-r--r-- | templates/web/bexley/email_sent.html | 38 | ||||
| -rw-r--r-- | templates/web/bexley/front/pre-steps.html | 12 | ||||
| -rw-r--r-- | templates/web/bexley/tokens/_extras_confirm.html | 12 | ||||
| -rw-r--r-- | templates/web/buckinghamshire/front/pre-steps.html | 7 |
9 files changed, 96 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/Map/Bristol.pm b/perllib/FixMyStreet/Map/Bristol.pm index f6f5406de..70240a991 100644 --- a/perllib/FixMyStreet/Map/Bristol.pm +++ b/perllib/FixMyStreet/Map/Bristol.pm @@ -8,9 +8,9 @@ use strict; sub default_zoom { 5; } -sub urls { [ 'https://maps.bristol.gov.uk/arcgis/rest/services/base/2015_BCC_96dpi/MapServer/WMTS/tile' ] } +sub urls { [ 'https://maps.bristol.gov.uk/arcgis/rest/services/base/2019_Q2_BCC_96dpi/MapServer/WMTS/tile' ] } -sub layer_names { [ '2015_BCC_96dpi' ] } +sub layer_names { [ '2019_Q2_BCC_96dpi' ] } sub scales { my $self = shift; diff --git a/templates/email/bexley/_problem-confirm_footer.html b/templates/email/bexley/_problem-confirm_footer.html new file mode 100644 index 000000000..5a7cc2782 --- /dev/null +++ b/templates/email/bexley/_problem-confirm_footer.html @@ -0,0 +1,12 @@ +<p style="border: 0.1em solid rgb(252, 13, 27); padding: 0.5em; background-color: rgb(237, 207, 206);"> + <strong>While we find ourselves in these unprecedented times.</strong> + All issues reported on Bexley’s FixMyStreet system will continue to be + actioned to keep our roads safe for critical workers to be able to continue + to support the London Borough of Bexley and its residents. We may take + longer to respond to you while we concentrate on getting issues resolved in + priority order and within available resources. Non-urgent defects may also + take longer than normal to fix. We will continue to serve you the best that + we can but urge everyone not to make journeys unless absolutely necessary + and not report to anything that is not urgent. Thank you for + your understanding. +</p> diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html index 341df8120..8f790425f 100644 --- a/templates/email/buckinghamshire/other-reported.html +++ b/templates/email/buckinghamshire/other-reported.html @@ -22,6 +22,13 @@ using the email address associated with the report.</p> [% IF cobrand.owns_problem( report ) %] [% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] [% END %] + +<p style="[% p_style %]"> +Due to the current COVID 19 crisis and associated restrictions regrettably we +must prioritise more urgent work, therefore we hope you will understand that +there may be a delay in fixing the defect. +</p> + <p style="margin: 20px auto; text-align: center"> <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.view_url %]">View my report</a> </p> diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt index 4d354d3ed..8fa9cfb15 100644 --- a/templates/email/buckinghamshire/other-reported.txt +++ b/templates/email/buckinghamshire/other-reported.txt @@ -2,7 +2,7 @@ Subject: Your [% report.category | lower %] report has been logged Hello [% report.name %], -Your report to [% report.body %] has been logged on [% site_name %]. +Thank you for your report to [% report.body %] which has been logged on [% site_name %]. [% IF report.non_public ~%] It has been marked as private and will not be visible to the general public; @@ -15,6 +15,10 @@ associated with the report. [% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] [% END %] +Due to the current COVID 19 crisis and associated restrictions regrettably we +must prioritise more urgent work, therefore we hope you will understand that +there may be a delay in fixing the defect. + It is available to view at: [% cobrand.base_url_for_report(report) %][% report.view_url %] diff --git a/templates/email/default/problem-confirm.html b/templates/email/default/problem-confirm.html index b94a008f7..40b83a5a0 100644 --- a/templates/email/default/problem-confirm.html +++ b/templates/email/default/problem-confirm.html @@ -25,6 +25,7 @@ of problem, so it will instead be sent to [% report.body %]. <a style="[% button_style %]" href="[% token_url %]">Yes, send my report</a> </p> <p style="[% p_style %]">If you no longer wish to send this report, please take no further action.</p> + [% TRY %][% INCLUDE '_problem-confirm_footer.html' %][% CATCH file %][% END %] [% end_padded_box | safe %] </th> [% WRAPPER '_email_sidebar.html' object = report, url = token_url %] diff --git a/templates/web/bexley/email_sent.html b/templates/web/bexley/email_sent.html new file mode 100644 index 000000000..293959183 --- /dev/null +++ b/templates/web/bexley/email_sent.html @@ -0,0 +1,38 @@ +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Create a report') %] + +<div class="confirmation-header confirmation-header--inbox"> + + <h1>[% loc("Nearly done! Now check your email…") %]</h1> + + <p> + [% IF email_type == 'problem' %] + [% loc("Click the link in our confirmation email to publish your problem.") %] + [% ELSIF email_type == 'update' %] + [% loc("Click the link in our confirmation email to publish your update.") %] + [% ELSIF email_type == 'alert' %] + [% loc("Click the link in our confirmation email to activate your alert.") %] + [% END %] + </p> + + [% TRY %][% INCLUDE '_email_sent_extra.html' %][% CATCH file %][% END %] + + <p> + [% loc("Can’t find our email? Check your spam folder – that’s the solution 99% of the time.") %] + </p> + + <p style="border: 0.1em solid rgb(252, 13, 27); padding: 0.5em; background-color: rgb(237, 207, 206);"> + <strong>While we find ourselves in these unprecedented times.</strong> + All issues reported on Bexley’s FixMyStreet system will continue to be + actioned to keep our roads safe for critical workers to be able to continue + to support the London Borough of Bexley and its residents. We may take + longer to respond to you while we concentrate on getting issues resolved in + priority order and within available resources. Non-urgent defects may also + take longer than normal to fix. We will continue to serve you the best that + we can but urge everyone not to make journeys unless absolutely necessary + and not report to anything that is not urgent. Thank you for + your understanding. + </p> + +</div> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/bexley/front/pre-steps.html b/templates/web/bexley/front/pre-steps.html new file mode 100644 index 000000000..830690fe7 --- /dev/null +++ b/templates/web/bexley/front/pre-steps.html @@ -0,0 +1,12 @@ +<p style="border: 0.3em solid rgb(252, 13, 27); padding: 2em; background-color: rgb(237, 207, 206); font-size: 1.2em;"> +<strong>While we find ourselves in these unprecedented times.</strong> + All issues reported on Bexley’s FixMyStreet system will continue to be + actioned to keep our roads safe for critical workers to be able to continue + to support the London Borough of Bexley and its residents. We may take + longer to respond to you while we concentrate on getting issues resolved in + priority order and within available resources. Non-urgent defects may also + take longer than normal to fix. We will continue to serve you the best that + we can but urge everyone not to make journeys unless absolutely necessary + and not report to anything that is not urgent. Thank you for your + understanding. +</p> diff --git a/templates/web/bexley/tokens/_extras_confirm.html b/templates/web/bexley/tokens/_extras_confirm.html new file mode 100644 index 000000000..5a7cc2782 --- /dev/null +++ b/templates/web/bexley/tokens/_extras_confirm.html @@ -0,0 +1,12 @@ +<p style="border: 0.1em solid rgb(252, 13, 27); padding: 0.5em; background-color: rgb(237, 207, 206);"> + <strong>While we find ourselves in these unprecedented times.</strong> + All issues reported on Bexley’s FixMyStreet system will continue to be + actioned to keep our roads safe for critical workers to be able to continue + to support the London Borough of Bexley and its residents. We may take + longer to respond to you while we concentrate on getting issues resolved in + priority order and within available resources. Non-urgent defects may also + take longer than normal to fix. We will continue to serve you the best that + we can but urge everyone not to make journeys unless absolutely necessary + and not report to anything that is not urgent. Thank you for + your understanding. +</p> diff --git a/templates/web/buckinghamshire/front/pre-steps.html b/templates/web/buckinghamshire/front/pre-steps.html new file mode 100644 index 000000000..4728bff2f --- /dev/null +++ b/templates/web/buckinghamshire/front/pre-steps.html @@ -0,0 +1,7 @@ +<p style="margin: -1em -1em 1em; padding: 20px 30px; background-color: #f79f73; color: #000;"> +In light of the ongoing COVID 19 crisis an element of TfB workforce has reduced +by the need for self-isolation. This regrettably means that for the immediate +future some work will have to be delayed. We apologise for any possible delay +in addressing your report and hope that you will understand in the +circumstances. +</p> |