Remove .general-sidebar-notes, inline text instead

This removes all "hanging on" sidebars apart from the main reporting a
problem one, interspersing the text in the form instead.

11 files changed, 93 insertions, 87 deletions

diff --git a/templates/web/barnet/report/updates-sidebar-notes.html b/templates/web/barnet/report/updates-sidebar-notes.html
index 9fff322a1..3ac015f53 100644
--- a/templates/web/barnet/report/updates-sidebar-notes.html
+++ b/templates/web/barnet/report/updates-sidebar-notes.html
@@ -1 +1 @@
-        <p>[% loc( 'Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>' ) %]</p>
+        <p>Please note that updates are not sent to the relevant department. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a></p>
diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html
index a4bd76fdc..60edd0e79 100644
--- a/templates/web/bromley/report/display.html
+++ b/templates/web/bromley/report/display.html
@@ -63,7 +63,7 @@
             [% END %]
             <textarea rows="7" cols="30" name="update" id="form_update" placeholder="[% loc('Please write your update here') %]" required>[% update.text | html %]</textarea>
 
-            <div class="general-sidebar-notes">
+            <div class="general-notes">
                 <p>Please note this comments box can only be used for this report.
                 <br><a href="http://www.bromley.gov.uk/report">Report a different issue</a>
             </div>
@@ -119,7 +119,10 @@
 
         [% ELSE %]
 
-            <label for="form_rznvy">[% loc('Email' ) %]</label>
+            <label for="form_rznvy">[% loc('Email' ) %]
+                <span class="muted">([% loc('We never show your email') %])</span>
+            </label>
+
             [% IF field_errors.email %]
                 <p class='form-error'>[% field_errors.email %]</p>
             [% END %]
@@ -133,13 +136,12 @@
 
                     [% INCLUDE name %]
                     
-                    <div class="general-sidebar-notes">
-                        <p class="dark">[% loc('We never show your email') %]</p>
+                    <label for="password_register">[% loc('Password (optional)') %]</label>
+
+                    <div class="general-notes">
                         <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>
                     </div>
 
-                    <label for="password_register">[% loc('Password (optional)') %]</label>
-
                     <div class="form-txt-submit-box">
                         <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                         <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]">
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 b60935f47..e4c101a1b 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -13,23 +13,17 @@
         [% PROCESS 'report/new/councils_text.html' %]
     [% END %]
 
