From a5bef353a4afe8b36c6a86e33cc9e01742911016 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Wed, 19 Nov 2014 12:16:23 +0000
Subject: Tidy up reporting sidebar notes and privacy.

For #344 and #935.
---
 perllib/FixMyStreet/Cobrand/EastSussex.pm          |   8 --
 perllib/FixMyStreet/Cobrand/UKCouncils.pm          |   9 ++
 templates/web/base/report/new/notes.html           |   9 +-
 templates/web/base/static/privacy.html             |  49 ++++++++
 .../web/eastsussex/report/new/after_category.html  |   1 +
 templates/web/eastsussex/report/new/notes.html     |  11 --
 templates/web/fixmybarangay/report/new/notes.html  |   8 +-
 .../report/new/after_category.html                 |   1 +
 templates/web/fixmystreet.com/static/privacy.html  | 133 +++++++++++++++++++++
 .../report/new/fill_in_details_form.html           |   2 +
 templates/web/fixmystreet/report/new/notes.html    |  11 --
 templates/web/fixmystreet/static/privacy.html      |  85 -------------
 .../web/oxfordshire/report/new/after_category.html |   1 +
 templates/web/oxfordshire/report/new/notes.html    |  10 --
 templates/web/zurich/report/new/notes.html         |   6 +
 15 files changed, 207 insertions(+), 137 deletions(-)
 create mode 100755 templates/web/base/static/privacy.html
 create mode 100644 templates/web/eastsussex/report/new/after_category.html
 delete mode 100644 templates/web/eastsussex/report/new/notes.html
 create mode 100644 templates/web/fixmystreet-uk-councils/report/new/after_category.html
 create mode 100755 templates/web/fixmystreet.com/static/privacy.html
 delete mode 100644 templates/web/fixmystreet/report/new/notes.html
 delete mode 100755 templates/web/fixmystreet/static/privacy.html
 create mode 100644 templates/web/oxfordshire/report/new/after_category.html
 delete mode 100644 templates/web/oxfordshire/report/new/notes.html
 create mode 100644 templates/web/zurich/report/new/notes.html

diff --git a/perllib/FixMyStreet/Cobrand/EastSussex.pm b/perllib/FixMyStreet/Cobrand/EastSussex.pm
index 5081d13e8..5447545e7 100644
--- a/perllib/FixMyStreet/Cobrand/EastSussex.pm
+++ b/perllib/FixMyStreet/Cobrand/EastSussex.pm
@@ -10,14 +10,6 @@ sub council_name { return 'East Sussex County Council'; }
 sub council_url { return 'eastsussex'; }
 sub is_two_tier { return 1; }
 
