5 files changed, 39 insertions, 5 deletions
diff --git a/templates/email/oxfordshire/_problem-confirm_extra.html b/templates/email/oxfordshire/_problem-confirm_extra.html
new file mode 100644
index 000000000..5e22be6b9
--- /dev/null
+++ b/templates/email/oxfordshire/_problem-confirm_extra.html
@@ -0,0 +1,14 @@
+[% IF c.cobrand.problem_response_days(report) == 'emergency' %]
+  <p>
+    Thank you for contacting Oxfordshire County Council [% report.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br />
+    Reported faults will continue to be registered on our management system and these will be tackled in coming months.
+  </p>
+[% ELSIF c.cobrand.problem_response_days(report) > 0 %]
+  <p>
+      Problems in the
+      [% report.category %]
+      category are generally responded to within
+      [% c.cobrand.problem_response_days(report) %]
+      working days.
+  </p>
+[% END %]
diff --git a/templates/email/oxfordshire/_problem-confirm_extra.txt b/templates/email/oxfordshire/_problem-confirm_extra.txt
new file mode 100644
index 000000000..eb9ccfd12
--- /dev/null
+++ b/templates/email/oxfordshire/_problem-confirm_extra.txt
@@ -0,0 +1,12 @@
+[% IF c.cobrand.problem_response_days(report) == 'emergency' %]
+Thank you for contacting Oxfordshire County Council [% report.category %],
+unfortunately we are currently only available to respond to emergency
+situations which may have an impact on the health and safety of members
+of the public, these will be dealt with within a 24 hour period.
+
+Reported faults will continue to be registered on our management
+system and these will be tackled in coming months.
+[% ELSIF c.cobrand.problem_response_days(report) > 0 %]
+Problems in the [% report.category %] category are generally responded
+to within [% c.cobrand.problem_response_days(report) %] working days.
+[% END %]
diff --git a/templates/email/oxfordshire/archive.html b/templates/email/oxfordshire/archive.html
index ed48456a2..886ffa8de 100644
--- a/templates/email/oxfordshire/archive.html
+++ b/templates/email/oxfordshire/archive.html
@@ -9,7 +9,7 @@ INCLUDE '_email_top.html';
 %]
 
 <th style="[% td_style %][% only_column_style %]">
-  <h1 style="[% h1_style %]">Your [% site_name %] reports on FixMyStreet</h1>
+  <h1 style="[% h1_style %]">Your reports on [% site_name %]</h1>
   <p style="[% p_style %]">
     Hello [% user.name %],
   </p>
@@ -30,7 +30,7 @@ INCLUDE '_email_top.html';
   </p>
   <p style="[% p_style %]">
     If you believe that your report is still a problem, you can reopen it by
-    clicking the 'reopen' button by a report.
+    clicking the 'view report' button by a report and leaving an update.
   </p>
 
   [% FOR report IN reports %]
@@ -48,7 +48,7 @@ INCLUDE '_email_top.html';
       Reported [% report.time_ago %] ago.
     </p>
     <p>
-      <a style="[% button_style %]" href="[% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form">Reopen report</a>
+      <a style="[% button_style %]" href="[% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form">View report</a>
     </p>
   </div>
   [% END %]
diff --git a/templates/email/oxfordshire/archive.txt b/templates/email/oxfordshire/archive.txt
index 6ecf5b02f..d6b24979b 100644
--- a/templates/email/oxfordshire/archive.txt
+++ b/templates/email/oxfordshire/archive.txt
@@ -11,7 +11,7 @@ We noticed that you have [% report_count %] old [% nget('report', 'reports', rep
 If your report is no longer an issue, you don't need to do anything.
 
 If you believe that your report is still a problem, you can reopen it by clicking or copying and pasting
-the link marked 'Reopen?' by a report.
+the link marked 'View report' by a report and leaving an update.
 
 [% FOR report IN reports %]
 
@@ -19,7 +19,7 @@ the link marked 'Reopen?' by a report.
 
 Reported [% report.time_ago %] ago.
 
-Reopen? [% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form
+View report: [% cobrand.base_url_for_report( report ) %][% report.tokenised_url( user, { reopen => 'true' } ) %]#update_form
 
 ----
 
diff --git a/templates/email/oxfordshire/rdi.txt b/templates/email/oxfordshire/rdi.txt
new file mode 100644
index 000000000..f12467d68
--- /dev/null
+++ b/templates/email/oxfordshire/rdi.txt
@@ -0,0 +1,8 @@
+Subject: RDI report for [% user.name %]
+
+Please find attached RDI file for [% start_date %]
+to [% end_date %].
+
+----
+
+The mySociety team and Oxfordshire County Council