12 files changed, 119 insertions, 72 deletions
diff --git a/templates/email/default/submit.html b/templates/email/default/submit.html
index 85511b2e4..582670f98 100644
--- a/templates/email/default/submit.html
+++ b/templates/email/default/submit.html
@@ -27,7 +27,13 @@ of a local problem that they believe might require your attention.</p>
     </tr>
     <tr>
       <th style="[% contact_th_style %]">Email</th>
-      <td style="[% contact_td_style %]"><a href="mailto:[% email | html %]">[% email | html %]</a></td>
+      <td style="[% contact_td_style %]">
+        [%~ IF email ~%]
+          <a href="mailto:[% email | html %]">[% email | html %]</a>
+        [%~ ELSE ~%]
+          <strong>No email address provided, only phone number</strong>
+        [%~ END ~%]
+      </td>
     </tr>
     [%~ IF phone %]
       <tr>
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index 5d79f3b41..8c88a17f8 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -15,9 +15,11 @@ please visit the following link:
 
 Name: [% name %]
 
-Email: [% email %]
+Email: [% email OR "None provided" %]
 
-[% phone_line %][% category_line %]Subject: [% title %]
+Phone: [% phone OR "None provided" %]
+
+[% category_line %]Subject: [% title %]
 
 Details: [% detail %]
 
diff --git a/templates/email/fiksgatami/nn/submit.txt b/templates/email/fiksgatami/nn/submit.txt
index 32a895632..dfbdd9457 100644
--- a/templates/email/fiksgatami/nn/submit.txt
+++ b/templates/email/fiksgatami/nn/submit.txt
@@ -15,9 +15,11 @@ problemet, ver venleg og besøk følgjande lenkje:
 
 Namn: [% name %]
 
-E-post: [% email %]
+E-post: [% email OR '-' %]
 
-[% phone_line %][% category_line %]Tema: [% title %]
+Telefon: [% phone OR '-' %]
+
+[% category_line %]Tema: [% title %]
 
 Detaljer: [% detail %]
 
diff --git a/templates/email/fiksgatami/submit.txt b/templates/email/fiksgatami/submit.txt
index a0e0687eb..165b804f1 100644
--- a/templates/email/fiksgatami/submit.txt
+++ b/templates/email/fiksgatami/submit.txt
@@ -15,9 +15,11 @@ vennligst besøk følgende lenke:
 
 Navn: [% name %]
 
-E-post: [% email %]
+E-post: [% email OR '-' %]
 
-[% phone_line %][% category_line %]Tema: [% title %]
+Telefon: [% phone OR '-' %]
+
+[% category_line %]Tema: [% title %]
 
 Detajer: [% detail %]
 
diff --git a/templates/email/fixamingata/submit.html b/templates/email/fixamingata/submit.html
index da4e7f48f..65a692058 100644
--- a/templates/email/fixamingata/submit.html
+++ b/templates/email/fixamingata/submit.html
@@ -27,7 +27,12 @@ tror medborgaren behöver er uppmärksamhet.</p>
     </tr>
     <tr>
       <th style="[% contact_th_style %]">Epost</th>
-      <td style="[% contact_td_style %]"><a href="mailto:[% email | html %]">[% email | html %]</a></td>
+      <td style="[% contact_td_style %]">
+        [%~ IF email ~%]
+          <a href="mailto:[% email | html %]">[% email | html %]</a>
+        [%~ ELSE ~%]
+        [%~ END ~%]
+      </td>
     </tr>
     [%~ IF phone %]
       <tr>
diff --git a/templates/email/fixamingata/submit.txt b/templates/email/fixamingata/submit.txt
index 95365b87e..fc8b65886 100644
--- a/templates/email/fixamingata/submit.txt
+++ b/templates/email/fixamingata/submit.txt
@@ -16,9 +16,11 @@ tror medborgaren behöver er uppmärksamhet.
 
 Namn: [% name %]
 
