aboutsummaryrefslogtreecommitdiffstats
path: root/templates/email
diff options
context:
space:
mode:
Diffstat (limited to 'templates/email')
-rw-r--r--templates/email/bathnes/_council_reference.html3
-rw-r--r--templates/email/bathnes/_council_reference.txt2
-rw-r--r--templates/email/bathnes/archive.html54
-rw-r--r--templates/email/bathnes/archive.txt27
-rw-r--r--templates/email/bathnes/confirm_report_sent.html1
-rw-r--r--templates/email/bathnes/confirm_report_sent.txt1
-rw-r--r--templates/email/bathnes/other-updated.html28
-rw-r--r--templates/email/bathnes/other-updated.txt19
-rw-r--r--templates/email/buckinghamshire/confirm_report_sent.html32
-rw-r--r--templates/email/buckinghamshire/confirm_report_sent.txt30
-rw-r--r--templates/email/default/alert-update.html2
-rw-r--r--templates/email/default/alert-update.txt2
-rw-r--r--templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html79
-rw-r--r--templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt44
-rw-r--r--templates/email/fixmystreet.com/other-reported.html (renamed from templates/email/buckinghamshire/other-reported.html)11
-rw-r--r--templates/email/fixmystreet.com/other-reported.txt (renamed from templates/email/buckinghamshire/other-reported.txt)5
16 files changed, 270 insertions, 70 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/archive.html b/templates/email/bathnes/archive.html
new file mode 100644
index 000000000..d7afa0093
--- /dev/null
+++ b/templates/email/bathnes/archive.html
@@ -0,0 +1,54 @@
+[%
+
+email_summary = "Your reports on " _ site_name;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+ <h1 style="[% h1_style %]">Your reports on [% site_name %]</h1>
+ <p style="[% p_style %]">
+ Hello [% user.name %],
+ </p>
+ <p style="[% p_style %]">
+ FixMyStreet is being updated in Bath & North East Somerset to
+ improve how problems get reported.
+ </p>
+ <p style="[% p_style %]">
+ As part of this process, we are closing historic reports
+ which remain open in FixMyStreet.
+ </p>
+ <p style="[% p_style %]">
+ We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system,
+ which we've listed below.
+ </p>
+ <p style="[% p_style %]">
+ If your report is no longer an issue, you don't need to do anything.
+ </p>
+ <p style="[% p_style %]">
+ If you believe that the issue has not been resolved you can <a href="https://www.bathnes.gov.uk/reportit">report it again here.</a>
+ </p>
+
+ [% FOR report IN reports %]
+ <div style="[% list_item_style %]">
+ [% IF report.photo %]
+ <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]">
+ <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt="">
+ </a>
+ [% END %]
+ <h2 style="[% list_item_h2_style %]"><a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]">
+ [%~ report.title | html ~%]
+ </a></h2>
+ <p style="[% list_item_p_style %]">[% report.detail | html %]</p>
+ <p style="[% list_item_date_style %]">
+ Reported [% report.time_ago %] ago.
+ </p>
+ </div>
+ [% END %]
+
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/bathnes/archive.txt b/templates/email/bathnes/archive.txt
new file mode 100644
index 000000000..d4913b1a4
--- /dev/null
+++ b/templates/email/bathnes/archive.txt
@@ -0,0 +1,27 @@
+Subject: Your reports on [% site_name %]
+
+Hello [% user.name %],
+
+FixMyStreet is being updated in Bath & North East Somerset to improve how problems get reported.
+
+As part of this process, we are closing historic reports which remain open in FixMyStreet.
+
+We noticed that you have [% report_count %] old [% nget('report', 'reports', report_count) %] on the system, which we've listed below.
+
+If your report is no longer an issue, you don't need to do anything.
+
+If you believe that the issue has not been resolved you can report it again here: https://www.bathnes.gov.uk/reportit
+
+[% FOR report IN reports %]
+
+[% report.title %]
+
+Reported [% report.time_ago %] ago.
+
+View report: [% cobrand.base_url_for_report( report ) %]/report/[% report.id %]
+
+----
+
+[% END %]
+
+The FixMyStreet team and Bath & North East Somerset Council
diff --git a/templates/email/bathnes/confirm_report_sent.html b/templates/email/bathnes/confirm_report_sent.html
new file mode 100644
index 000000000..5a0c19f0d
--- /dev/null
+++ b/templates/email/bathnes/confirm_report_sent.html
@@ -0,0 +1 @@
+[% 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
new file mode 100644
index 000000000..72fe01f6d
--- /dev/null
+++ b/templates/email/bathnes/confirm_report_sent.txt
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.txt' %] \ No newline at end of file
diff --git a/templates/email/bathnes/other-updated.html b/templates/email/bathnes/other-updated.html
new file mode 100644
index 000000000..fb68c86ee
--- /dev/null
+++ b/templates/email/bathnes/other-updated.html
@@ -0,0 +1,28 @@
+[%
+
+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&nbsp;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
new file mode 100644
index 000000000..70290cf1e
--- /dev/null
+++ b/templates/email/bathnes/other-updated.txt
@@ -0,0 +1,19 @@
+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 %]
+
+[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
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&nbsp;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/default/alert-update.html b/templates/email/default/alert-update.html
index c1a7562cd..24d1b9834 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -14,7 +14,9 @@ INCLUDE '_email_top.html';
[% start_padded_box %]
<h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1>
[%~ INCLUDE '_email_comment_list.html' %]
+ [% UNLESS hide_unsubscribe %]
<p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p>
+ [% END %]
[% end_padded_box %]
</th>
[% WRAPPER '_email_sidebar.html' object = report %]
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index 2883fee5e..cfeba2e36 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -19,6 +19,7 @@ please do not reply to it.
[% signature %]
+[% IF NOT hide_unsubscribe %]
Unsubscribe?
We currently email you whenever someone leaves an update on the
@@ -26,3 +27,4 @@ We currently email you whenever someone leaves an update on the
If you no longer wish to receive an email whenever this report is updated,
please follow this link: [% unsubscribe_url %]
+[% END %]
diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html
new file mode 100644
index 000000000..8af8ea1b0
--- /dev/null
+++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.html
@@ -0,0 +1,79 @@
+<h2>Customer Details</h2>
+
+<table>
+<tr>
+<th>Name</th>
+<td>[% name %]</td>
+</tr>
+<tr>
+<th>Email</th>
+<td>[% email OR 'None provided' %]</td>
+</tr>
+<tr>
+<th>Phone</th>
+<td>[% phone OR 'None provided' %]</td>
+</tr>
+</table>
+
+
+<h2>Enquiry Details</h2>
+
+<table>
+<tr>
+<th>Date & Time logged</th>
+<td>[% confirmed %]</td>
+</tr>
+<tr>
+<th>Report type</th>
+<td>[% report.get_extra_field_value('FaultType') %]</td>
+</tr>
+<tr>
+<th>5 or more lights affected</th>
+<td>[% report.get_extra_field_value('5Lights') %]</td>
+</tr>
+<tr>
+<th>Unit Number</th>
+<td>[% report.get_extra_field_value('unitid') %]</td>
+</tr>
+<tr>
+<th>Title</th>
+<td>[% title %]</td>
+</tr>
+<tr>
+<th>Description</th>
+<td>[% detail %]</td>
+</tr>
+<tr>
+<th>URL</th>
+<td>[% url %]</td>
+</tr>
+</table>
+[% additional_information %]
+
+
+<h2>Location Details</h2>
+
+<table>
+<tr>
+<th>Unit description and location</th>
+<td>[% report.get_extra_field_value('asset_details') %]</td>
+</tr>
+<tr>
+<th>Easting/Northing</th>
+<td>[% easting %] [% northing %]</td>
+</tr>
+<tr>
+<th>Latitude</th>
+<td>[% latitude %]</td>
+</tr>
+<tr>
+<th>Longitude</th>
+<td>[% longitude %]</td>
+</tr>
+<tr>
+<th></th>
+<td>[% closest_address %]</td>
+</tr>
+</table>
+
+<strong>NB:</strong> Replies to this email will go to the user who submitted the problem.
diff --git a/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt
new file mode 100644
index 000000000..a860c0a34
--- /dev/null
+++ b/templates/email/fixmystreet.com/bathnes/submit-street-light-fault.txt
@@ -0,0 +1,44 @@
+Subject: Street Light Fault: [% title %]
+
+Customer Details
+
+Name: [% name %]
+
+Email: [% email OR 'None provided' %]
+
+Phone: [% phone OR 'None provided' %]
+
+
+Enquiry Details
+
+Date & Time logged: [% confirmed %]
+
+Report type: [% report.get_extra_field_value('FaultType') %]
+
+5 or more lights affected: [% report.get_extra_field_value('5Lights') %]
+
+Unit Number: [% report.get_extra_field_value('unitid') %]
+
+
+Title: [% title %]
+
+Description: [% detail %]
+
+[% additional_information %]
+
+[% url %]
+
+Location Details
+
+Unit description and location: [% report.get_extra_field_value('asset_details') %]
+
+Easting/Northing: [% easting %]/[% northing %]
+
+Latitude: [% latitude %]
+
+Longitude: [% longitude %]
+
+[% closest_address %]
+
+
+Replies to this email will go to the user who submitted the problem.
diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/fixmystreet.com/other-reported.html
index 85ba08f97..0fcb46e41 100644
--- a/templates/email/buckinghamshire/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&nbsp;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.external_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>
diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/fixmystreet.com/other-reported.txt
index 933d66b54..be3cc18f2 100644
--- a/templates/email/buckinghamshire/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.external_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:
@@ -27,4 +26,4 @@ And details:
[% 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
+please do not reply to it.