ask for confirmation of details when user signs in

2 files changed, 20 insertions, 7 deletions

diff --git a/phonegap/www/around.html b/phonegap/www/around.html
index 52d0251fe..906809dac 100644
--- a/phonegap/www/around.html
+++ b/phonegap/www/around.html
@@ -245,13 +245,13 @@ var fixmystreet = {
                     <input value="Remove Photo" type="button" name="del_photo_button" id="id_del_photo_button" onclick="delPhoto();" class="green-btn">
                 </div>
                 <input type="hidden" name="photo" id="form_photo" value="">
-                <label for="form_email">Your email</label>
+                <label for="form_email" id="email_label">Your email</label>
                 
                 <input type="email" value="" name="email" id="form_email" placeholder="Please enter your email address" required>
 
                 <div id="form_sign_in">
-                    <h3>Now to submit your report&hellip;</h3>
-                    <h2>Do you have a FixMyStreet password?</h2>
+                    <h3 id="now_submit">Now to submit your report&hellip;</h3>
+                    <h2 id="have_password">Do you have a FixMyStreet password?</h2>
 
                     <div id="form_sign_in_yes" class="form-box">
 
@@ -271,7 +271,7 @@ var fixmystreet = {
                     </div>
 
                     <div id="form_sign_in_no" class="form-box">
-                        <h5><strong>No</strong> Let me confirm my report by email</h5>
+                        <h5 id="let_me_confirm"><strong>No</strong> Let me confirm my report by email</h5>
 
                         <label for="form_may_show_nameme">Name</label>
                         
@@ -285,13 +285,15 @@ var fixmystreet = {
 
                         <div class="general-sidebar-notes form-focus-hidden">
                             <p class="dark">We never show your email address or phone number.</p>
-                            <p>Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.</p>
+                            <p id="providing_password">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">Phone number</label>
                         <input class="form-focus-hidden" type="text" value="" name="phone" id="form_phone" placeholder="Your phone number (optional)">
                 
-                        <label class="form-focus-hidden" for="password_register">Password</label>
+                        <div id="password_surround">
+                        <label class="form-focus-hidden" for="password_register" id="password_label">Password</label>
+                        </div>
 
                         <div class="form-txt-submit-box form-focus-hidden">
                             <input type="password" name="password_register" id="password_register" value="" placeholder="Enter a password (optional)">
diff --git a/phonegap/www/js/mobile.js b/phonegap/www/js/mobile.js
index 07dc61ac3..5ee7c56f4 100644
--- a/phonegap/www/js/mobile.js
+++ b/phonegap/www/js/mobile.js
@@ -259,14 +259,25 @@ function postReport(e) {
                     }
                 } else {
                     if ( data.check_name ) {
+                        $('#email_label').hide();
+                        $('#form_email').hide();
+                        $('#now_submit').hide();
+                        $('#have_password').hide();
+                        $('#form_sign_in_yes').hide();
+                        $('#let_me_confirm').hide();
+                        $('#password_register').hide();
+                        $('#password_surround').hide();
+                        $('#providing_password').hide();
                         $('#form_name').val( data.check_name );
                         $('#form_name').focus();
+                        $('#form_name').before('<div class="form-error">' + data.errors.name + '</div>' );
                     }
                     $('input[type=submit]').prop("disabled", false);
                 }
             },
             error: function (data, status, errorThrown ) {
-                alert( 'There was a problem submitting your report, please try again: ' + data, function(){}, 'Submit report' );
+                alert( 'There was a problem submitting your report, please try again (' + status + '): ' + JSON.stringify(data), function(){}, 'Submit report' );
+                $('input[type=submit]').prop("disabled", false);
             }
         } );
     }