Move most 'change location' text to main column.

8 files changed, 29 insertions, 33 deletions

diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html
index 5eff4e147..1e687cf88 100644
--- a/templates/web/base/report/new/fill_in_details_form.html
+++ b/templates/web/base/report/new/fill_in_details_form.html
@@ -1,10 +1,11 @@
-<h1>[% loc('Reporting a problem') %]</h1>
+<h1>[% loc('Report your problem') %]</h1>
 
 [% IF report.used_map %]
+    <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
+
     [% IF partial_token %]
         <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 %]
 
 [% IF js %]
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 e4c101a1b..e5c920eae 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -1,4 +1,8 @@
 <div id="report-a-problem-main">
+  [% IF report.used_map %]
+    <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
+  [% END %]
+
     [% IF js %]
         <p id="councils_text">
         [%
@@ -18,7 +22,6 @@
             [% IF partial_token %]
                 <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>
         [% 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.') %]
diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html
index b269267e1..e6ddd56a0 100644
--- a/templates/web/emptyhomes/report/new/fill_in_details_form.html
+++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html
@@ -1,10 +1,10 @@
-<h1>[% loc('Reporting a problem') %]</h1>
+<h1>[% loc('Report your problem') %]</h1>
 
-[% IF report.used_map %]
+  [% IF report.used_map %]
+    <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
     [% IF partial_token %]
         <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 %]
 
 [% IF js %]
diff --git a/templates/web/fixamingata/report/new/fill_in_details_form.html b/templates/web/fixamingata/report/new/fill_in_details_form.html
index 17c7c8870..63c4e8788 100644
--- a/templates/web/fixamingata/report/new/fill_in_details_form.html
+++ b/templates/web/fixamingata/report/new/fill_in_details_form.html
@@ -1,5 +1,9 @@
 <div id="report-a-problem-main">
-    <h1>[% loc('Reporting a problem') %]</h1>
+    <h1>[% loc('Report your problem') %]</h1>
+
+  [% IF report.used_map %]
+    <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
+  [% END %]
 
     [% IF js %]
         <p id="councils_text">
@@ -15,17 +19,12 @@
         [% PROCESS 'report/new/councils_text.html' %]
     [% END %]
 
-    [% IF c.cobrand.moniker != 'fixmybarangay' || ( c.user && c.user.from_council ) %]
     <div id="report-a-problem-sidebar">
-        <!--
-            The text for this section needs checking, but I can't work out which bit comes from where
-        -->
         <div class="sidebar-tips">
             [% IF report.used_map %]
                 [% IF partial_token %]
                     <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>
@@ -42,7 +41,6 @@
         </div>
 
     </div>
-    [% END %]
 
     [% INCLUDE 'errors.html' %]
     <fieldset>
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 6e64b8d1b..7dfadb018 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -1,7 +1,7 @@
 <div id="report-a-problem-main">
     <h1>[% loc('Report your problem') %]</h1>
 
-  [% IF c.cobrand.moniker == 'fixmystreet' %]
+  [% IF report.used_map %]
     <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p>
   [% END %]
 
@@ -24,12 +24,8 @@
   [% IF c.cobrand.moniker != "fixmystreet" && (c.cobrand.moniker != 'fixmybarangay' || ( c.user && c.user.from_body ) ) %]
     <div id="report-a-problem-sidebar">
         <div class="sidebar-tips">
-          [% IF report.used_map %]
-              [% IF partial_token %]
-                <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>
+          [% IF report.used_map AND partial_token %]
+            <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>
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss
index 67b51ddcf..a80a1958e 100644
--- a/web/cobrands/barnet/layout.scss
+++ b/web/cobrands/barnet/layout.scss
@@ -202,7 +202,7 @@ body.frontpage {
 
 
 #report-a-problem-sidebar {
-    left: 30em;
+    left: 29em;
     top: 4em;
     width: 17em;
     .sidebar-tips,
@@ -213,7 +213,7 @@ body.frontpage {
 .ie6 {
     #report-a-problem-sidebar {
         margin-top: -4em;
-        left: 30em;
+        left: 29em;
         .sidebar-notes {
             padding-bottom: 0.5em;
         }
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index c849b72c9..c33f927f8 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -21,15 +21,6 @@
     #message_close { float: right; }
 }
 
-body.mappage {
-    .change_location {
-        color: #666;
-        padding-left: 24px;
-        background: transparent url(images/wrong-location.png) 4px 50% no-repeat;
-        margin-top: -0.5em;
-    }
-}
-
 .confirmation-header {
   padding: 2em 1em;
 
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 0ddc83c25..0f696ae43 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -356,6 +356,13 @@ label{
     }
 }
 
+.change_location {
+    color: #666;
+    padding-left: 24px;
+    background: transparent url(/cobrands/fixmystreet/images/wrong-location.png) 4px 50% no-repeat;
+    margin-top: -0.5em;
+}
+
 #report-a-problem-main {
   fieldset {
     margin: 0;
@@ -1341,7 +1348,7 @@ label .muted {
     margin-bottom: 0;
     padding-left: 20px;
     list-style: none;
-    background: transparent url(images/tick-10px-8px.png) 4px 5px no-repeat;
+    background: transparent url(/cobrands/fixmystreet/images/tick-10px-8px.png) 4px 5px no-repeat;
   }
 
   .do {
@@ -1353,7 +1360,7 @@ label .muted {
     color: #881111;
 
     li {
-      background-image: url(images/cross-7px-7px.png);
+      background-image: url(/cobrands/fixmystreet/images/cross-7px-7px.png);
       background-position: 6px 6px;
     }
   }