aboutsummaryrefslogtreecommitdiffstats
path: root/templates/email/fixmystreet.com
diff options
context:
space:
mode:
Diffstat (limited to 'templates/email/fixmystreet.com')
-rw-r--r--templates/email/fixmystreet.com/_submit_footer.html9
-rw-r--r--templates/email/fixmystreet.com/submit-oxfordshire.txt47
-rw-r--r--templates/email/fixmystreet.com/submit.html69
-rw-r--r--templates/email/fixmystreet.com/submit.txt4
-rw-r--r--templates/email/fixmystreet.com/update-confirm-donotsend.txt4
5 files changed, 83 insertions, 50 deletions
diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html
new file mode 100644
index 000000000..b76f128a5
--- /dev/null
+++ b/templates/email/fixmystreet.com/_submit_footer.html
@@ -0,0 +1,9 @@
+This message was sent via FixMyStreet, a project of UKCOD, registered charity
+number 1076346. If there is a more appropriate email address for messages about
+[% category_footer %], please <a href="https://www.fixmystreet.com/contact">let
+us know</a>. This will help improve the service for local people. We also
+welcome any other feedback you may have.
+<br><br>
+FixMyStreet is now available for full integration into council websites, making
+life easier for both you and your residents.
+<a href="https://www.fixmystreet.com/council">Read more</a>
diff --git a/templates/email/fixmystreet.com/submit-oxfordshire.txt b/templates/email/fixmystreet.com/submit-oxfordshire.txt
deleted file mode 100644
index 547f7ce7f..000000000
--- a/templates/email/fixmystreet.com/submit-oxfordshire.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Subject: FMS Problem Report: [% title %]
-
-Dear [% bodies_name %],
-
-[% missing %][% multiple %]A user of
-FixMyStreet has submitted the following report
-of a local problem that they believe might require your attention.
-
-[% fuzzy %], or to provide an update on the problem,
-please visit the following link:
-
- [% url %]
-
-[% has_photo %]----------
-
-Name: [% name %]
-
-Email: [% email %]
-
-[% phone_line %][% category_line %]Subject: [% title %]
-
-Details: [% detail %]
-
-Easting/Northing: [% easting %]/[% northing %]
-
-Latitude: [% latitude %]
-
-Longitude: [% longitude %]
-
-View OpenStreetMap of this location: [% osm_url %]
-
-[% closest_address %]----------
-
-Replies to this email will go to the user who submitted the problem.
-
-[% signature %]
-
-This message was sent via FixMyStreet, a project of UKCOD, registered charity
-number 1076346. If there is a more appropriate email address for messages about
-[% category_footer %], please let us know by visiting <https://www.fixmystreet.com/contact>.
-This will help improve the service for local people. We
-also welcome any other feedback you may have.
-
-FixMyStreet is now available for full integration into council
-websites, making life easier for both you and your residents.
-Read more here: https://www.fixmystreet.com/council
-
diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
new file mode 100644
index 000000000..e90862ee9
--- /dev/null
+++ b/templates/email/fixmystreet.com/submit.html
@@ -0,0 +1,69 @@
+[%
+
+email_summary = "A new problem in your area has been reported by a " _ site_name _ " user.";
+email_footer = PROCESS '_submit_footer.html';
+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 %]">New problem in your&nbsp;area</h1>
+ <p style="[% p_style %]">[% missing %][% multiple %]A user of [% site_name %] has submitted the following report
+of a local problem that they believe might require your attention.</p>
+
+ <p style="margin: 20px auto; text-align: center">
+ <a style="[% button_style %]" href="[% url %]">Show full report</a>
+ </p>
+ <h2 style="[% h2_style %] margin: 30px 0 10px 0">Reported by:</h2>
+ <table [% table_reset %]>
+ <tr>
+ <th style="[% contact_th_style %]">Name</th>
+ <td style="[% contact_td_style %]">[% name | html %]</td>
+ </tr>
+ <tr>
+ <th style="[% contact_th_style %]">Email</th>
+ <td style="[% contact_td_style %]"><a href="mailto:[% email | html %]">[% email | html %]</a></td>
+ </tr>
+ [% IF phone %]
+ <tr>
+ <th style="[% contact_th_style %]">Phone</th>
+ <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td>
+ </tr>
+ [% END %]
+ </table>
+ <p style="[% p_style %] margin-top: 0.5em;">Replies to this message will go directly to [% name | html %], the user who reported the problem.</p>
+ [% end_padded_box %]
+</th>
+<th style="[% td_style %][% secondary_column_style %]" id="secondary_column">
+ <img style="[% map_image_style %]" src="[% inline_image(report.static_map, 'map.jpeg') %]" width="310" height="200" alt="">
+ [% start_padded_box %]
+ [% IF has_photo %]
+ <img style="[% preview_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt="" align="right">
+ [% END %]
+ <h2 style="[% h2_style %]">[% title | html %]</h2>
+ [% IF category_line %]
+ <p style="[% secondary_p_style %]">[% category | html %]</p>
+ [% END %]
+ <p style="[% secondary_p_style %]">[% detail | html %]</p>
+ [% IF additional_information %]
+ <p style="[% secondary_p_style %]">[% additional_information %]</p>
+ [% END %]
+ <p style="[% secondary_p_style %]">
+ <strong>Location:</strong>
+ <br>Easting/Northing
+ [%~ " (IE)" IF coordsyst == "I" ~%]
+ : [% easting %]/[% northing %]
+ (<a href="[% osm_url %]" title="View OpenStreetMap of this location">
+ [%~ latitude %], [% longitude ~%]
+ </a>)
+ [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
+ </p>
+ [% end_padded_box %]
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index 735fdf37d..c30244db9 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -3,7 +3,7 @@ Subject: Problem Report: [% title %]
Dear [% bodies_name %],
[% missing %][% multiple %]A user of
-FixMyStreet has submitted the following report
+[% site_name %] has submitted the following report
of a local problem that they believe might require your attention.
[% fuzzy %], or to provide an update on the problem,
@@ -21,6 +21,8 @@ Email: [% email %]
Details: [% detail %]
+[% additional_information %]
+
Easting/Northing
[%- " (IE)" IF coordsyst == "I" -%]
: [% easting %]/[% northing %]
diff --git a/templates/email/fixmystreet.com/update-confirm-donotsend.txt b/templates/email/fixmystreet.com/update-confirm-donotsend.txt
index 2e04dc0bf..43be8fe26 100644
--- a/templates/email/fixmystreet.com/update-confirm-donotsend.txt
+++ b/templates/email/fixmystreet.com/update-confirm-donotsend.txt
@@ -1,8 +1,8 @@
[% IF update.problem.bodies_str != 2482 AND update.problem.bodies_str != 2347 %]
Note that we do not send updates to [% update.problem.body %] - they are
-intended as a place for [% INCLUDE 'site-name.txt' | trim %] users to
+intended as a place for [% site_name %] users to
discuss, support, and offer advice.
[% ELSE %]
This update will be sent to [% update.problem.body %] and will
-also be displayed on the [% INCLUDE 'site-name.txt' | trim %] website.
+also be displayed on the [% site_name %] website.
[% END %]