Merge remote branch 'github/supercool' into supercool

9 files changed, 27 insertions, 18 deletions

diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index 556d5bb3c..67a15cc73 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -17,7 +17,7 @@
                 
                 loc_email_error = errors.$email_error || errors.other;
             END %]
-        <label class="hidden-js n" for="email">[% loc('Your email address') %]</label>
+        <label class="n" for="email">[% loc('Email') %]</label>
         [% IF loc_email_error  %]
             <div class="form-error">[% loc_email_error %]</div>
         [% ELSIF sign_in_error %]
@@ -49,11 +49,10 @@
                     <p>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 class="hidden-js" for="name">[% loc('Your name') %]</label>
+                <label for="name">[% loc('Name') %]</label>
                 <input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
 
-                <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label>
-
+                <label for="password_register">[% loc('Password') %]</label>
                 <div class="form-txt-submit-box">
                     <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]">
                     <input class="green-btn" type="submit" name="email_sign_in" value="[% loc('Sign in') %]">
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index b6ba8c5fb..78dee48a5 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -156,7 +156,7 @@
 
                     [% INCLUDE name %]
                     
-                    <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label>
+                    <label for="password_register">[% loc('Password') %]</label>
 
                     <div class="form-txt-submit-box">
                         <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]">
@@ -175,7 +175,7 @@
 [% INCLUDE 'footer.html' %]
 
 [% BLOCK name %]
-    <label class="hidden-js" for="form_name">[% loc('Your name') %]</label>
+    <label for="form_name">[% loc('Name') %]</label>
     [% IF field_errors.name %]
         <p class='form-error'>[% field_errors.name %]</p>
     [% END %]
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 eb169c1d6..104fe4e7d 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -110,7 +110,7 @@
 
             [% IF c.user_exists %]
                 <div class="form-box">
-                    <label class="hidden-js" for="form_may_show_nameme">[% loc('Your name') %]</label>
+                    <label for="form_may_show_nameme">[% loc('Name') %]</label>
                     [% IF field_errors.name %]
                         <p class='form-error'>[% field_errors.name %]</p>
                     [% END %]
@@ -126,7 +126,7 @@
                             <p>[% loc('We never show your email address or phone number.') %]</p>
                         </div>
 
-                    <label class="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label>
+                    <label for="form_phone">[% loc('Phone number') %]</label>
                     <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]">
             
                     <div class="form-txt-submit-box">
@@ -167,7 +167,7 @@
                     <div id="form_sign_in_no" class="form-box">
                         <h5>[% loc('<strong>No</strong> Let me confirm my report by email') %]</h5>
 
-                        <label class="hidden-js" for="form_may_show_nameme">[% loc('Your name') %]</label>
+                        <label for="form_may_show_nameme">[% loc('Name') %]</label>
                         [% IF field_errors.name %]
                             <p class='form-error'>[% field_errors.name %]</p>
                         [% END %]
@@ -184,10 +184,10 @@
                             <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="hidden-js" for="form_phone">[% loc('Your phone number (optional)') %]</label>
+                        <label class="form-focus-hidden" for="form_phone">[% loc('Phone number') %]</label>
                         <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number (optional)') %]">
                 
-                        <label class="hidden-js" for="password_register">[% loc('Enter a password (optional)') %]</label>
+                        <label class="form-focus-hidden" for="password_register">[% loc('Password') %]</label>
 
                         <div class="form-txt-submit-box form-focus-hidden">
                             <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password (optional)') %]">
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 7827e3439..6dbcdc601 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -394,8 +394,8 @@ label{
     float:right;
     width:28%;
     margin-right:0.25em;
-    padding-top:0.9em;
-    padding-bottom:0.8em;
+    padding-top:0.7em;
+    padding-bottom:0.6em;
   }
 }
 
@@ -1112,9 +1112,11 @@ a:hover.button-left {
 }
 
 .olControlAttribution {
-    bottom: 0.5em !important;
-    left: 3px;
+    bottom: 3.25em !important;
+    right: 0.25em !important;
+    left: 0.25em !important;
     color: #222222;
+    font-size:0.75em !important;
 }
 .olControlPermalink {
     bottom: 3px !important;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 6392277f0..68e870201 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -237,7 +237,11 @@ $(function(){
         $('#geolocate_link').click(function(e) {
             e.preventDefault();
             // Spinny thing!
-            $(this).append(' <img src="/i/flower.gif" alt="" align="bottom">');
+            if($('.mobile').length){
+                $(this).append(' <img src="/cobrands/fixmystreet/images/spinner-black.gif" alt="" align="bottom">');
+            }else{
+                $(this).append(' <img src="/cobrands/fixmystreet/images/spinner-yellow.gif" alt="" align="bottom">');
+            }
             geo_position_js.getCurrentPosition(function(pos) {
                 $('img', this).remove();
                 var latitude = pos.coords.latitude;
diff --git a/web/cobrands/fixmystreet/images/spinner-black.gif b/web/cobrands/fixmystreet/images/spinner-black.gif
new file mode 100644
index 000000000..763c98d35
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/spinner-black.gif
diff --git a/web/cobrands/fixmystreet/images/spinner-yellow.gif b/web/cobrands/fixmystreet/images/spinner-yellow.gif
new file mode 100644
index 000000000..56eed1541
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/spinner-yellow.gif
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index dbb5f54eb..526567ed6 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -466,10 +466,15 @@ body.twothirdswidthpage {
   top:174px !important;
 }
 
+.olControlAttribution {
+  bottom:0.5em !important;
+  left: auto !important;
+}
+
 #sub_map_links {
   left:auto;
   bottom:auto;
-  bottom:1em;
+  bottom:2em;
   #map_links_toggle {
     display:block;
     cursor: pointer;
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index f3dda2555..b6859f486 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -279,7 +279,6 @@ $(function(){
         $('#side-form').hide();
         $('#side').show();
         $('#sub_map_links').show();
-        heightFix('#report-a-problem-sidebar:visible', '.content', 26);
         //only on mobile
         $('#mob_sub_map_links').remove();
         $('.mobile-map-banner').text('Place pin on map');