X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=blobdiff_plain;f=js%2Fmain.js;h=a0800ad54ddecfbcd4d7f0ccff4c3c48a65fe641;hp=9f802b5f8e8bea4f4af7bb1334e5beee1ed04384;hb=eea26db826d1821aa4268fa8ccba484bff97a5bb;hpb=38cd189c63c36d684943f0c21e32d4933e26863c

diff --git a/js/main.js b/js/main.js
index 9f802b5..a0800ad 100644
--- a/js/main.js
+++ b/js/main.js
@@ -41,6 +41,7 @@ function onConnect(status) {
     } else if (status == Strophe.Status.CONNECTED) {
         log('Strophe is connected.');
         queryJID = connection.domain;
+        $('#queryJID').val(queryJID);
         $('#query').show();
         checkFeatures();
     }
@@ -55,7 +56,7 @@ function addNote(elem, text, type) {
 
 function addForm(elem, x) {
     var form = $("<form/>");
-    form.submit(function(){return false;});
+    form.submit(function(event){event.preventDefault();});
     var fieldset = $("<fieldset/>");
     form.append(fieldset);
     if ($(x).find("title").length > 0)
@@ -67,6 +68,7 @@ function addForm(elem, x) {
         var type = $(this).attr("type");
         if($(this).attr("label")) {
             $("<label/>").text($(this).attr("label")).attr("for", $(this).attr("var")).appendTo(fieldset);
+            $("<br/>").appendTo(fieldset);
         }
         switch(type) {
         case "hidden":
@@ -76,7 +78,7 @@ function addForm(elem, x) {
             item = $("<input type='checkbox'/>");
             break;
         case "text-multi":
-            item = $("<textarea/>");
+            item = $("<textarea rows='10' cols='70'/>");
             break;
         case "text-single":
             item = $("<input type='text'/>");
@@ -85,7 +87,7 @@ function addForm(elem, x) {
             item = $("<input type='text'/>").attr("readonly",true);
             break;
         case "jid-multi":
-            item = $("<textarea/>");
+            item = $("<textarea rows='10' cols'70'/>");
             break;
         case "jid-single":
             item = $("<input type='text'/>");
@@ -131,7 +133,8 @@ function addForm(elem, x) {
             item.attr("id", $(this).attr("var"));
         }
         fieldset.append(item);
-        fieldset.append("<br/>");
+        if (type != "hidden")
+            fieldset.append("<br/>");
     });
     $(elem).append(form);
 }
@@ -209,7 +212,7 @@ function displayResult(result) {
     }
 }
 
-function runCommand() {
+function runCommand(event) {
     cmdNode = $(this).attr("id"); // Save node of executed command (in global var)
     var execIQ = $iq({ type: "set", to: queryJID, id: connection.getUniqueId() })
         .c("command", { xmlns: Strophe.NS.ADHOC, node: cmdNode, action: "execute" });
@@ -217,6 +220,7 @@ function runCommand() {
         sessionid = $(result).find("command").attr("sessionid");
         displayResult(result);
     });
+    event.preventDefault();
 }
 
 function getCommandNodes() {
@@ -224,7 +228,8 @@ function getCommandNodes() {
     connection.sendIQ(nodesIQ, function(result) {
         $('#output').append("<ul id='items'></ul>");
         $(result).find("item").each(function(index, e) {
-            item = $("<li id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</li>").bind("click", runCommand);
+            link = $("<a href='#' id='" + $(e).attr("node") + "'>" + $(e).attr("name") + "</a>").click(runCommand)
+            item = $("<li></li>").append(link);
             $("#items").append(item);
         });
     });
@@ -252,9 +257,9 @@ function showConnect() {
     $('#query').hide();
     pass.show();
     jid.show();
-    $('label').show();
+    $('#cred label').show();
+    $('#cred br').show();
     $('#output').empty();
-    return false;
 }
 
 function showDisconnect() {
@@ -266,7 +271,7 @@ function showDisconnect() {
     pass.hide();
     jid.hide();
     $('#cred label').hide();
-    return false;
+    $('#cred br').hide();
 }
 
 $(document).ready(function () {
@@ -281,7 +286,7 @@ $(document).ready(function () {
         $("#log").toggle();
       });
 
-    $('#cred').bind('submit', function () {
+    $('#cred').bind('submit', function (event) {
         var button = $('#connect').get(0);
         var jid = $('#jid');
         var pass = $('#pass');        
@@ -296,13 +301,13 @@ $(document).ready(function () {
         } else {
             connection.disconnect();
         }
-        return false;
+	event.preventDefault();
     });
 
-    $('#queryForm').bind('submit', function () {
+    $('#queryForm').bind('submit', function (event) {
         queryJID = $('#queryJID').val();
         checkFeatures();
-        return false;
+	event.preventDefault();
     });
 });