-Epost: [% email %]
+Epost: [% email OR '-' %]
 
-[% phone_line %]** Information om ärendet
+Telefonnummer: [% phone OR '-' %]
+
+** Information om ärendet
 
 ID: [% id %]
 
diff --git a/templates/email/fixmystreet.com/_submit_footer.html b/templates/email/fixmystreet.com/_submit_footer.html
index 94b79fed2..346ab8b66 100644
--- a/templates/email/fixmystreet.com/_submit_footer.html
+++ b/templates/email/fixmystreet.com/_submit_footer.html
@@ -1,9 +1,50 @@
-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/about/professional">Read more</a>
+[%
+
+submit_footer_td_style = "text-align: left; vertical-align: top; font-weight: normal; color: #fff;"
+submit_footer_h2_style = "font-size: 16px; line-height: 18px; margin: 0 0 10px 0;";
+submit_footer_link_style = "color: #9CD0EA;";
+
+%]
+
+<table [% table_reset %]>
+  <tr>
+    <th style="[% td_style %] padding: [% column_padding %]px; background-color: [% color_yellow %]; color: [% color_black %];">
+      <h2 style="[% h2_style %] margin-bottom: 15px;">
+        Never retype another FixMyStreet report
+      </h2>
+      <p style="margin: 0;">
+        Good news: we can now send these reports from FixMyStreet
+        directly into your customer service queue.
+        <a href="https://www.fixmystreet.com/pro/">Find out how</a>.
+      </p>
+    </th>
+  </tr>
+</table>
+
+<table [% table_reset %] style="table-layout: fixed;">
+  <tr>
+    <th style="[% submit_footer_td_style %] padding: [% column_padding %]px 40px 0 0;">
+      <h2 style="[% submit_footer_h2_style %]">
+        Where did this report come from?
+      </h2>
+      <p>
+        <a href="https://www.fixmystreet.com" style="[% submit_footer_link_style %]">FixMyStreet</a>
+        is the website and app that makes it easy for anyone to report
+        street faults, anywhere in the UK.
+        <a href="https://www.mysociety.org/better-cities/fixmystreet-in-the-uk/" style="[% submit_footer_link_style %]">Find out more</a>.
+      </p>
+    </th>
+    <th style="[% submit_footer_td_style %] padding: [% column_padding %]px 0 0 0;">
+      <h2 style="[% submit_footer_h2_style %]">
+          Is there a better contact address?
+      </h2>
+      <p>
+        Are reports about [% category_footer %] best sent to a
+        different address? Please let us know by visiting
+        <a href="https://www.fixmystreet.com/contact" style="[% submit_footer_link_style %]">fixmystreet.com/contact</a>,
+        and help make the service smoother for your residents.
+        We also welcome any other feedback you may have.
+      </p>
+    </th>
+  </tr>
+</table>
diff --git a/templates/email/fixmystreet.com/submit.html b/templates/email/fixmystreet.com/submit.html
index fc2b6c095..24bb5f86f 100644
--- a/templates/email/fixmystreet.com/submit.html
+++ b/templates/email/fixmystreet.com/submit.html
@@ -1,11 +1,11 @@
 [%
 
+PROCESS '_email_settings.html';
+
 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';
 
 %]
@@ -27,7 +27,13 @@ of a local problem that they believe might require your attention.</p>
     </tr>
     <tr>
       <th style="[% contact_th_style %]">Email</th>
-      <td style="[% contact_td_style %]"><a href="mailto:[% email | html %]">[% email | html %]</a></td>
+      <td style="[% contact_td_style %]">
+        [%~ IF email ~%]
+          <a href="mailto:[% email | html %]">[% email | html %]</a>
+        [%~ ELSE ~%]
+          <strong>No email address provided, only phone number</strong>
+        [%~ END ~%]
+      </td>
     </tr>
     [%~ IF phone %]
       <tr>