-    <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>
-            [% 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.') %]
-            </p>
+    <div>
+        [% 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 %]
-        </div>
-        
+        <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.') %]
+        </p>
+        [% END %]
     </div>
 
     [% INCLUDE 'errors.html' %]
@@ -129,13 +123,13 @@
                         <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
                     </div>
 
-                        <div class="general-sidebar-notes">
-                            <p>[% loc('We never show your email address or phone number.') %]</p>
-                        </div>
-
                     <label for="form_phone">[% loc('Phone number (optional)') %]</label>
                     <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
             
+                        <div class="general-notes">
+                            <p>[% loc('We never show your email address or phone number.') %]</p>
+                        </div>
+
                     <div class="form-txt-submit-box">
                         <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
                     </div>
@@ -175,16 +169,19 @@
                             <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
                         </div>
 
-                        <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 future problems, leave updates and manage your reports.') %]</p>
-                        </div>
-
                         <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
                         <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
                 
+                        <div class="general-notes form-focus-hidden">
+                            <p>[% loc('We never show your email address or phone number.') %]</p>
+                        </div>
+
                         <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
 
+                        <div class="general-notes form-focus-hidden">
+                            <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>
+
                         <div class="form-txt-submit-box form-focus-hidden">
                             <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                             <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
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 eea1da8d2..17c7c8870 100644
--- a/templates/web/fixamingata/report/new/fill_in_details_form.html
+++ b/templates/web/fixamingata/report/new/fill_in_details_form.html
@@ -128,15 +128,13 @@
                         <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
                     </div>
 
-                        [% IF c.cobrand.moniker != 'fixmybarangay' || ( c.user && c.user.from_council ) %]
-                        <div class="general-sidebar-notes">
-                            <p>[% loc('We never show your email address or phone number.') %]</p>
-                        </div>
-                        [% END %]
-
                     <label for="form_phone">[% loc('Phone number (optional)') %]</label>
                     <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
             
+                    <div class="general-notes">
+                        <p>[% loc('We never show your email address or phone number.') %]</p>
+                    </div>
+
                     <div class="form-txt-submit-box">
                         <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
                     </div>
@@ -170,16 +168,19 @@
                             <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
                         </div>
 
-                        <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>
-                        </div>
-
                         <label for="form_phone">[% loc('Phone number (optional)') %]</label>
                         <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
                 
+                        <div class="general-notes form-focus-hidden">
+                            <p>[% loc('We never show your email address or phone number.') %]</p>
+                        </div>
+
                         <label for="password_register">[% loc('Password (optional)') %]</label>
 
+                        <div class="general-notes form-focus-hidden">
+                            <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>
+                        </div>
+
                         <div class="form-txt-submit-box">
                             <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                         <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
diff --git a/templates/web/fixmystreet.com/report/new/form_user_loggedout.html b/templates/web/fixmystreet.com/report/new/form_user_loggedout.html
index bfe4e9f14..05d485818 100644
--- a/templates/web/fixmystreet.com/report/new/form_user_loggedout.html
+++ b/templates/web/fixmystreet.com/report/new/form_user_loggedout.html
@@ -1,5 +1,7 @@
 <div class="variant0 variant2">
-<label for="form_email">[% loc('Your email') %]</label>
+<label for="form_email">[% loc('Your email') %]
+    <span class="muted">([% loc('We never show your email') %])</span>
+</label>
 [% IF field_errors.email %]
     <p class='form-error'>[% field_errors.email %]</p>
 [% END %]
@@ -37,9 +39,9 @@
                 <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
             </div>
 
-            <div class="general-sidebar-notes" id="forgotten-pw">
-                <p class="dark">[% loc('Forgotten your password?') %]</p>
-                <p>[% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
+            <div class="general-notes">
+                <p><strong>[% loc('Forgotten your password?') %]</strong>
+                [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
             </div>
 
         </div>
@@ -72,16 +74,19 @@
                 <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
             </div>
 
-            <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>
-            </div>
-
             <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
             <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
 
+            <div class="general-notes form-focus-hidden">
+                <p>[% loc('We never show your email address or phone number.') %]</p>
+            </div>
+
             <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
 
+            <div class="general-notes form-focus-hidden">
+                <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>
+            </div>
+
             <div class="form-txt-submit-box form-focus-hidden">
                 <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                 <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index b9d02c18b..3f3fe5b99 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -49,14 +49,15 @@
             <div id="form_sign_in_no" class="form-box">
                 <h5>[% loc('<strong>No</strong> let me sign in by email') %]</h5>
 
-                <div class="general-sidebar-notes">
-                    <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
-                </div>
-
                 <label for="name">[% loc('Name') %]</label>
                 <input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
 
                 <label for="password_register">[% loc('Password (optional)') %]</label>
+
+                <div class="general-notes">
+                    <p>[% loc('Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
+                </div>
+
                 <div class="form-txt-submit-box">
                     <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                     <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]">
diff --git a/templates/web/fixmystreet/report/new/form_user_loggedin.html b/templates/web/fixmystreet/report/new/form_user_loggedin.html
index 8cdf98e3d..977382ae3 100644
--- a/templates/web/fixmystreet/report/new/form_user_loggedin.html
+++ b/templates/web/fixmystreet/report/new/form_user_loggedin.html
@@ -17,15 +17,15 @@
         <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %] </label>
     </div>
 
+    <label for="form_phone">[% loc('Phone number (optional)') %]</label>
+    <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+
         [% IF c.cobrand.moniker != 'fixmybarangay' || c.user.from_body %]
-        <div class="general-sidebar-notes">
+        <div class="general-notes">
             <p>[% loc('We never show your email address or phone number.') %]</p>
         </div>
         [% END %]
 
-    <label for="form_phone">[% loc('Phone number (optional)') %]</label>
-    <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-
     <div class="form-txt-submit-box">
         <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
     </div>
diff --git a/templates/web/fixmystreet/report/new/form_user_loggedout.html b/templates/web/fixmystreet/report/new/form_user_loggedout.html
index a35beca24..8ae8d15f6 100644
--- a/templates/web/fixmystreet/report/new/form_user_loggedout.html
+++ b/templates/web/fixmystreet/report/new/form_user_loggedout.html
@@ -1,4 +1,6 @@
-<label for="form_email">[% loc('Your email') %]</label>
+<label for="form_email">[% loc('Your email') %]
+    <span class="muted">([% loc('We never show your email') %])</span>
+</label>
 [% IF field_errors.email %]
     <p class='form-error'>[% field_errors.email %]</p>
 [% END %]
@@ -26,9 +28,9 @@
             <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
         </div>
 
-        <div class="general-sidebar-notes" id="forgotten-pw">
-            <p class="dark">[% loc('Forgotten your password?') %]</p>
-            <p>[% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
+        <div class="general-notes">
+            <p><strong>[% loc('Forgotten your password?') %]</strong>
+            [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
         </div>
 
     </div>
@@ -51,16 +53,18 @@
             <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label>
         </div>
 
-        <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>
-        </div>
-
         <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
         <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+        <div class="general-notes form-focus-hidden">
+            <p>[% loc('We never show your email address or phone number.') %]</p>
+        </div>
 
         <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
 
+        <div class="general-notes form-focus-hidden">
+            <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>
+        </div>
+
         <div class="form-txt-submit-box form-focus-hidden">
             <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
             <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html
index add176549..bde2c84e2 100644
--- a/templates/web/fixmystreet/report/update-form.html
+++ b/templates/web/fixmystreet/report/update-form.html
@@ -4,7 +4,7 @@
     <h2>[% loc( 'Provide an update') %]</h2>
 
     [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %]
-    <div class="general-sidebar-notes">
+    <div class="general-notes">
         [% INCLUDE 'report/updates-sidebar-notes.html' %]
     </div>
     [% END %]
@@ -73,7 +73,9 @@
 
         [% ELSE %]
 
-            <label for="form_rznvy">[% loc('Email' ) %]</label>
+            <label for="form_rznvy">[% loc('Your email' ) %]
+            <span class="muted">([% loc('We never show your email') %])</span>
+            </label>
             [% IF field_errors.email %]
                 <p class='form-error'>[% field_errors.email %]</p>
             [% END %]
@@ -100,9 +102,9 @@
                         <label class="inline n" for="remember_me">[% loc('Keep me signed in on this computer') %]</label>
                     </div>
 
-                    <div class="general-sidebar-notes" id="forgotten-pw">
-                        <p class="dark">[% loc('Forgotten your password?') %]</p>
-                        <p>[% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
+                    <div class="general-notes">
+                        <p><strong>[% loc('Forgotten your password?') %]</strong>
+                        [% loc('Confirm by email below, providing a new password at that point. When you confirm, your password will be updated.') %]</p>
                     </div>
 
                 </div>
@@ -111,17 +113,17 @@
 
                     [% INCLUDE name %]
                     
-                    <div class="general-sidebar-notes">
-                        <p class="dark">[% loc('We never show your email') %]</p>
+                    <label for="password_register">[% loc('Password (optional)') %]</label>
+
+                    <div class="general-notes">
                         <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>
                     </div>
 
-                    <label for="password_register">[% loc('Password (optional)') %]</label>
-
                     <div class="form-txt-submit-box">
                         <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]">
                         <input class="green-btn" type="submit" name="submit_register" id="submit_register" value="[% loc('Post') %]">
                     </div>
+
                 </div>
             </div>
 
diff --git a/templates/web/zerotb/report/update-form.html b/templates/web/zerotb/report/update-form.html
index b278b5f8d..cb8ba24e4 100644
--- a/templates/web/zerotb/report/update-form.html
+++ b/templates/web/zerotb/report/update-form.html
@@ -1,7 +1,7 @@
 <div id="update_form">
     <h2>[% loc( 'Report a stockout') %]</h2>
 
-    <div class="general-sidebar-notes">
+    <div class="general-notes">
         [% INCLUDE 'report/updates-sidebar-notes.html' %]
     </div>
 
@@ -29,8 +29,8 @@
 
             <label for="form_rznvy">[% loc('Email' ) %]</label>
 
-            <div class="general-sidebar-notes">
-                <p class="dark">[% loc('We never show your email or name') %]</p>
+            <div class="general-notes">
+                <p>[% loc('We never show your email or name') %]</p>
             </div>
 
             [% IF field_errors.email %]
diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html
index 076536601..67471867a 100644
--- a/templates/web/zurich/report/new/fill_in_details_form.html
+++ b/templates/web/zurich/report/new/fill_in_details_form.html
@@ -91,12 +91,6 @@
                 [% END %]
                 <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required>
 
-                <!--
-                <div class="general-sidebar-notes">
-                    <p class="dark">[% loc('We never show your email address or phone number.') %]</p>
-                </div>
-                -->
-
                 <label for="form_name">[% loc('Name') %] [% loc('(optional)') %]</label>
                 [% IF field_errors.name %]
                     <p class='form-error'>[% field_errors.name %]</p>