Disable placeholder, interferes badly with current validation.

4 files changed, 10 insertions, 16 deletions

diff --git a/templates/web/fixmystreet/auth/general.html b/templates/web/fixmystreet/auth/general.html
index 67a15cc73..585232bc5 100644
--- a/templates/web/fixmystreet/auth/general.html
+++ b/templates/web/fixmystreet/auth/general.html
@@ -52,9 +52,9 @@
                 <label for="name">[% loc('Name') %]</label>
                 <input type="text" name="name" value="" placeholder="[% loc('Your name') %]">
 
-                <label for="password_register">[% loc('Password') %]</label>
+                <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 (optional)') %]">
+                    <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') %]">
                 </div>
             </div>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 03a6f79b5..b7daeca24 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -154,10 +154,10 @@
 
                     [% INCLUDE name %]
                     
-                    <label for="password_register">[% loc('Password') %]</label>
+                    <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 (optional)') %]">
+                        <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>
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 d908aee99..283f748ba 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -127,8 +127,8 @@
                             <p>[% loc('We never show your email address or phone number.') %]</p>
                         </div>
 
-                    <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)') %]">
+                    <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') %]">
@@ -185,13 +185,13 @@
                             <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') %]</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="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') %]">
                 
-                        <label class="form-focus-hidden" for="password_register">[% loc('Password') %]</label>
+                        <label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</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)') %]">
+                            <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') %]">
                         </div>
                     </div>
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 269540dad..e54d2fe93 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -543,12 +543,6 @@ $.fn.drawer = function(id, ajax) {
         }
     }
 
-    /*
-     * Placeholder polyfill from https://github.com/mathiasbynens/jquery-placeholder/
-     * 
-     * It needs to be at the end or it won't behave as expected
-     */
-     $('input, textarea').placeholder();
 });
 
 /*