sign up, reset password and profile pages + related comm messages

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('');
         }