-sub path_to_web_templates {
-    my $self = shift;
-    return [
-        FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
-        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
-    ];
-}
-
 sub disambiguate_location {
     my $self    = shift;
     my $string  = shift;
diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
index 73132212a..ecea34ddf 100644
--- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm
+++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm
@@ -11,6 +11,15 @@ sub is_council {
     1;
 }
 
+sub path_to_web_templates {
+    my $self = shift;
+    return [
+        FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
+        FixMyStreet->path_to( 'templates/web/fixmystreet-uk-councils' )->stringify,
+        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
+    ];
+}
+
 sub site_restriction {
     my $self = shift;
     return { bodies_str => sprintf('%d', $self->council_id) };
diff --git a/templates/web/base/report/new/notes.html b/templates/web/base/report/new/notes.html
index 68408acc7..8d55adc6e 100644
--- a/templates/web/base/report/new/notes.html
+++ b/templates/web/base/report/new/notes.html
@@ -1,11 +1,8 @@
-<p style="clear:both">[% loc("Please note:") %]</p>
+<p>[% loc("Please note:") %]</p>
 
-<ul>
-
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li>
+<ul class="plain-list">
+    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
     <li>[% loc("Please be polite, concise and to the point.") %]</li>
     <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
     <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
-    <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
-
 </ul>
diff --git a/templates/web/base/static/privacy.html b/templates/web/base/static/privacy.html
new file mode 100755
index 000000000..79e11b03d
--- /dev/null
+++ b/templates/web/base/static/privacy.html
@@ -0,0 +1,49 @@
+[% INCLUDE 'header.html',
+    title = loc('Frequently Asked Questions'),
+    bodyclass = 'twothirdswidthpage' %]
+
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li><a href="/faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq#practical">Practical Questions</a></li>
+            <li><a href="/faq#organisation">Organisation Questions</a></li>
+            <li><strong>Privacy and cookies</strong></li>
+            <li><a href="/contact">Contact [% c.cobrand.site_title %]</a></li>
+        </ul>
+    </aside>
+</div>
+
+<h1>Privacy, cookies, and third party services</h1>
+
+<p><strong>Our use of your data, cookies, and external services: what you
+should know, and how to opt out if you want to.</strong></p>
+
+<h2>Privacy</h2>
+
+    <dl>
+        <dt>Who gets to see my personal details?</dt>
+        <dd>This will depend upon the installation of the FixMyStreet Platform,
+who should create their own <code>static/privacy.html</code> template in their
+cobrand directory to replace this default. In normal cases, your details will
+be passed to the people responsible for dealing with your report, and no-one
+else.</dd>
+
+        <dt>What will you do with my personal details?</dt>
+        <dd>Another question hopefully answered by the installation.</dd>
+    </dl>
+
+<h2>Cookies</h2>
+
+<p>To make our service easier or more useful, we sometimes place small data
+files on your computer or mobile phone, known as cookies; many websites do
+this. We use this information to, for example, remember you have logged in so
+you don't need to do that on every page. Below, we list the cookies and
+services that this site can use.
+
+<table cellpadding=5>
+<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
+<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td></tr>
+</table>
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/eastsussex/report/new/after_category.html b/templates/web/eastsussex/report/new/after_category.html
new file mode 100644
index 000000000..3d21922cb
--- /dev/null
+++ b/templates/web/eastsussex/report/new/after_category.html
@@ -0,0 +1 @@
+<p><small>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact us directly using our website <a href="http://www.eastsussex.gov.uk">eastsussex.gov.uk</a>.</small></p>
diff --git a/templates/web/eastsussex/report/new/notes.html b/templates/web/eastsussex/report/new/notes.html
deleted file mode 100644
index c29925925..000000000
--- a/templates/web/eastsussex/report/new/notes.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p>[% loc("Please note:") %]</p>
-
-<ul class="plain-list">
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
-  [% IF c.cobrand.moniker != 'zurich' %]
-    <li>[% loc("Please be polite, concise and to the point.") %]</li>
-    <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
-    <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
-  [% END %]
-    <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact us directly using our website <a href=\"http://www.eastsussex.gov.uk\">eastsussex.gov.uk</a>.") %]</li>
-</ul>
diff --git a/templates/web/fixmybarangay/report/new/notes.html b/templates/web/fixmybarangay/report/new/notes.html
index 8195051db..c330816b9 100644
--- a/templates/web/fixmybarangay/report/new/notes.html
+++ b/templates/web/fixmybarangay/report/new/notes.html
@@ -1,11 +1,7 @@
-<p style="clear:both">[% loc("Please note:") %]</p>
+<p>[% loc("Please note:") %]</p>
 
-<ul>
-<!--
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li>
--->
+<ul class="plain-list">
     <li>[% loc("Be sure to choose the right category, because we use that to determine to whom the report is sent.") %]</li>
     <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
     <li>[% loc("Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas.") %]</li>
-
 </ul>
