From: Florian Zeitz <florob@babelmonkeys.de>
Date: Thu, 19 Jan 2012 21:06:58 +0000 (+0100)
Subject: Bootstrap compatibility
X-Git-Url: http://cgit.babelmonkeys.de/?p=adhocweb.git;a=commitdiff_plain;h=a4c0f5025877f4858576dba28bbb461f0581a5d1

Bootstrap compatibility
---

diff --git a/index.html b/index.html
index acf79d3..05983b6 100644
--- a/index.html
+++ b/index.html
@@ -15,12 +15,10 @@
 <div id='login'>
   <form id='cred' action='#'>
     <fieldset>
-      <label for='jid'>JID:</label><br/>
+      <label for='jid'>JID:</label>
       <input type='text' id='jid' />
-      <br/>
-      <label for='pass'>Password:</label><br/>
+      <label for='pass'>Password:</label>
       <input type='password' id='pass' />
-      <br/>
       <input type='submit' id='connect' value='connect' />
     </fieldset>
   </form>
diff --git a/js/adhoc.js b/js/adhoc.js
index 0266318..3638eef 100644
--- a/js/adhoc.js
+++ b/js/adhoc.js
@@ -46,7 +46,7 @@ Adhoc.prototype = {
 
     addForm: function (x) {
         var self = this;
-        var form = $("<form action='#'/>");
+        var form = $("<form class='form-stacked' action='#'/>");
         form.submit(function(event) {
             self.executeCommand("execute", self.serializeToDataform('form'),
                 function(e) { self.displayResult(e) });
@@ -57,17 +57,16 @@ Adhoc.prototype = {
         $(x).find("title").each(function() { $("<legend/>").text($(this).text()).appendTo(fieldset); });
         $(x).find("instructions").each(function() { $("<p/>").text($(this).text()).appendTo(fieldset); });
         $(x).find("field").each(function() {
+	    var clearfix = $("<div class='clearfix'/>");
             var item = self.buildHTMLField(this);
             var label = $(this).attr("label");
             if(label) {
-                $("<label/>").text(label).attr("for", $(this).attr("var")).appendTo(fieldset);
-                $("<br/>").appendTo(fieldset);
+                $("<label/>").text(label).attr("for", $(this).attr("var")).appendTo(clearfix);
             }
             if ($(x).attr("type") === "result")
                 item.attr("readonly", true);
-            fieldset.append(item);
-            if ($(this).attr("type") !== "hidden")
-                fieldset.append("<br/>");
+            clearfix.append(item);
+            fieldset.append(clearfix);
         });
         $(self.status.view).append(form);
     },
@@ -167,24 +166,26 @@ Adhoc.prototype = {
             }
         });
         if (status === "executing") {
+	    var controls = $("<div class='actions'/>");
             for (kind in kinds) {
+		var input;
                 (function(type) {
-                    input = $("<input type='button' disabled='disabled' value='" + kinds[type] + "'/>").click(function() {
+                    input = $("<input type='button' disabled='disabled' class='btn' value='" + kinds[type] + "'/>").click(function() {
                         self.executeCommand(type, (type!= 'prev') && self.serializeToDataform('form'), function(e) { self.displayResult(e) });
-                    });
+                    }).appendTo(controls);
                 })(kind);
                 if ($(result).find('actions ' + kind).length > 0)
                     input.removeAttr("disabled");
-                $(self.status.view).append(input);
             }
 
-            $("<input type='button' id='executeButton' value='Execute'/>").click(function() {
+            $("<input type='button' id='executeButton' class='btn primary' value='Execute'/>").click(function() {
                 self.executeCommand("execute", self.serializeToDataform('form'), function(e) { self.displayResult(e) });
-            }).appendTo(self.status.view);
+            }).appendTo(controls);
 
-            $("<input type='button' value='Cancel'/>").click(function() {
+            $("<input type='button' class='btn' value='Cancel'/>").click(function() {
                 self.cancelCommand(function(e) { self.displayResult(e) });
-            }).appendTo(self.status.view);
+            }).appendTo(controls);
+	    $(self.status.view + " fieldset").append(controls);
         } else {
 	    self.status.sessionid = null;
 	    self.status.cmdNode = null;
diff --git a/style.css b/style.css
index b26b844..7ad6591 100644
--- a/style.css
+++ b/style.css
@@ -17,6 +17,10 @@ a {
   color: #0000FF
 }
 
+label {
+  display: block
+}
+
 #log_container {
   display: none
 }