11 files changed, 56 insertions, 20 deletions
diff --git a/templates/email/default/_email_settings.html b/templates/email/default/_email_settings.html
index f6db8334c..94045bd3c 100644
--- a/templates/email/default/_email_settings.html
+++ b/templates/email/default/_email_settings.html
@@ -25,6 +25,7 @@ header_background_color = color_yellow
 header_text_color = color_black
 header_padding = "15px 20px" # a full CSS padding property (eg: top/right/bottom/left)
 
+logo_file = "email-logo.gif"
 logo_width = "192" # pixel measurement, but without 'px' suffix
 logo_height = "35" # pixel measurement, but without 'px' suffix
 logo_font_size = "24px"
@@ -50,6 +51,10 @@ button_text_color_notfixed = color_white
 button_text_color_dontknow = color_black
 button_font_weight = "bold"
 
+submit_footer_td_style = "text-align: left; vertical-align: top; font-weight: normal; color: #000;"
+submit_footer_h2_style = "font-size: 16px; line-height: 18px; margin: 0 0 10px 0;";
+submit_footer_link_style = "color: #9CD0EA;";
+
 %]
 
 [% # Handy point at which your cobrand can override any of those default colours before the rest of the settings are constructed. %]
diff --git a/templates/email/default/_email_top.html b/templates/email/default/_email_top.html
index 75dec6788..0191bacfc 100644
--- a/templates/email/default/_email_top.html
+++ b/templates/email/default/_email_top.html
@@ -61,8 +61,8 @@
         <table [% table_reset %]>
           <tr>
             <th colspan="[% email_columns %]" style="[% td_style %][% header_style %]">
-              [%~ IF file_exists("web/cobrands/${ img_dir }/images/email-logo.gif") ~%]
-                <img src="[% inline_image('web/cobrands/' _ img_dir _ '/images/email-logo.gif') %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/>
+                [%~ IF file_exists("web/cobrands/${ img_dir }/images/${ logo_file }") ~%]
+                <img src="[% inline_image('web/cobrands/' _ img_dir _ '/images/' _ logo_file ) %]" width="[% logo_width %]" height="[% logo_height %]" alt="[% site_name %]" style="[% logo_style %]"/>
               [%~ ELSE ~%]
                 <span style="[% logo_style %]">[% site_name %]</span>
               [%~ END %]
diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
index a2f1c69a9..082f5e369 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -14,14 +14,13 @@ 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 %]
-    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <h2 style="[% h2_style %]">[% title %]</h2>
     <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+    [% TRY %][% INCLUDE '_council_reference_alert_update.html' problem=report p_style=secondary_p_style %][% CATCH file %][% END %]
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index cfeba2e36..952b2dbca 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -13,13 +13,14 @@ If you would like to view or reply to these updates, please visit the following
 
     [% problem_url %]
 
+[% TRY %][% INCLUDE '_council_reference_alert_update.txt' problem=report %][% CATCH file %][% END %]
+
 This email was sent automatically, from an unmonitored email account - so
 please do not reply to it.
 
 [% signature %]
 
 
-[% IF NOT hide_unsubscribe %]
 Unsubscribe?
 
 We currently email you whenever someone leaves an update on the
@@ -27,4 +28,3 @@ 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/default/contact.html b/templates/email/default/contact.html
index d9e9b060a..8dc9f3af0 100644
--- a/templates/email/default/contact.html
+++ b/templates/email/default/contact.html
@@ -33,6 +33,11 @@ INCLUDE '_email_top.html';
     - <a href="[% admin_url %]">Admin</a>
   </p>
   [%~ END %]
+  [%~ IF user_agent %]
+  <p style="[% secondary_p_style %]">
+    User Agent: [% user_agent | html %]
+  </p>
+  [%~ END %]
 </th>
 
 [% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/default/contact.txt b/templates/email/default/contact.txt
index 6e1fd5ac9..bd97d17a6 100644
--- a/templates/email/default/contact.txt
+++ b/templates/email/default/contact.txt
@@ -1,4 +1,4 @@
-Subject: FMS message: [% subject %]
+Subject: [% site_name %] message: [% subject %]
 
 [% message %]
 
@@ -6,4 +6,6 @@ Subject: FMS message: [% subject %]
 [ [% complaint %] - [% problem_url %] - [% admin_url %] ]
 [% END %]
 
-[ Sent by contact.cgi on [% host %]. IP address [% ip %] ]
+-- 
+Sent by contact form on [% host %].
+IP address [% ip %], user agent [% user_agent %]
diff --git a/templates/email/default/other-reported.html b/templates/email/default/other-reported.html
index 5435e735a..584c5b89e 100644
--- a/templates/email/default/other-reported.html
+++ b/templates/email/default/other-reported.html
@@ -11,12 +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 %].
-[% 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 %]">Your report to [% report.body %] has been logged on [% site_name %].</p>
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+<p style="[% p_style %]">Please note that [% 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>
   <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/default/other-reported.txt b/templates/email/default/other-reported.txt
index 559b0933b..7b1230555 100644
--- a/templates/email/default/other-reported.txt
+++ b/templates/email/default/other-reported.txt
@@ -4,9 +4,11 @@ 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
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+Please note that [% 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:
diff --git a/templates/email/default/partial.html b/templates/email/default/partial.html
new file mode 100644
index 000000000..494655df9
--- /dev/null
+++ b/templates/email/default/partial.html
@@ -0,0 +1,22 @@
+[%
+
+email_summary = "Confirm your report on " _ site_name;
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Confirm your report</h1>
+  <p style="[% p_style %]">Hello [% report.name || report.email %],</p>
+  <p style="[% p_style %]">Please click on the link below, to confirm the report you have uploaded to [% site_name %] via [% report.service %], and to check or add any details:</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% token_url %]">Check &amp; confirm report</a>
+  </p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
+
diff --git a/templates/email/default/problem-moderated.html b/templates/email/default/problem-moderated.html
index 1a12446d0..142f27fc2 100644
--- a/templates/email/default/problem-moderated.html
+++ b/templates/email/default/problem-moderated.html
@@ -25,8 +25,8 @@ the team at <a href="[% report_complain_uri %]">[% report_complain_uri %]</a></p
   [% end_padded_box %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = problem %]
-    <h2 style="[% h2_style %]">[% problem.moderation_original_data.title | html %]</h2>
-    <p style="[% secondary_p_style %]">[% problem.moderation_original_data.detail | html %]</p>
+    <h2 style="[% h2_style %]">[% moderated_data.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% moderated_data.detail | html %]</p>
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/default/problem-moderated.txt b/templates/email/default/problem-moderated.txt
index 7c1c3b5c2..ee219672f 100644
--- a/templates/email/default/problem-moderated.txt
+++ b/templates/email/default/problem-moderated.txt
@@ -15,11 +15,11 @@ The following data has been changed:
 
 Your report had the title:
 
-[% problem.moderation_original_data.title %]
+[% moderated_data.title %]
 
 And details:
 
-[% problem.moderation_original_data.detail %]
+[% moderated_data.detail %]
 
 [% UNLESS types == 'hide' %]
 You can see the report at [% report_uri %]