Text updates from Bromley.

3 files changed, 55 insertions, 28 deletions

diff --git a/templates/web/bromley/contact/address.html b/templates/web/bromley/contact/address.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/templates/web/bromley/contact/address.html
diff --git a/templates/web/bromley/contact/submit.html b/templates/web/bromley/contact/submit.html
new file mode 100644
index 000000000..781862866
--- /dev/null
+++ b/templates/web/bromley/contact/submit.html
@@ -0,0 +1,19 @@
+[% INCLUDE 'header.html', title = loc('Contact Us') %]
+
+<h1>[% loc('Contact the team') %]</h1>
+
+[% IF success %]
+
+<p>Thank you for letting us know about this report. We will review, and if
+necessary, edit the report, or remove it from the site. You can contact us at
+<a href="mailto:[% contact_email %]">[% contact_email %]</a>.
+
+[% ELSE %]
+
+    <p>
+    [% tprintf( loc('Failed to send message.  Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %]
+    </p>
+
+[% END %]
+
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html
index 91bcba696..c364f4c41 100755
--- a/templates/web/bromley/faq/faq-en-gb.html
+++ b/templates/web/bromley/faq/faq-en-gb.html
@@ -1,18 +1,19 @@
 [% INCLUDE 'header.html', title = 'Help', bodyclass = 'fullwidthpage' %]
 
-<p>These pages are for reporting things which are broken or dirty or damaged or dumped, and need fixing, cleaning or clearing, such as:</p>
+<p>These pages are for reporting things which are broken, dirty, damaged or dumped, and need fixing, cleaning or clearing, such as:</p>
     <ul><li>abandoned vehicles
-    <li>flyposting or graffiti
-    <li>flytipping or litter
-    <li>streetcleaning, such as broken glass in a cycle lane
-    <li>unlit lamposts
-    <li>broken playground equipment
+    <li>graffiti
+    <li>flytipping and dumped rubbish
+    <li>street cleaning, such as dog fouling and street sweeping
+    <li>unlit lamp posts
+    <li>park repairs, such as broken fences or playground equipment
     <li>potholes
     </ul>
 
 <dl>
     <dt>What issues can&rsquo;t be reported here?</dt>
-    <dd><p>It is not a way of reporting all issues. Problems such as:</p>
+    <dd><p>The following problems should be reported via
+    <a href="http://www.bromley.gov.uk/report">http://www.bromley.gov.uk/report</a>:</p>
     <ul>
     <li>missed rubbish or recycling collections
     <li>anti-social behaviour
@@ -22,8 +23,9 @@
     <li>complaining about your neighbours
     <li>complaining or commenting about the council
     </ul>
-    <p>should be reported through <a href="http://www.bromley.gov.uk/report">http://www.bromley.gov.uk/report</a>.</p>
     <p>Do not use this to report urgent or emergency problems because reports are not always dealt with immediately outside of working hours.</p>
+    <p>Note, the council does not maintain responsibility for problems on private land or TFL roads (A21 and part of the A232, West Wickham to Locksbottom). TFL road enquiries should be directed to <a href="http://reportit.tfl.gov.uk/">http://reportit.tfl.gov.uk/</a>. 
+
     </dd>
 
         <dt>How do I report a problem here?</dt>
@@ -37,7 +39,7 @@ the problem.</dd>
 
         <dt>Do you remove silly or illegal content?</dt>
         <dd>Bromley Council and FixMyStreet are not responsible for the content and accuracy
-of material submitted by their users. We reserve the right to edit or remove any
+of material submitted by its users. We reserve the right to edit or remove any
 problems or updates which we consider to be inappropriate upon being informed
 by a user of the site.</dd>
 
@@ -48,16 +50,15 @@ by a user of the site.</dd>
     <dt>Can I use these pages to report problems outside of the London Borough of Bromley?</dd>
     <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd>
 
-        <dt>Who built FixMyStreet?</dt>
+    <dt>The site is powered by FixMyStreet, who are they?</dt>
         <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. 
 mySociety is the project of a registered charity which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
-benefits in the civic and community aspects of their lives. Our first project
-was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your
-elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety 
+benefits in the civic and community aspects of their lives.
+The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
-or by post at: mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd>
+or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd>
 
     <dt>Why does the site use kilometres for measurements?</dt>
     <dd>The British national
@@ -72,20 +73,6 @@ or by post at: mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd>
     move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all
     the reports you&rsquo;ve made, wherever they are.</dd>
 
-        <dt>Who gets to see my email address?</dt>
-        <dd>If you submit a problem, your details, and details
-        of the problem, will be submitted to Bromley Council.
-Other than the council, 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. We will never give or sell your email address to anyone else, 
-unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd>
-
-        <dt>What emails will you send to me?</dt>
-        <dd>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>
-
         <dt>I&rsquo;d like a site like this for my own location/ where&rsquo;s the "source code" to this site?</dt>
         <dd>
 The software behind this site is open source, and available
@@ -98,6 +85,27 @@ make available the source code to any such projects.
 being used in a Norwegian version of this site.
 </dd>
 
+</dl>
+
+    <h2>Privacy Questions</h2>
+
+    <dl>
+        <dt>Who gets to see my email address?</dt>
+        <dd>
+<p>If you submit a problem, your details, and details of the problem, will be
+submitted to Bromley Council. Other than the council, 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.</p>
+<p>We will never give or sell your email address to anyone else, unless we are
+obliged to by law. Your name will not be published anywhere unless you let us.</p>
+</dd>
+
+        <dt>What emails will you send to me?</dt>
+        <dd>We will email you when we have received your report, and when it has
+        been investigated and actioned. We will only send you emails that
+        relate to an issue you have reported.</dd>
+
     </dl>
 
 [% INCLUDE 'footer.html' pagefooter = 'yes' %]