diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/email/default/problem-confirm.html | 2 | ||||
| -rw-r--r-- | templates/email/default/problem-confirm.txt | 1 | ||||
| -rw-r--r-- | templates/email/oxfordshire/_problem-confirm_extra.html | 14 | ||||
| -rw-r--r-- | templates/email/oxfordshire/_problem-confirm_extra.txt | 12 | ||||
| -rw-r--r-- | templates/web/base/email_sent.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/_inspect.html | 1 | ||||
| -rw-r--r-- | templates/web/oxfordshire/_email_sent_extra.html | 1 | ||||
| -rw-r--r-- | templates/web/oxfordshire/_response_time.html | 14 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_council_sent_info.html | 15 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_inspect_extra_info.html | 8 | ||||
| -rw-r--r-- | templates/web/oxfordshire/tokens/_extras_confirm.html | 1 |
11 files changed, 57 insertions, 14 deletions
diff --git a/templates/email/default/problem-confirm.html b/templates/email/default/problem-confirm.html index 904cf7777..f545d7385 100644 --- a/templates/email/default/problem-confirm.html +++ b/templates/email/default/problem-confirm.html @@ -17,6 +17,8 @@ INCLUDE '_email_top.html'; Please note that [% c.cobrand.council_name %] is not responsible for this type of problem, so it will instead be sent to [% report.body %]. [% END %] + +[% TRY %][% INCLUDE '_problem-confirm_extra.html' %][% CATCH file %][% END %] </p> <p style="[% p_style %]">Your report will also appear on the [% site_name %] website.</p> <p style="margin: 20px auto; text-align: center"> diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt index 9d0767671..e9e7378d1 100644 --- a/templates/email/default/problem-confirm.txt +++ b/templates/email/default/problem-confirm.txt @@ -14,6 +14,7 @@ into your web browser and press return. Please note that [% c.cobrand.council_name %] is not responsible for this type of problem, so it will instead be sent to [% report.body %]. [% END %] +[% TRY %][% INCLUDE '_problem-confirm_extra.txt' %][% CATCH file %][% END %] Your problem had the title: [% report.title %] diff --git a/templates/email/oxfordshire/_problem-confirm_extra.html b/templates/email/oxfordshire/_problem-confirm_extra.html new file mode 100644 index 000000000..5e22be6b9 --- /dev/null +++ b/templates/email/oxfordshire/_problem-confirm_extra.html @@ -0,0 +1,14 @@ +[% IF c.cobrand.problem_response_days(report) == 'emergency' %] + <p> + Thank you for contacting Oxfordshire County Council [% report.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> + Reported faults will continue to be registered on our management system and these will be tackled in coming months. + </p> +[% ELSIF c.cobrand.problem_response_days(report) > 0 %] + <p> + Problems in the + [% report.category %] + category are generally responded to within + [% c.cobrand.problem_response_days(report) %] + working days. + </p> +[% END %] diff --git a/templates/email/oxfordshire/_problem-confirm_extra.txt b/templates/email/oxfordshire/_problem-confirm_extra.txt new file mode 100644 index 000000000..eb9ccfd12 --- /dev/null +++ b/templates/email/oxfordshire/_problem-confirm_extra.txt @@ -0,0 +1,12 @@ +[% IF c.cobrand.problem_response_days(report) == 'emergency' %] +Thank you for contacting Oxfordshire County Council [% report.category %], +unfortunately we are currently only available to respond to emergency +situations which may have an impact on the health and safety of members +of the public, these will be dealt with within a 24 hour period. + +Reported faults will continue to be registered on our management +system and these will be tackled in coming months. +[% ELSIF c.cobrand.problem_response_days(report) > 0 %] +Problems in the [% report.category %] category are generally responded +to within [% c.cobrand.problem_response_days(report) %] working days. +[% END %] diff --git a/templates/web/base/email_sent.html b/templates/web/base/email_sent.html index 7d38f9d67..2724dabb9 100644 --- a/templates/web/base/email_sent.html +++ b/templates/web/base/email_sent.html @@ -14,6 +14,8 @@ [% 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> diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index 59806dc66..561be30d1 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -171,6 +171,7 @@ [% ELSE %] <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p> [% END %] + [% TRY %][% INCLUDE 'report/_inspect_extra_info.html' %][% CATCH file %][% END %] [% END %] <p> diff --git a/templates/web/oxfordshire/_email_sent_extra.html b/templates/web/oxfordshire/_email_sent_extra.html new file mode 100644 index 000000000..5fdcd3bfd --- /dev/null +++ b/templates/web/oxfordshire/_email_sent_extra.html @@ -0,0 +1 @@ +[% INCLUDE '_response_time.html' problem=report %] diff --git a/templates/web/oxfordshire/_response_time.html b/templates/web/oxfordshire/_response_time.html new file mode 100644 index 000000000..c3cb5fdfa --- /dev/null +++ b/templates/web/oxfordshire/_response_time.html @@ -0,0 +1,14 @@ +[% IF c.cobrand.problem_response_days(problem) == 'emergency' %] + <p> + Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> + Reported faults will continue to be registered on our management system and these will be tackled in coming months. + </p> +[% ELSIF c.cobrand.problem_response_days(problem) > 0 %] + <p> + Problems in the + [% problem.category %] + category are generally responded to within + [% c.cobrand.problem_response_days(problem) %] + working days. + </p> +[% END %] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 52b20a0af..5bc7949ff 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -10,20 +10,7 @@ </h3> [% END %] - [% IF c.cobrand.problem_response_days(problem) == 'emergency' %] - <p> - Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> - Reported faults will continue to be registered on our management system and these will be tackled in coming months. - </p> - [% ELSIF c.cobrand.problem_response_days(problem) > 0 %] - <p> - Problems in the - [% problem.category %] - category are generally responded to within - [% c.cobrand.problem_response_days(problem) %] - working days. - </p> - [% END %] + [% INCLUDE '_response_time.html' %] </div> [% END %] diff --git a/templates/web/oxfordshire/report/_inspect_extra_info.html b/templates/web/oxfordshire/report/_inspect_extra_info.html new file mode 100644 index 000000000..6151d79ae --- /dev/null +++ b/templates/web/oxfordshire/report/_inspect_extra_info.html @@ -0,0 +1,8 @@ +<p><small> +RDI sent: +[% IF problem.get_extra_metadata('rdi_processed') %] + [% problem.get_extra_metadata('rdi_processed') %] +[% ELSE %] + <strong>not yet sent</strong> +[% END %] +</small></p> diff --git a/templates/web/oxfordshire/tokens/_extras_confirm.html b/templates/web/oxfordshire/tokens/_extras_confirm.html new file mode 100644 index 000000000..5fdcd3bfd --- /dev/null +++ b/templates/web/oxfordshire/tokens/_extras_confirm.html @@ -0,0 +1 @@ +[% INCLUDE '_response_time.html' problem=report %] |