diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-06-05 15:13:32 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-06-05 15:13:32 +0100 |
| commit | 91d3b656b23896f619b02780bf07f62b92bd5c71 (patch) | |
| tree | 18bce5bf947d497c631dabba76c0bf1696308c28 /www/js | |
| parent | 67c68048ed57f3b31093c6cadb820745e64250e6 (diff) | |
better validation messages and display for signout page
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/strings.js | 4 | ||||
| -rw-r--r-- | www/js/views/login.js | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/www/js/strings.js b/www/js/strings.js index 13b149f..08e2cd0 100644 --- a/www/js/strings.js +++ b/www/js/strings.js @@ -20,7 +20,9 @@ password: 'Please enter a password' }, strings: { - login_error: 'There was a problem logging you in. Please check your email and password', + login_error: 'There was a problem logging you in. Please try later', + logout_error: 'There was a problem logging you out. Please try later', + login_details_error: 'There was a problem logging you in. Please check your email and password', location_error: 'Location error', location_problem: 'There was a problem looking up your location', multiple_locations: 'More than one location matched that name', diff --git a/www/js/views/login.js b/www/js/views/login.js index 9f3d197..f85745c 100644 --- a/www/js/views/login.js +++ b/www/js/views/login.js @@ -43,11 +43,11 @@ $('#logout').focus(); } else { $('#login').focus(); - that.validationError('form_email', FMS.strings.login_error); + that.validationError('form_email', FMS.strings.login_details_error); } }, error: function() { - alert('boo :('); + that.validationError('form_email', FMS.strings.login_error); } } ); } @@ -71,8 +71,7 @@ that.$('#password_row').show(); }, error: function() { - // TODO fix this - alert( 'There was a problem signing you out'); + that.validationError('err', FMS.strings.logout_error); } } ); }, |