From baa0fe5f1449e5f87179c2ae683a8288a74bcec8 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 10:49:24 +0000
Subject: Fix flagging wording template link.

f58ce6c4 changed the base contact template to include a link to a
fixmystreet.com specific page. Revert this back and make the change
in the correct cobrand only.
---
 t/app/controller/contact.t                                 | 2 +-
 templates/web/base/contact/index.html                      | 8 ++------
 templates/web/base/contact/unsuitable-text.html            | 3 +++
 templates/web/base/report/display_tools.html               | 4 +++-
 templates/web/fixmystreet.com/contact/unsuitable-text.html | 7 +++++++
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 templates/web/base/contact/unsuitable-text.html
 create mode 100644 templates/web/fixmystreet.com/contact/unsuitable-text.html

diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t
index aabf915ad..7c2769b9c 100644
--- a/t/app/controller/contact.t
+++ b/t/app/controller/contact.t
@@ -99,7 +99,7 @@ for my $test (
             $mech->content_contains( $test->{update}->{text} );
         } else {
             $mech->get_ok( '/contact?id=' . $problem->id );
-            $mech->content_contains('Does this report break our');
+            $mech->content_contains('reporting the following problem');
             $mech->content_contains( $test->{title} );
             $mech->content_contains( $test->{meta} );
         }
diff --git a/templates/web/base/contact/index.html b/templates/web/base/contact/index.html
index a66d183b6..f24f8afea 100644
--- a/templates/web/base/contact/index.html
+++ b/templates/web/base/contact/index.html
@@ -40,16 +40,12 @@
             <input type="hidden" name="id" value="[% update.problem_id %]">
 
         [% ELSIF problem %]
-            <p>
             [% IF moderation_complaint %]
             <input type="hidden" name="m" value="[% moderation_complaint %]">
-            [% loc('You are complaining that this problem report was unnecessarily moderated:') %]
+            <p>[% loc('You are complaining that this problem report was unnecessarily moderated:') %]</p>
             [% ELSE %]
-            [% loc('Does this report break our <a href="/about/house-rules">House Rules</a>? Use this form to let us know.') %]
-            </p> <p>
-            <strong>[% loc('If you are trying to make a new report, please <a href="/">go to the front page</a> and follow the instructions.') %]</strong>
+            [% INCLUDE 'contact/unsuitable-text.html' %]
             [% END %]
-            </p>
 
             <blockquote>
                 <h2>[% problem.title_safe | html %]</h2>
diff --git a/templates/web/base/contact/unsuitable-text.html b/templates/web/base/contact/unsuitable-text.html
new file mode 100644
index 000000000..12137c818
--- /dev/null
+++ b/templates/web/base/contact/unsuitable-text.html
@@ -0,0 +1,3 @@
+<p>
+    [% loc('You are reporting the following problem report for being abusive, containing personal information, or similar:') %]
+</p>
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index 8a756a948..fb337df59 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -6,7 +6,9 @@
             <input type="submit" id="key-tool-report-abuse" class="abuse btn" data-confirm="[% loc('Are you sure?') %]" name="remove_from_site" value="[% loc('Remove from site') %]">
         </form></li>
         [% ELSIF c.cobrand.moniker != 'zurich' %]
-        <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Unsuitable?' ) %]</a></li>
+        <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[%
+            c.cobrand.moniker == 'fixmystreet' ? 'Unsuitable?' : loc('Report abuse')
+        %]</a></li>
         [% END %]
         [% IF c.cobrand.moniker != 'zurich' %]
         <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li>
diff --git a/templates/web/fixmystreet.com/contact/unsuitable-text.html b/templates/web/fixmystreet.com/contact/unsuitable-text.html
new file mode 100644
index 000000000..92642aec7
--- /dev/null
+++ b/templates/web/fixmystreet.com/contact/unsuitable-text.html
@@ -0,0 +1,7 @@
+<p>
+    [% loc('Does this report break our <a href="/about/house-rules">House Rules</a>? Use this form to let us know.') %]
+</p>
+
+<p>
+    <strong>[% loc('If you are trying to make a new report, please <a href="/">go to the front page</a> and follow the instructions.') %]</strong>
+</p>
-- 
cgit v1.2.3