diff options
| -rw-r--r-- | webclient/index.html (renamed from webclient/basic.html) | 8 | ||||
| -rw-r--r-- | webclient/lib/alias.js (renamed from webclient/lib/basic.js) | 4 | ||||
| -rw-r--r-- | webclient/style/alias.css | 19 | ||||
| -rw-r--r-- | webclient/test.html | 11 |
4 files changed, 24 insertions, 18 deletions
diff --git a/webclient/basic.html b/webclient/index.html index 18e70f2..db87c4d 100644 --- a/webclient/basic.html +++ b/webclient/index.html @@ -9,12 +9,16 @@ <script type="text/javascript" src="lib/jquery-1.4.4.js"></script> <script type="text/javascript" src="lib/jquery-ui-1.8.8.custom.min.js"></script> <script type="text/javascript" src="lib/strophe.min.js"></script> - <script type="text/javascript" src="lib/basic.js"></script> + <script type="text/javascript" src="lib/alias.js"></script> <script type="text/javascript" src="lib/sjcl.js"></script> <link type="text/css" href="style/jquery-ui-1.8.8.custom.css" rel="stylesheet" /> <link rel="stylesheet" type="text/css" href="style/alias.css" /> </head> <body> + <div id="header"> + <span id="logo">Alias</span> + <span id="status"></span> + </div> <div id='login' style='text-align: center'> <form action="#"> <p><label for='jid'>JID:</label> @@ -25,7 +29,7 @@ </div> <div id='left'> - <div id='status'></div> + <div id='roster'> <h2>Contacts</h2> diff --git a/webclient/lib/basic.js b/webclient/lib/alias.js index d0795d1..882d2d3 100644 --- a/webclient/lib/basic.js +++ b/webclient/lib/alias.js @@ -1,5 +1,5 @@ -var BOSH_SERVICE = 'http://alias.fr.nf/http-bind'; -var server_component = 'object.alias.fr.nf'; +var BOSH_SERVICE = 'http://alias.im/http-bind'; +var server_component = 'social.alias.im'; /** * Alias namespace diff --git a/webclient/style/alias.css b/webclient/style/alias.css index b453c28..1608679 100644 --- a/webclient/style/alias.css +++ b/webclient/style/alias.css @@ -70,6 +70,7 @@ input #header { margin:0px; + margin-bottom:15px; background-image: -moz-linear-gradient(top center, white, #AEB2B1); background: -webkit-gradient(linear, left top, left bottom, from(#F6F6F6), to(#D9D9D9)); border-bottom:1px solid #CDCDCD; @@ -89,19 +90,23 @@ input #left { + margin:0px; + margin-right:2%; float:left; width:20%; + background-color:white; + height:88%; } #right { float:left; - width:80%; - height:100%; + width:78%; + height:88%; } #tabs{ - height:90%; + height:100%; } .chat-messages{ @@ -183,4 +188,12 @@ input .away { background-color: #E3E3E3; +} + +#status +{ + margin:0px; + margin-top:10px; + margin-right:10px; + float:right; }
\ No newline at end of file diff --git a/webclient/test.html b/webclient/test.html deleted file mode 100644 index d13a174..0000000 --- a/webclient/test.html +++ /dev/null @@ -1,11 +0,0 @@ -<!--?xml version="1.0" encoding="utf-8" ?--> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><head> - <title>Cryptoapplet - Public key cryptography</title> -<link rel="stylesheet" type="text/css" href="style/alias.css" /> -</head> -<body> -<p id="header"> -<span id="logo">Alias</span></p> -</p> -</body></html>
\ No newline at end of file |