@@ -42,7 +48,7 @@ of a local problem that they believe might require your attention.</p>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% title | html %]</h2>
     [%~ IF category_line %]
-    <p style="[% secondary_p_style %]">[% category | html %]</p>
+    <p style="[% secondary_p_style %]"><strong>Category:</strong> [% category | html %]</p>
     [%~ END %]
     <p style="[% secondary_p_style %]">[% detail | html %]</p>
     [%~ IF additional_information %]
diff --git a/templates/email/fixmystreet.com/submit.txt b/templates/email/fixmystreet.com/submit.txt
index aa05316bf..5bcbef87b 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -15,9 +15,11 @@ please visit the following link:
 
 Name: [% name %]
 
-Email: [% email %]
+Email: [% email OR 'None provided' %]
 
-[% phone_line %][% category_line %]Subject: [% title %]
+Phone: [% phone OR 'None provided' %]
+
+[% category_line %]Subject: [% title %]
 
 Details: [% detail %]
 
@@ -39,13 +41,26 @@ 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.
+----------
+
+Never retype another FixMyStreet report
+
+Good news: we can now send these reports from FixMyStreet
+directly into your customer service queue. Find out how:
+
+    https://www.fixmystreet.com/pro
+
+----------
+
+Where did this report come from?
+
+FixMyStreet is the website and app that makes it easy for anyone
+to report street faults, anywhere in the UK. Find out more:
+
+    https://www.mysociety.org/better-cities/fixmystreet-in-the-uk/
 
-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/pro
+Are reports about [% category_footer %] best sent to a different address?
 
+Please let us know by visiting <https://www.fixmystreet.com/contact>
+and help make the service smoother for your residents. We also welcome
+any other feedback you may have.
diff --git a/templates/email/oxfordshire/rdi.txt b/templates/email/oxfordshire/rdi.txt
index f12467d68..9dcf24186 100644
--- a/templates/email/oxfordshire/rdi.txt
+++ b/templates/email/oxfordshire/rdi.txt
@@ -1,8 +1,11 @@
-Subject: RDI report for [% user.name %]
+Subject:[% IF staging_site %] [STAGING][% END %] RDI report for [% user.name %]
 
 Please find attached RDI file for [% start_date %]
 to [% end_date %].
-
+[% IF staging_site %]
+NB: This RDI file was generated on a staging site and is for testing
+purposes only.
+[% END %]
 ----
 
 The mySociety team and Oxfordshire County Council
diff --git a/templates/email/seesomething/confirm_report_sent.txt b/templates/email/seesomething/confirm_report_sent.txt
deleted file mode 100644
index d62a50c49..000000000
--- a/templates/email/seesomething/confirm_report_sent.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Subject: See Something, Say Something report sent
-
-Thank you for your report. It will help us to direct our policing activity to make public transport even safer. Find out more of what we are doing at:
-
-Safer Travel Partnership
-
-http://www.safertravel.info
-
-Follow us on Twitter: https://www.twitter.com/ST_Police
-or on Facebook: http://www.facebook.com/safertravelpolice
diff --git a/templates/email/seesomething/submit.txt b/templates/email/seesomething/submit.txt
deleted file mode 100644
index 1f2adc11d..000000000
--- a/templates/email/seesomething/submit.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Subject: Report on See Something, Say Something
-
-A user of
-See Something, Say Something has submitted the following report
-of a problem that they believe might require your attention.
-
-[% image_url %]
-----------
-
-[% user_details %]
-
-[% phone_line %][% category_line %][% subcategory_line %]
-
-Details: [% detail %]
-
-Easting/Northing: [% easting %]/[% northing %]
-
-Latitude: [% latitude %]
-
-Longitude: [% longitude %]
-
-[% closest_address %]----------
-
-Replies to this email will go to the user who submitted the problem
-unless it is an anonymous report in which case they will be discarded.
-
-[% signature %]