diff --git a/templates/web/fixmystreet-uk-councils/report/new/after_category.html b/templates/web/fixmystreet-uk-councils/report/new/after_category.html
new file mode 100644
index 000000000..82f48e1f8
--- /dev/null
+++ b/templates/web/fixmystreet-uk-councils/report/new/after_category.html
@@ -0,0 +1 @@
+<p><small>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</small></p>
diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html
new file mode 100755
index 000000000..4272512ea
--- /dev/null
+++ b/templates/web/fixmystreet.com/static/privacy.html
@@ -0,0 +1,133 @@
+[% INCLUDE 'header.html',
+    title = loc('Frequently Asked Questions'),
+    bodyclass = 'twothirdswidthpage' %]
+
+<div class="sticky-sidebar">
+    <aside>
+        <ul class="plain-list">
+            <li><a href="/faq">Frequently Asked Questions</a></li>
+            <li><a href="/faq#practical">Practical Questions</a></li>
+            <li><a href="/faq#organisation">Organisation Questions</a></li>
+            <li><strong>Privacy and cookies</strong></li>
+            <li><a href="/contact">Contact FixMyStreet</a></li>
+        </ul>
+    </aside>
+</div>
+
+<h1>Privacy, cookies, and third party services</h1>
+
+<p><strong>Our use of your data, cookies, and external services: what you
+should know, and how to opt out if you want to.</strong></p>
+
+<p>Summary: We care a lot about our users’ privacy. We provide details below,
+and we try our hardest to look after the private data that we hold. Like many
+other websites, we sometimes use cookies and Google Analytics to help us make
+our websites better. These tools are very common and used by many other sites,
+but they do have privacy implications, and as a charity concerned with socially
+positive uses of the internet, we think it’s important to explain them in full.
+If you don’t want to share your browsing activities on mySociety’s sites with
+other companies, you can adjust your usage or install opt-out browser plugins.
+
+<h2>Privacy</h2>
+
+    <dl>
+        <dt>Who gets to see my email address?</dt>
+        <dd>If you submit a problem, we pass on your details, and details of
+the problem, to the council contact or contacts responsible for the area where
+you located the problem, or other relevant body (for example, in most of London
+we send reports via the central London Report-It service, who may also publish
+the public details of your report). Other than the council, who obviously get
+your email address, only people we authorise to view the FixMyStreet
+administration interface will be able to see your email address and they will
+never use it for anything other than to help administer FixMyStreet. Similarly
+with email addresses from updates. We will never give or sell your email
+address to anyone else, unless we are obliged to by law. Your name, given in
+the name field, will not be published anywhere unless you let us (if you give
+your name elsewhere, e.g. in the public details section, it will be publicly
+available).</dd>
+        <dt>Will you send nasty, brutish spam to my email address?</dt>
+        <dd>Never. We will email you if someone leaves an update on a
+problem you&rsquo;ve reported, and send you a questionnaire email four weeks
+after you submit a problem, asking for a status update; we&rsquo;ll only ever
+send you emails in relation to your problem.</dd>
+    </dl>
+
+<h2>Cookies</h2>
+
+<p>To make our service easier or more useful, we sometimes place small data
+files on your computer or mobile phone, known as cookies; many websites do
+this. We use this information to, for example, remember you have logged in so
+you don't need to do that on every page, or to measure how people use the
+website so we can improve it and make sure it works properly. Below, we list
+the cookies and services that this site can use.
+
+<table cellpadding=5>
+<tr align="left">
+    <th scope="col">Name</th>
+    <th scope="col">Typical Content</th>
+    <th scope="col">Expires</th>
+</tr>
+
+<tr>
+    <td>fixmystreet_app_session</td>
+    <td nowrap>A random unique identifier</td>
+    <td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td>
+</tr>
+
+</table>
+
+<h3>Measuring website usage (Google Analytics)</h3>
+
+<p>We use Google Analytics to collect information about how people use this
+site. We do this to make sure it’s meeting its users’ needs and to understand
+how we could do it better. Google Analytics stores information such as what
+pages you visit, how long you are on the site, how you got here, what you click
+on, and information about your web browser. IP addresses are masked (only a
+portion is stored) and personal information is only reported in aggregate. We
+do not allow Google to use or share our analytics data for any purpose besides
+providing us with analytics information, and we recommend that any user of
+Google Analytics does the same.
+
+<p>If you’re unhappy with data about your visit to be used in this way, you can
+install the <a href="http://tools.google.com/dlpage/gaoptout">official browser
+plugin for blocking Google Analytics</a>.
+
+<p>The cookies set by Google Analytics are as follows:
+
+<table cellpadding=5>
+<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
+<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2&nbsp;years</td></tr>
+<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30&nbsp;minutes</td></tr>
+<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6&nbsp;months</td></tr>
+<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2&nbsp;years</td></tr>
+</table>
+
+<h4>Google’s Official Statement about Analytics Data</h4>
+
+<p>“This website uses Google Analytics, a web analytics service provided by
+Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files
+placed on your computer, to help the website analyze how users use the site.
+The information generated by the cookie about your use of the website
+(including your IP address) will be transmitted to and stored by Google on
+servers in the United States . Google will use this information for the purpose
+of evaluating your use of the website, compiling reports on website activity
+for website operators and providing other services relating to website activity
+and internet usage. Google may also transfer this information to third parties
+where required to do so by law, or where such third parties process the
+information on Google’s behalf. Google will not associate your IP address with
+any other data held by Google. You may refuse the use of cookies by selecting
+the appropriate settings on your browser, however please note that if you do
+this you may not be able to use the full functionality of this website. By
+using this website, you consent to the processing of data about you by Google
+in the manner and for the purposes set out above.”</p>
+
+<p><a href="https://www.mysociety.org/privacy-online/">More general information
+on how third party services work</a></p>
+
+<h2>Credits</h2>
+
+<p>Bits of wording taken from the <a
+href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open
+Government Licence).
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 7dfadb018..f474355b9 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -98,6 +98,8 @@
             [% PROCESS "report/new/category_extras.html" %]
           [%- END %]
 
