diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/views/login.js | 12 | ||||
| -rw-r--r-- | www/templates/en/login.html | 8 |
2 files changed, 16 insertions, 4 deletions
diff --git a/www/js/views/login.js b/www/js/views/login.js index 312eda5..9f3d197 100644 --- a/www/js/views/login.js +++ b/www/js/views/login.js @@ -10,12 +10,15 @@ 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click #login': 'onClickLogin', + 'submit #signinForm': 'onClickLogin', 'click #logout': 'onClickLogout', 'click .ui-btn-left': 'onClickButtonPrev', 'click .ui-btn-right': 'onClickButtonNext' }, - onClickLogin: function() { + onClickLogin: function(e) { + // prevent form submission from onscreen keyboard + e.preventDefault(); if ( this.validate() ) { var that = this; $.ajax( { @@ -37,7 +40,9 @@ FMS.isLoggedIn = 1; that.$('#password_row').hide(); that.$('#success_row').show(); + $('#logout').focus(); } else { + $('#login').focus(); that.validationError('form_email', FMS.strings.login_error); } }, @@ -90,6 +95,11 @@ this.validationError('form_email', FMS.validationStrings.email.email); } + if ( !isValid ) { + // this makes sure the onscreen keyboard is dismissed + $('#login').focus(); + } + return isValid; } }) diff --git a/www/templates/en/login.html b/www/templates/en/login.html index ad019e0..69aa630 100644 --- a/www/templates/en/login.html +++ b/www/templates/en/login.html @@ -9,20 +9,22 @@ <p>You are signed in as <%= email %></p> <input type="button" id="logout" name="logout" value="Sign Out" data-theme="a"> </div> - <div id="password_row" class="inputcard nodisplay"> + <div id="password_row" class="nodisplay"> <p> Signed out! </p> <% } else { %> - <div id="password_row" class="inputcard"> + <div id="password_row"> <% } %> + <form name="signinForm" class="inputcard" id="signinForm"> <div> <input data-role="none" type="email" value="" name="email" id="form_email" placeholder="Your Email" required> </div> <div> <input data-role="none" type="password" value="" name="password" id="form_password" placeholder="Your password" required> </div> - <input type="button" id="login" name="login" value="Login" data-theme="a"> + <input type="submit" id="login" name="login" value="Login" data-theme="a"> + </form> </div> <div id="success_row" class="nodisplay"> <p> |