diff options
| -rw-r--r-- | templates/email/bathnes/_council_reference.html | 3 | ||||
| -rw-r--r-- | templates/email/bathnes/_council_reference.txt | 2 | ||||
| -rw-r--r-- | templates/email/bathnes/confirm_report_sent.html | 35 | ||||
| -rw-r--r-- | templates/email/bathnes/confirm_report_sent.txt | 31 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/confirm_report_sent.html | 32 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/confirm_report_sent.txt | 30 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.html | 34 | ||||
| -rw-r--r-- | templates/email/buckinghamshire/other-reported.txt | 30 | ||||
| -rw-r--r-- | templates/email/fixmystreet.com/other-reported.html (renamed from templates/email/bathnes/other-reported.html) | 13 | ||||
| -rw-r--r-- | templates/email/fixmystreet.com/other-reported.txt (renamed from templates/email/bathnes/other-reported.txt) | 3 |
10 files changed, 15 insertions, 198 deletions
diff --git a/templates/email/bathnes/_council_reference.html b/templates/email/bathnes/_council_reference.html new file mode 100644 index 000000000..8a1a9e1ee --- /dev/null +++ b/templates/email/bathnes/_council_reference.html @@ -0,0 +1,3 @@ +<p style="[% p_style %]">The report's reference number is <strong>[% problem.id %]</strong>. + Please quote this if you need to contact the council about this report.</p> + diff --git a/templates/email/bathnes/_council_reference.txt b/templates/email/bathnes/_council_reference.txt new file mode 100644 index 000000000..75d7e93d2 --- /dev/null +++ b/templates/email/bathnes/_council_reference.txt @@ -0,0 +1,2 @@ +The report's reference number is [% problem.id %]. Please quote this if +you need to contact the council about this report. diff --git a/templates/email/bathnes/confirm_report_sent.html b/templates/email/bathnes/confirm_report_sent.html index 1fb293c52..5a0c19f0d 100644 --- a/templates/email/bathnes/confirm_report_sent.html +++ b/templates/email/bathnes/confirm_report_sent.html @@ -1,34 +1 @@ -[% - -email_summary = "Thanks for logging your report"; -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 report has been logged</h1> - <p style="[% p_style %]">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 %] - </p> - <p style="[% p_style %]">This report's reference number is <strong>[% report.id %]</strong>. - Please quote this if you need to contact the council about this report. -[% 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> - [% end_padded_box %] -</th> -[% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% report.title | html %]</h2> - <p style="[% secondary_p_style %]">[% report.detail | html %]</p> -[% END %] - -[% INCLUDE '_email_bottom.html' %] +[% INCLUDE 'other-reported.html' %]
\ No newline at end of file diff --git a/templates/email/bathnes/confirm_report_sent.txt b/templates/email/bathnes/confirm_report_sent.txt index 0473e9db8..72fe01f6d 100644 --- a/templates/email/bathnes/confirm_report_sent.txt +++ b/templates/email/bathnes/confirm_report_sent.txt @@ -1,30 +1 @@ -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 %] -This report's reference number is [% report.id %]. Please quote this if you -need to contact the council about this report. -[% 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 %] - -[% INCLUDE 'signature.txt' %] - -This email was sent automatically, from an unmonitored email account - so -please do not reply to it. +[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/confirm_report_sent.html b/templates/email/buckinghamshire/confirm_report_sent.html index 0fcb46e41..5a0c19f0d 100644 --- a/templates/email/buckinghamshire/confirm_report_sent.html +++ b/templates/email/buckinghamshire/confirm_report_sent.html @@ -1,31 +1 @@ -[% - -email_summary = "Thanks for logging your report"; -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 report has been logged</h1> - <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 ) %] -<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 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> - [% end_padded_box %] -</th> -[% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% report.title | html %]</h2> - <p style="[% secondary_p_style %]">[% report.detail | html %]</p> -[% END %] - -[% INCLUDE '_email_bottom.html' %]
\ No newline at end of file +[% INCLUDE 'other-reported.html' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/confirm_report_sent.txt b/templates/email/buckinghamshire/confirm_report_sent.txt index bdcedcfda..72fe01f6d 100644 --- a/templates/email/buckinghamshire/confirm_report_sent.txt +++ b/templates/email/buckinghamshire/confirm_report_sent.txt @@ -1,29 +1 @@ -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 %] - -[% INCLUDE 'signature.txt' %] - -This email was sent automatically, from an unmonitored email account - so -please do not reply to it.
\ No newline at end of file +[% INCLUDE 'other-reported.txt' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html deleted file mode 100644 index 85ba08f97..000000000 --- a/templates/email/buckinghamshire/other-reported.html +++ /dev/null @@ -1,34 +0,0 @@ -[% - -email_summary = "Thanks for logging your report"; -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 report has been logged</h1> - <p style="[% p_style %]">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 %] - </p> - <p style="[% p_style %]">This report's reference number is <strong>[% report.external_id %]</strong>. - Please quote this if you need to contact the council about this report. -[% 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> - [% end_padded_box %] -</th> -[% WRAPPER '_email_sidebar.html' object = report %] - <h2 style="[% h2_style %]">[% report.title | html %]</h2> - <p style="[% secondary_p_style %]">[% report.detail | html %]</p> -[% END %] - -[% INCLUDE '_email_bottom.html' %]
\ No newline at end of file diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt deleted file mode 100644 index 933d66b54..000000000 --- a/templates/email/buckinghamshire/other-reported.txt +++ /dev/null @@ -1,30 +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 %] -This report's reference number is [% report.external_id %]. Please quote this if you -need to contact the council about this report. -[% 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 %] - -[% INCLUDE 'signature.txt' %] - -This email was sent automatically, from an unmonitored email account - so -please do not reply to it.
\ No newline at end of file diff --git a/templates/email/bathnes/other-reported.html b/templates/email/fixmystreet.com/other-reported.html index 1fb293c52..0fcb46e41 100644 --- a/templates/email/bathnes/other-reported.html +++ b/templates/email/fixmystreet.com/other-reported.html @@ -11,16 +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 %] - </p> - <p style="[% p_style %]">This report's reference number is <strong>[% report.id %]</strong>. - Please quote this if you need to contact the council about this report. +[% 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> @@ -31,4 +28,4 @@ of report, so it will instead be sent to [% report.body %]. <p style="[% secondary_p_style %]">[% report.detail | html %]</p> [% END %] -[% INCLUDE '_email_bottom.html' %] +[% INCLUDE '_email_bottom.html' %]
\ No newline at end of file diff --git a/templates/email/bathnes/other-reported.txt b/templates/email/fixmystreet.com/other-reported.txt index 0473e9db8..be3cc18f2 100644 --- a/templates/email/bathnes/other-reported.txt +++ b/templates/email/fixmystreet.com/other-reported.txt @@ -8,8 +8,7 @@ Your report to [% report.body %] has been logged on [% site_name %]. 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 %] -This report's reference number is [% report.id %]. Please quote this if you -need to contact the council about this report. +[% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %] [% END %] It is available to view at: |