[fixmystreet.com] Prominent FMS Pro promo in email to council

Fixes mysociety/fixmystreet-commercial#925.

3 files changed, 74 insertions, 20 deletions

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 22e025085..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';
 
 %]
@@ -48,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 5a0845b14..5bcbef87b 100644
--- a/templates/email/fixmystreet.com/submit.txt
+++ b/templates/email/fixmystreet.com/submit.txt
@@ -41,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.
+----------
 
-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
+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/
+
+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.