diff options
| author | Robert Zorko <robertz@gurucue.com> | 2015-09-29 18:14:46 +0200 |
|---|---|---|
| committer | Robert Zorko <robertz@gurucue.com> | 2015-09-29 18:14:46 +0200 |
| commit | b852541b2d23413471c55cb4ee9e5a3e18533d71 (patch) | |
| tree | 99130de662fdb1329d8e8d85b035a7a9d8b86b48 /js/codeq/login.js | |
| parent | 41412acda7dbc4f13a892455e3f287427639dffb (diff) | |
| parent | 85e530fc7d2cf091734f0d126968d8c50defb65c (diff) | |
resolved merge conflict
Diffstat (limited to 'js/codeq/login.js')
| -rw-r--r-- | js/codeq/login.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/codeq/login.js b/js/codeq/login.js index e3204d3..e5a446b 100644 --- a/js/codeq/login.js +++ b/js/codeq/login.js @@ -36,8 +36,9 @@ }; codeq.globalStateMachine.register('login',{ 'enter': function(){ + $('#signed-in-title').html(''); $("#submit").on('click', loginFun); - //$('#modalLogin').modal(); + $('#modalLogIn').modal(); $("#screen_login").css('display', ''); $('#disabled').css('display', 'none'); @@ -45,6 +46,7 @@ 'exit' : function(){ $("#submit").off('click', loginFun); $("#screen_login").css('display', 'none'); + $('#signed-in-title').html('Signed in as '+$('#username').val()); $("#password").val(''); } }); |