[Highways England] Extra info in submit emails.

4 files changed, 103 insertions, 0 deletions

diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
index 1e8f49409..f8b2db0dc 100644
--- a/templates/email/fixmystreet.com/submit.html
+++ b/templates/email/fixmystreet.com/submit.html
@@ -62,6 +62,18 @@ of a local problem that they believe might require your attention.</p>
       </a>)
       [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
     </p>
+  [% IF report.get_extra_field_value('road_name') %]
+    <p style="[% secondary_p_style %]">
+      <strong>Road:</strong>
+        [% report.get_extra_field_value('road_name') %]
+    </p>
+  [% END %]
+  [% IF report.get_extra_field_value('sect_label') %]
+    <p style="[% secondary_p_style %]">
+      <strong>Section:</strong>
+        [% report.get_extra_field_value('sect_label') %]
+    </p>
+  [% END %]
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index 3eaf400a2..c22d83713 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -35,6 +35,13 @@ Latitude: [% report.latitude %]
 
 Longitude: [% report.longitude %]
 
+[% IF report.get_extra_field_value('road_name') ~%]
+Road: [% report.get_extra_field_value('road_name') %]
+[% END %]
+[% IF report.get_extra_field_value('sect_label') ~%]
+Section: [% report.get_extra_field_value('sect_label') %]
+[% END %]
+
 View OpenStreetMap of this location: [% osm_url %]
 
 [% closest_address %]----------
diff --git a/templates/email/highwaysengland/submit.html b/templates/email/highwaysengland/submit.html
new file mode 100644
index 000000000..ca35a782c
--- /dev/null
+++ b/templates/email/highwaysengland/submit.html
@@ -0,0 +1,46 @@
+[%
+
+email_summary = "A new problem in your area has been reported by a " _ site_name _ " user.";
+email_footer = "Sent via FixMyStreet";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box | safe %]
+  <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>
+  [% end_padded_box | safe %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% report.category | html %]</p>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+    <p style="[% secondary_p_style %]">
+      <strong>Location:</strong>
+      <a href="[% osm_url %]" title="View OpenStreetMap of this location">
+        [%~ report.latitude %], [% report.longitude ~%]
+      </a>
+      [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
+    </p>
+    <p style="[% secondary_p_style %]">
+      <strong>Road:</strong>
+        [% report.get_extra_field_value('road_name') %]
+    </p>
+    <p style="[% secondary_p_style %]">
+      <strong>Section:</strong>
+        [% report.get_extra_field_value('sect_label') %]
+    </p>
+
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/highwaysengland/submit.txt b/templates/email/highwaysengland/submit.txt
new file mode 100644
index 000000000..c050fb7b2
--- /dev/null
+++ b/templates/email/highwaysengland/submit.txt
@@ -0,0 +1,38 @@
+Subject: Problem Report: [% report.title %]
+
+Dear [% bodies_name %],
+
+[% missing %][% multiple %]A user of
+[% 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,
+please visit the following link:
+
+    [% url %]
+
+[% has_photo %]----------
+
+Category: [% report.category %]
+
+Subject: [% report.title %]
+
+Details: [% report.detail %]
+
+Latitude: [% report.latitude %]
+
+Longitude: [% report.longitude %]
+
+Road: [% report.get_extra_field_value('road_name') %]
+
+Section: [% report.get_extra_field_value('sect_label') %]
+
+View OpenStreetMap of this location: [% osm_url %]
+
+[% closest_address %]----------
+
+[% signature %]
+
+If there is a more appropriate email address for messages about
+[% category_footer %], please let us know. This will help improve the
+service for local people. We also welcome any other feedback you may have.