diff options
author | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-05 19:59:05 +0200 |
---|---|---|
committer | Marko Pušnik <marko.pusnik@guru.si> | 2015-10-05 19:59:05 +0200 |
commit | 2f415bc811f7378091bd2285e9e822cb39eed3e6 (patch) | |
tree | eff58afa8468334c4ae21b16b4d2367af3047816 /js/codeq/login.js | |
parent | 4a53a4594018fc6e538c87f7321ffefadc5edbd3 (diff) |
sign up, reset password and profile pages + related comm messages
Diffstat (limited to 'js/codeq/login.js')
-rw-r--r-- | js/codeq/login.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/js/codeq/login.js b/js/codeq/login.js index 391592b..d5bcd90 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -15,6 +15,9 @@ $('#disabled').css('cursor', ''); if (data.code !== 0) throw new Error('Login failed, code: ' + data.code + ', message: ' + data.message); + //merge profile + $('#profileUsername').html($('#username').val()); + //merge these settings into the already existing default settings var sett = data.settings; $.merge(true, codeq.settings, sett); @@ -47,14 +50,14 @@ } }); $('#modalLogIn').modal(); - - $("#screen_login").css('display', ''); + //$("#screen_login").css('display', ''); $('#disabled').css('display', 'none'); }, 'exit' : function(){ $("#submit").off('click', loginFun); formInputs.off('keyup'); - $("#screen_login").css('display', 'none'); + $('#modalLogIn').modal('hide'); + //$("#screen_login").css('display', 'none'); $('#signed-in-title').html('Signed in as '+$('#username').val()); $("#password").val(''); } |