9 files changed, 42 insertions, 35 deletions
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index ab4870bb1..de671a284 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -10,7 +10,10 @@ website:
 
 If your email program does not let you click on this link, copy and paste it
 into your web browser and press return.
-
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Please note that [% c.cobrand.council_name %] is not responsible for this type
+of problem, so it will instead be sent to [% report.body %].
+[% END %]
 Your problem had the title:
 
 [% report.title %]
diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html
index bce562a59..f35f152e8 100644
--- a/templates/web/base/maps/noscript_map.html
+++ b/templates/web/base/maps/noscript_map.html
@@ -54,7 +54,7 @@
 [% BLOCK pin %]
 
 [% IF pin.id %]
-<a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]">
+<a title="[% pin.title | html %]" href="[% c.cobrand.base_url_for_report( pin.problem ) %][% pin.problem.url %]">
 [%- END -%]
 <img border="0" class="pin" src="[% start %][% c.cobrand.path_to_pin_icons _ 'pin-' _ pin.colour _ '.png' %]"
     alt="[% loc('Problem') %]" style="top:[% pin.py - 64 %]px; left:[% pin.px - 24 %]px; position: absolute;">
diff --git a/templates/web/base/report/_item.html b/templates/web/base/report/_item.html
index 704dfd29c..5894c5d81 100644
--- a/templates/web/base/report/_item.html
+++ b/templates/web/base/report/_item.html
@@ -1,5 +1,5 @@
 <li class="item-list__item item-list--reports__item [% item_extra_class %]">
-<a href="[% c.uri_for('/report', problem.id ) %]">
+<a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">
     [% IF problem.photo %]
         <img class="img" height="60" width="90" src="[% problem.photos.first.url_fp %]" alt="">
     [% END %]
@@ -14,15 +14,18 @@
             [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %],
                 [% tprintf(loc('last updated %s'), prettify_dt( problem.lastupdate, 1 ) ) %]
             [%- END %]
-        [% IF include_sentinfo %]
-            [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %]
-            [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %]
+            [% IF include_sentinfo %]
+                [% IF c.cobrand.is_council && !c.cobrand.owns_problem( problem ) %]
+                    (sent to [% problem.body %])
+                [% ELSIF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %]
+                [% ELSIF problem.bodies_str_ids.size == 0 %] [% loc('(not sent to council)') %]
+                [% END %]
             [% END %]
-        [% END %]
-        [% IF NOT no_fixed AND problem.is_fixed %]
-            [% loc('(fixed)') %]
-        [% ELSIF NOT no_fixed AND problem.is_closed %]
-            [% loc('(closed)') %]
-        [% END %]</small>
+            [% IF NOT no_fixed AND problem.is_fixed %]
+                [% loc('(fixed)') %]
+            [% ELSIF NOT no_fixed AND problem.is_closed %]
+                [% loc('(closed)') %]
+            [% END %]
+        </small>
 </a>
 </li>
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 4821b3fa0..1eb6f809e 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -32,8 +32,7 @@
         </label>
     </div>
     <p class="report_meta_info">
-        [% problem.meta_line(c) | html %]
-        [%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %]
+        [% INCLUDE 'report/_report_meta_info.html' %]
     </p>
 
     [% INCLUDE 'report/_main_sent_info.html' %]
diff --git a/templates/web/base/report/_report_meta_info.html b/templates/web/base/report/_report_meta_info.html
new file mode 100644
index 000000000..da7339c81
--- /dev/null
+++ b/templates/web/base/report/_report_meta_info.html
@@ -0,0 +1,2 @@
+[% problem.meta_line(c) | html %]
+[%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %]
diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html
index 5892d0f9e..a4573b5e6 100644
--- a/templates/web/base/tokens/confirm_problem.html
+++ b/templates/web/base/tokens/confirm_problem.html
@@ -5,8 +5,21 @@
   <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1>
 
   [% IF c.cobrand.is_council %]
-    <h2>Your issue is on its way to the council.</h2>
-    <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p>
+    [% IF c.cobrand.owns_problem( report ) %]
+        <h2>Your issue is on its way to the council.</h2>
+        <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p>
+    [% ELSE %]
+        <h2>Thank you for your report.</h2>
+        <p>
+            We don&rsquo;t handle this type of problem, so have passed it on to:
+        </p>
+        <p>
+            <b>[% report.body %]</b>
+        </p>
+        <p>
+            You can follow this problem on <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">FixMyStreet.com</a>.
+        </p>
+     [% END %]
 
   [% ELSE %]
     <h2>[% loc('Thank you for reporting this issue!') %]</h2>
diff --git a/templates/web/fixmystreet.com/report/_report_meta_info.html b/templates/web/fixmystreet.com/report/_report_meta_info.html
new file mode 100644
index 000000000..da0912a3f
--- /dev/null
+++ b/templates/web/fixmystreet.com/report/_report_meta_info.html
@@ -0,0 +1,5 @@
+[% problem.meta_line(c) | html %]
+[% IF c.cobrand.moniker != problem.get_cobrand_logged.moniker AND problem.get_cobrand_logged.is_council %]
+    using <a href="https://www.fixmystreet.com/about/council">FixMyStreet for Councils</a>
+[% END %]
+[%- IF !problem.used_map %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %]
diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html
deleted file mode 100644
index 68223e92b..000000000
--- a/templates/web/hart/tokens/confirm_problem.html
+++ /dev/null
@@ -1,19 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Confirmation') %]
-
-<h1>[% loc('Confirmation') %]</h1>
-
-<p class="confirmed">
-Thank you. You have successfully confirmed your report
-[% IF c.cobrand.owns_problem( report ) %]
-and this will now be investigated by the council.
-You can <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">view the report on this site</a>.
-[% ELSE %]
-and this has now been passed on to [%# TODO make this generic %] <b>Hampshire County Council</b> to investigate.
-Note that Hart District Council is not responsible for this type of problem.  However you can continue to view your report on the <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]"><i>fixmystreet.com</i> website</a>.
-[% END %]
-</p>
-
-<p>Your reference for this report is [% report.id %], please quote it in any enquiries.
-</p>
-
-[% INCLUDE 'footer.html' %]
diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html
index 43d3d6265..76b135665 100644
--- a/templates/web/oxfordshire/reports/_list-entry.html
+++ b/templates/web/oxfordshire/reports/_list-entry.html
@@ -1,4 +1,5 @@
 [% INCLUDE 'report/_item.html'
     no_fixed = 1
+    include_sentinfo = 1
     item_extra_class = 'item-list__item--with-pin ' _ c.cobrand.pin_colour(problem)
 %]