diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-01-10 14:10:47 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-01-14 11:24:50 +0000 |
| commit | 8c712838c4211a8cdd67e81f0120daa6ab344313 (patch) | |
| tree | 07556610271f1ecd1bdf020aa588cdd6204f258c | |
| parent | ed57924dc9a922f81eb60286ed805b26c5226b35 (diff) | |
Have separate alert-update council ref template.
This is so a council could include the ref in other-* but not
alert-update if not wanted. Update Bucks to use new template
(not needed as it overrides for other reasons, but makes seeing
those other reasons in a diff easier).
6 files changed, 9 insertions, 4 deletions
diff --git a/templates/email/buckinghamshire/_council_reference_alert_update.html b/templates/email/buckinghamshire/_council_reference_alert_update.html new file mode 120000 index 000000000..b381640fa --- /dev/null +++ b/templates/email/buckinghamshire/_council_reference_alert_update.html @@ -0,0 +1 @@ +_council_reference.html
\ No newline at end of file diff --git a/templates/email/buckinghamshire/_council_reference_alert_update.txt b/templates/email/buckinghamshire/_council_reference_alert_update.txt new file mode 120000 index 000000000..cb7672557 --- /dev/null +++ b/templates/email/buckinghamshire/_council_reference_alert_update.txt @@ -0,0 +1 @@ +_council_reference.txt
\ No newline at end of file diff --git a/templates/email/buckinghamshire/alert-update.html b/templates/email/buckinghamshire/alert-update.html index 48e6871c2..8831fd379 100644 --- a/templates/email/buckinghamshire/alert-update.html +++ b/templates/email/buckinghamshire/alert-update.html @@ -19,9 +19,9 @@ INCLUDE '_email_top.html'; [% end_padded_box %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% title | html %]</h2> + <h2 style="[% h2_style %]">[% title %]</h2> <p style="[% secondary_p_style %]">[% report.detail | html %]</p> - [%~ INCLUDE '_council_reference.html' problem=report p_style=secondary_p_style %] + [% TRY %][% INCLUDE '_council_reference_alert_update.html' problem=report p_style=secondary_p_style %][% CATCH file %][% END %] [% END %] [% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/buckinghamshire/alert-update.txt b/templates/email/buckinghamshire/alert-update.txt index a77f3a2a0..34b95683f 100644 --- a/templates/email/buckinghamshire/alert-update.txt +++ b/templates/email/buckinghamshire/alert-update.txt @@ -13,7 +13,7 @@ If you would like to view or reply to these updates, please visit the following [% problem_url %] -[% INCLUDE '_council_reference.txt' problem=report %] +[% TRY %][% INCLUDE '_council_reference_alert_update.txt' problem=report %][% CATCH file %][% END %] This email was sent automatically, from an unmonitored email account - so please do not reply to it. diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html index 7ebc9910c..082f5e369 100644 --- a/templates/email/default/alert-update.html +++ b/templates/email/default/alert-update.html @@ -18,8 +18,9 @@ INCLUDE '_email_top.html'; [% end_padded_box %] </th> [% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% report.title | html %]</h2> + <h2 style="[% h2_style %]">[% title %]</h2> <p style="[% secondary_p_style %]">[% report.detail | html %]</p> + [% TRY %][% INCLUDE '_council_reference_alert_update.html' problem=report p_style=secondary_p_style %][% CATCH file %][% END %] [% END %] [% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt index 2883fee5e..952b2dbca 100644 --- a/templates/email/default/alert-update.txt +++ b/templates/email/default/alert-update.txt @@ -13,6 +13,8 @@ If you would like to view or reply to these updates, please visit the following [% problem_url %] +[% TRY %][% INCLUDE '_council_reference_alert_update.txt' problem=report %][% CATCH file %][% END %] + This email was sent automatically, from an unmonitored email account - so please do not reply to it. |