diff options
| -rw-r--r-- | templates/email/bathnes/other-updated.html | 28 | ||||
| -rw-r--r-- | templates/email/bathnes/other-updated.txt | 19 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.html (renamed from templates/email/fixmystreet.com/other-reported.html) | 2 | ||||
| -rw-r--r-- | templates/email/default/other-reported.html | 9 | ||||
| -rw-r--r-- | templates/email/default/other-reported.txt | 2 | ||||
| -rw-r--r-- | templates/email/fixmystreet.com/other-reported.txt | 29 |
6 files changed, 8 insertions, 81 deletions
diff --git a/templates/email/bathnes/other-updated.html b/templates/email/bathnes/other-updated.html deleted file mode 100644 index fb68c86ee..000000000 --- a/templates/email/bathnes/other-updated.html +++ /dev/null @@ -1,28 +0,0 @@ -[% - -email_summary = "Thanks for logging your update"; -email_columns = 2; - -PROCESS '_email_settings.html'; -INCLUDE '_email_top.html'; - -%] - -<th style="[% td_style %][% primary_column_style %]" id="primary_column"> - [% start_padded_box %] - <h1 style="[% h1_style %]">Your update has been logged</h1> - <p style="[% p_style %]">Your update has been logged on [% site_name %].</p> - <p style="[% p_style %]">The report's reference number is <strong>[% update.problem_id %]</strong>. - Please quote this if you need to contact the council about this report.</p> - <p style="margin: 20px auto; text-align: center"> - <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% update.url %]">View my update</a> - </p> - [% end_padded_box %] -</th> -[% WRAPPER '_email_sidebar.html' - object = update - report = problem %] - <p style="[% secondary_p_style %]">[% update.text | html %]</p> -[% END %] - -[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/bathnes/other-updated.txt b/templates/email/bathnes/other-updated.txt deleted file mode 100644 index 57d5f44cf..000000000 --- a/templates/email/bathnes/other-updated.txt +++ /dev/null @@ -1,19 +0,0 @@ -Subject: Your update has been logged - -Hello [% update.name %], - -Your update has been logged on [% site_name %]: - -[% cobrand.base_url_for_report(problem) %][% update.url %] - -The report's reference number is [% update.problem_id %]. Please quote this if -you need to contact the council about this report. - -Your update reads: - -[% update.text %] - -[% signature %] - -This email was sent automatically, from an unmonitored email account - so -please do not reply to it. diff --git a/templates/email/fixmystreet.com/other-reported.html b/templates/email/buckinghamshire/other-reported.html index 0fcb46e41..fe03376f5 100644 --- a/templates/email/fixmystreet.com/other-reported.html +++ b/templates/email/buckinghamshire/other-reported.html @@ -28,4 +28,4 @@ of report, so it will instead be sent to [% report.body %].</p> <p style="[% secondary_p_style %]">[% report.detail | html %]</p> [% END %] -[% INCLUDE '_email_bottom.html' %]
\ No newline at end of file +[% INCLUDE '_email_bottom.html' %] diff --git a/templates/email/default/other-reported.html b/templates/email/default/other-reported.html index 5435e735a..fe03376f5 100644 --- a/templates/email/default/other-reported.html +++ b/templates/email/default/other-reported.html @@ -11,12 +11,13 @@ INCLUDE '_email_top.html'; <th style="[% td_style %][% primary_column_style %]" id="primary_column"> [% start_padded_box %] <h1 style="[% h1_style %]">Your report has been logged</h1> - <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %]. + <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p> [% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] -Please note that [% c.cobrand.council_name %] is not responsible for this type -of report, so it will instead be sent to [% report.body %]. +<p style="[% p_style %]">Please note that [% c.cobrand.council_name %] is not responsible for this type +of report, so it will instead be sent to [% report.body %].</p> +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %] [% END %] - </p> <p style="margin: 20px auto; text-align: center"> <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">View my report</a> </p> diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt index 559b0933b..1dc8d0b44 100644 --- a/templates/email/default/other-reported.txt +++ b/templates/email/default/other-reported.txt @@ -7,6 +7,8 @@ Your report to [% report.body %] has been logged on [% site_name %]. [% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] Please note that [% c.cobrand.council_name %] is not responsible for this type of report, so it will instead be sent to [% report.body %]. +[% ELSE %] +[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] [% END %] It is available to view at: diff --git a/templates/email/fixmystreet.com/other-reported.txt b/templates/email/fixmystreet.com/other-reported.txt deleted file mode 100644 index 1dc8d0b44..000000000 --- a/templates/email/fixmystreet.com/other-reported.txt +++ /dev/null @@ -1,29 +0,0 @@ -Subject: Your report has been logged: [% report.title %] - -Hello [% report.name %], - -Your report to [% report.body %] has been logged on [% site_name %]. - -[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %] -Please note that [% c.cobrand.council_name %] is not responsible for this type -of report, so it will instead be sent to [% report.body %]. -[% ELSE %] -[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] -[% END %] - -It is available to view at: - -[% cobrand.base_url_for_report(report) %][% report.url %] - -Your report has the title: - -[% report.title %] - -And details: - -[% report.detail %] - -[% signature %] - -This email was sent automatically, from an unmonitored email account - so -please do not reply to it. |