+          [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %]
+
           [% IF c.cobrand.allow_photo_upload %]
               <label for="form_photo">[% loc('Photo') %]</label>
               [% IF upload_fileid || report.photo %]
diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html
deleted file mode 100644
index 657390c79..000000000
--- a/templates/web/fixmystreet/report/new/notes.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<p>[% loc("Please note:") %]</p>
-
-<ul class="plain-list">
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
-  [% IF c.cobrand.moniker != 'zurich' %]
-    <li>[% loc("Please be polite, concise and to the point.") %]</li>
-    <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
-    <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
-  [% END %]
-    <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
-</ul>
diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html
deleted file mode 100755
index a2545cb1c..000000000
--- a/templates/web/fixmystreet/static/privacy.html
+++ /dev/null
@@ -1,85 +0,0 @@
-[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
-
-<div class="sticky-sidebar">
-    <aside>
-        <ul class="plain-list">
-            <li><a href="/faq">Frequently Asked Questions</a></li>
-            <li><a href="/faq#practical">Practical Questions</a></li>
-            <li><a href="/faq#organisation">Organisation Questions</a></li>
-            <li><strong>Privacy and cookies</strong></li>
-            <li><a href="/contact">Contact FixMyStreet</a></li>
-        </ul>
-    </aside>
-</div>
-
-<h1>Privacy, cookies, and third party services</h1>
-
-<p><strong>Our use of your data, cookies, and external services: what you should know, and how to opt out if you want to.</strong></p>
-
-<p>Summary: We care a lot about our users’ privacy. We provide details below,
-and we try our hardest to look after the private data that we hold. Like many
-other websites, we sometimes use cookies and Google Analytics to help us make
-our websites better. These tools are very common and used by many other sites,
-but they do have privacy implications, and as a charity concerned with socially
-positive uses of the internet, we think it’s important to explain them in full.
-If you don’t want to share your browsing activities on mySociety’s sites with
-other companies, you can adjust your usage or install opt-out browser plugins.
-
-<h2>Privacy</h2>
-
-    <dl>
-        <dt>Who gets to see my email address?</dt>
-        <dd>If you submit a problem, we pass on your details, and details
-of the problem, to the council contact or contacts responsible for the
-area where you located the problem, or other relevant body (for example, in
-most of London we send reports via the central London Report-It service, who
-may also publish the public details of your report). Other than the council, who obviously get your
-email address, only people we authorise to view the FixMyStreet administration interface
-will be able to see your email address and they will never use it for anything other than 
-to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, 
-unless we are obliged to by law. Your name, given in the name field, will not
-be published anywhere unless you let us (if you give your name elsewhere, e.g.
-in the public details section, it will be publicly available).</dd>
-        <dt>Will you send nasty, brutish spam to my email address?</dt>
-        <dd>Never. We will email you if someone leaves an update on a
-problem you&rsquo;ve reported, and send you a questionnaire email four weeks
-after you submit a problem, asking for a status update; we&rsquo;ll only ever
-send you emails in relation to your problem.</dd>
-    </dl>
-
-<h2>Cookies</h2>
-
-<p>To make our service easier or more useful, we sometimes place small data files on your computer or mobile phone, known as cookies; many websites do this. We use this information to, for example, remember you have logged in so you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use.
-
-<table cellpadding=5>
-<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
-<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if &ldquo;Keep me signed in&rdquo; is ticked</td></tr>
-</table>
-
-<h3>Measuring website usage (Google Analytics)</h3>
-
-<p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand how we could do it better. Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same.
-
-<p>If you’re unhappy with data about your visit to be used in this way, you can install the <a href="http://tools.google.com/dlpage/gaoptout">official browser plugin for blocking Google Analytics</a>.
-
-<p>The cookies set by Google Analytics are as follows:
-
-<table cellpadding=5>
-<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr>
-<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2&nbsp;years</td></tr>
-<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30&nbsp;minutes</td></tr>
-<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6&nbsp;months</td></tr>
-<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2&nbsp;years</td></tr>
-</table>
-
-<h4>Google’s Official Statement about Analytics Data</h4>
-
-<p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage.  Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google.  You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website.  By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p>
-
-<p><a href="https://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p>
-
-<h2>Credits</h2>
-
-<p>Bits of wording taken from the <a href="https://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence).
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/oxfordshire/report/new/after_category.html b/templates/web/oxfordshire/report/new/after_category.html
new file mode 100644
index 000000000..93dc8126b
--- /dev/null
+++ b/templates/web/oxfordshire/report/new/after_category.html
@@ -0,0 +1 @@
+<p><small>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. Remember that you can contact Oxfordshire County Council for additional issues that are not covered on this reporting facility.</small></p>
diff --git a/templates/web/oxfordshire/report/new/notes.html b/templates/web/oxfordshire/report/new/notes.html
deleted file mode 100644
index 5fa154ed9..000000000
--- a/templates/web/oxfordshire/report/new/notes.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>[% loc("Please note:") %]</p>
-
-<ul class="plain-list">
-    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
-    <li>[% loc("Please be polite, concise and to the point.") %]</li>
-    <li>[% loc("Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users.") %]</li>
-    <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
-    <li>Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. Remember that you can contact Oxfordshire County Council for additional issues that are not covered on this reporting facility.</li>
-</ul>
-
diff --git a/templates/web/zurich/report/new/notes.html b/templates/web/zurich/report/new/notes.html
new file mode 100644
index 000000000..3f832c1ed
--- /dev/null
+++ b/templates/web/zurich/report/new/notes.html
@@ -0,0 +1,6 @@
+<p>[% loc("Please note:") %]</p>
+
+<ul class="plain-list">
+    <li>[% loc("We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>") %]</li>
+    <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
+</ul>
-- 
cgit v1.2.3