1 files changed, 19 insertions, 15 deletions

diff --git a/webclient/lib/basic.js b/webclient/lib/basic.js
index f8b24e7..bfeff88 100644
--- a/webclient/lib/basic.js
+++ b/webclient/lib/basic.js
@@ -135,18 +135,25 @@ function onConnect(status)
     } else if ( status == Strophe.Status.CONNFAIL )
     {
         log('Strophe failed to connect.');
-        $('#connect').get(0).value = 'connect';
     } else if ( status == Strophe.Status.DISCONNECTING )
     {
         log('Strophe is disconnecting.');
     } else if ( status == Strophe.Status.DISCONNECTED )
     {
         log('Strophe is disconnected.');
-        $('#connect').get(0).value = 'connect';
     } else if ( status == Strophe.Status.CONNECTED )
     {
         log('Strophe is connected.');
         getRoster();
+        $('#password').val('');
+        $('#login').dialog('close');
+        $('#status').append($('<a href="#" id="connect">Disconnect</a>'));
+        $('#connect').click(function(){
+            connection.disconnect();
+            $('#roster ul').empty();
+            $('#login').dialog('open');
+            $(this).remove();
+         });
     }
 }
 
@@ -155,21 +162,18 @@ $(document).ready(function(){
    connection.rawInput = rawInput;
    connection.rawOutput = rawOutput;
 
-   $('#connect').bind('click', function(){
-       var button = $('#connect').get(0);
-       if ( button.value == 'connect' )
-       {
-           button.value = 'disconnect';
-           connection.connect($('#jid').get(0).value,
-                              $('#pass').get(0).value,
-                              onConnect);
-       } else
-       {
-           button.value = 'connect';
-           connection.disconnect();
+   $('#login').dialog({
+       autoOpen: true,
+       modal: true,
+       title: 'Connect',
+       buttons: { 
+           'Connect' : function () {
+               connection.connect($('#jid').get(0).value,
+                                  $('#pass').get(0).value,
+                                  onConnect);}
        }
    });
-
+   
    $('#bottomup').click(function(){
        $(this).next().slideToggle();
    });