From: Florian Zeitz <florob@babelmonkeys.de>
Date: Wed, 26 Aug 2009 23:14:22 +0000 (+0200)
Subject: Design changes
X-Git-Url: http://git.babelmonkeys.de/?p=socialXMPP.git;a=commitdiff_plain;h=f2a4bf2b8e99d9f5e98af3805b845cfede5a39c6

Design changes

* Hopefully nicer design
* New strophejs version
---

diff --git a/css/standard.css b/css/standard.css
index 64607c8..06afbd9 100644
--- a/css/standard.css
+++ b/css/standard.css
@@ -1,9 +1,21 @@
-#login {
-  text-align: center;
+form {
+  display: table;
+  margin: auto;
+}
+
+input {
+  margin: 0.2em;
+  float: left;
+}
+
+label {
+  float: left;
+  width: 6em;
 }
 
 #log_container {
   clear: both;
+  display: none;
 }
 
 #vCard_container {
@@ -30,10 +42,8 @@
 
 #friends {
   display: none;
-  max-width: 50%;
   padding: 1em;
   background: grey;
-  float: left;
 }
 
 #box-overlay {
@@ -56,6 +66,7 @@
   margin: 0.5em;
   text-align: center;
   max-width: 10em;
+  height: 100px;
 }
 
 .friend img, #vCard_container img {
diff --git a/index.html b/index.html
index a4ab791..b35cc75 100644
--- a/index.html
+++ b/index.html
@@ -13,6 +13,7 @@
     <form id='cred' name='cred'>
       <label for='jid'>JID:</label>
       <input type='text' id='jid' />
+      <br />
       <label for='pass'>Password:</label>
       <input type='password' id='pass' />
       <input type='submit' id='connect' value='connect' />
diff --git a/scripts/basic.js b/scripts/basic.js
index 292f666..333ffb3 100644
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -1,8 +1,10 @@
+var DEBUG = false;
+var BOSH_SERVICE = 'http://localhost:5280/http-bind/';
+
 var NS_VCARD = 'vcard-temp';
 var NS_CAPS= 'http://jabber.org/protocol/caps';
 var NS_PEP = 'http://jabber.org/protocol/pubsub#event';
 var NS_TUNE = 'http://jabber.org/protocol/tune';
-var BOSH_SERVICE = 'http://localhost:5280/http-bind/';
 
 var localJID = null;
 var connection   = null;
@@ -185,7 +187,7 @@ function _cbRoster(e) {
     var initialPresence = $pres().c('show').t('online').up().c('status').t('Hy, I am an socialXMPP instance').up().c('priority').t('1').up().c('c', {xmlns: NS_CAPS, hash: 'sha-1', node: 'http://jabber.babelmonkeys.de', ver: genCaps()}).up();
     connection.send(initialPresence.tree());
 
-    $('#friends').show();
+    $('#friends').css('display', 'table');
 
     return false;
 }
@@ -378,6 +380,9 @@ function showDisconnect() {
 }
 
 $(document).ready(function () {
+    if (DEBUG) {
+	$('#log_container').show();
+    }
     connection = new Strophe.Connection(BOSH_SERVICE);
     connection.rawInput = rawInput;
     connection.rawOutput = rawOutput;
diff --git a/scripts/strophejs b/scripts/strophejs
index 869a007..edd32cc 160000
--- a/scripts/strophejs
+++ b/scripts/strophejs
@@ -1 +1 @@
-Subproject commit 869a007c919936756c3f00cd298450e6a6b27a7a
+Subproject commit edd32ccb8b787f982d19b4df37ca697c1e8824a5