Merge remote-tracking branch 'origin/bromley' into bromley

4 files changed, 130 insertions, 17 deletions

diff --git a/templates/web/bromley/faq/faq-en-gb.html b/templates/web/bromley/faq/faq-en-gb.html
new file mode 100755
index 000000000..0b0b630a6
--- /dev/null
+++ b/templates/web/bromley/faq/faq-en-gb.html
@@ -0,0 +1,119 @@
+[% 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="#practical">Practical Questions</a></li>
+            <li><a href="#privacy">Privacy Questions</a></li>
+            <li><a href="#organisation">Organisation Questions</a></li>
+        </ul>
+    </aside>
+</div>
+
+<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>
+    <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>potholes
+    </ul>
+
+<dl>
+    <dt>What issues can&rsquo;t be reported here?</dt>
+    <dd>It is not a way of reporting all issues. Problems such as:
+    <ul>
+    <li>missed rubbish or recycling collections
+    <li>anti-social behaviour
+    <li>noise pollution or barking dogs
+    <li>fires and smoke/smell pollution
+    <li>proposals for speed bumps/ CCTV/ pedestrian crossings/ new road layouts/ etc.
+    <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>
+    </dd>
+
+        <dt>How do I report a problem here?</dt>
+        <dd>After entering a postcode or location, you are shown
+a map of that area. You can view problems already reported in that area,
+or report ones of your own by clicking on the map at the location of
+the problem.</dd>
+        <dt>How are the problems solved?</dt>
+        <dd>They are reported directly to us so we can then resolve the problem.
+        You can also discuss the problem on the website with others if you wish.</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
+problems or updates which we consider to be inappropriate upon being informed
+by a user of the site.</dd>
+
+    <dt>Can I use FixMyStreet on my mobile?</dt>
+    <dd>Yes a special mobile friendly version is available to report problem in Bromley’s streets or parks.
+    </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>
+        <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 
+can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
+or by post at:<br>
+mySociety<br>
+483 Green Lanes<br>
+London<br>
+N13 4BS<br>
+UK</dd>
+
+    <dt>Why does the site use kilometres for measurements?</dt>
+    <dd>The British national
+    grid reference system, devised by Ordnance Survey (the British national
+    mapping agency) around the time of the second world war, uses eastings and
+    northings measured in metres and kilometres; the maps we use are from
+    Ordnance Survey and so this is what we use to display distances.
+    There you have it: not everything British is in miles!</dd>
+
+    <dt>Why can&rsquo;t I zoom out more on the reporting map?</dt>
+    <dd>We want to keep reports locally focused, so we restrict the ability to
+    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
+to you mainly under the GNU Affero GPL software license. You can <a
+href="http://github.com/mysociety/fixmystreet">download the
+source code</a> and help us develop it.
+You&rsquo;re welcome to use it in your own projects, although you must also
+make available the source code to any such projects.
+<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code
+being used in a Norwegian version of this site.
+</dd>
+
+    </dl>
+
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html
index 9b06425da..1ceb0ac10 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -23,18 +23,11 @@
                     <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p>
                 [% END %]
             <p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p>
-            [% END %]
-
-            <p>
-            [% IF report.used_map %]
-	We won&rsquo;t be able to help unless you leave as much
-detail as you can. Please describe the exact location of the problem (e.g. on a
-wall), what it is, how long it has been there, a description (and a photo of
-the problem if you have one), etc.
             [% ELSE %]
+            <p>
                 [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %]
-            [% END %]
             </p>
+            [% END %]
         </div>
         
     </div>
@@ -59,6 +52,13 @@ the problem if you have one), etc.
             <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required>
 
             <label for="form_detail">[% loc('Details') %]</label>
+            [% IF report.used_map %]
+            <p>
+	We won&rsquo;t be able to help unless you leave as much
+detail as you can. Please describe the exact location of the problem (e.g. on a
+wall).
+            </p>
+            [% END %]
             [% IF field_errors.detail %]
                 <p class='form-error'>[% field_errors.detail %]</p>
             [% END %]
@@ -178,7 +178,7 @@ the problem if you have one), etc.
 
                         <div class="general-sidebar-notes form-focus-hidden">
                             <p class="dark">[% loc('We never show your email address or phone number.') %]</p>
-                            <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
+                            <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports.') %]</p>
                         </div>
 
                         <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
@@ -220,10 +220,6 @@ the problem if you have one), etc.
         </div>
     </fieldset>
 
-        <div class="sidebar-notes">
-            [% INCLUDE 'report/new/notes.html' %]
-        </div>
-
     [% IF partial_token %]
         <input type="hidden" name="partial" value="[% partial_token.token %]">
     [% END %]
diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html
index eef172858..289520be3 100644
--- a/templates/web/fixmystreet/report/new/notes.html
+++ b/templates/web/fixmystreet/report/new/notes.html
@@ -1,9 +1,7 @@
 <p>[% loc("Please note:") %]</p>
 
 <ul class="plain-list">
-[% IF c.cobrand.moniker != 'bromley' %]
     <li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li>
-[% END %]
     <li>[% loc("Please be polite, concise and to the point.") %]</li>
     <li>[% loc("Please do not be abusive &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>
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index a92d02c84..ac8a7819e 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -23,7 +23,7 @@ function fixmystreet_update_pin(lonlat) {
         $('#side-form, #site-logo').show();
         $('#councils_text').html(data.councils_text);
         $('#form_category_row').html(data.category);
-        if ( data.extra_name_info ) {
+        if ( data.extra_name_info && !$('#form_fms_extra_title').length ) {
             // there might be a first name field on some cobrands
             var lb = $('#form_first_name').prev() || $('#form_name').prev();
             lb.before(data.extra_name_info);