Merge branch 'master' of ssh://212.235.189.51:22122/codeq-web

Conflicts:
	index.html

1 files changed, 12 insertions, 4 deletions

diff --git a/js/codeq/login.js b/js/codeq/login.js
index b8323e1..32b821d 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -30,6 +30,7 @@
                         codeq.setLang(sett['gui_lang']);
                         $("#gui_lang_select").val(sett['gui_lang']);
                     }
+                    $('#robot_address_input').val(codeq.settings['robot_address'] || '');
 
                     codeq.globalStateMachine.transition('language');
                     //codeq.activateState('language');
@@ -47,6 +48,7 @@
 
     codeq.globalStateMachine.register('login',{
         'enter': function(){
+            $('#navigation-home').off('click');//remove the click listener of this element here only - in each other state the listener should exist
             $('#signed-in-title').html('');
             $("#submit").on('click', loginFun);
             formInputs.on('keyup', function (ev) {
@@ -54,16 +56,22 @@
                     $('#submit').trigger('click');
                 }
             });
-            $('#modalLogIn').modal();
-            //$("#screen_login").css('display', '');
+            //$('#modalLogIn').modal();
+            $("#screen_login").css('display', '');
             $('#disabled').css('display', 'none');
         },
         'exit' : function(){
             $("#submit").off('click', loginFun);
             formInputs.off('keyup');
-            $('#modalLogIn').modal('hide');
-            //$("#screen_login").css('display', 'none');
+            //$('#modalLogIn').modal('hide');
+            $("#screen_login").css('display', 'none');
+            $('#signed-in-title').html('Signed in as '+$('#username').val());
             $("#password").val('');
+            //re-enable the click listener
+            $('#navigation-home').on('click', function(e){
+                codeq.globalStateMachine.transition('language');
+                e.preventDefault();
+            });
         }
     });
 })();