summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2009-11-15 23:03:49 -0500
committersostler <sbostler@gmail.com>2009-11-15 23:03:49 -0500
commit762f43af02e0a9a90cb9a1d20d24f596f4ee93e1 (patch)
treee6f6641ba01efd1827ffbefc94a60e26dae627e6
parent31b8a27fbaa272a7990f452194912d229a3eede4 (diff)
fixed issues
-rw-r--r--src/site.clj4
-rwxr-xr-xstatic/index.html29
-rwxr-xr-xstatic/pichat.css4
3 files changed, 20 insertions, 17 deletions
diff --git a/src/site.clj b/src/site.clj
index 4e29e2b..8ca16d6 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -51,8 +51,8 @@
nick)))
(defn updates
- ([] {"users" (keys @users) "messages" (new-messages)})
- ([since] {"users" (keys @users) "messages" (new-messages since)}))
+ ([] {"users" (sort (keys @users)) "messages" (new-messages)})
+ ([since] {"users" (sort (keys @users)) "messages" (new-messages since)}))
(defn init [session]
(let [new-nick (make-random-nick)]
diff --git a/static/index.html b/static/index.html
index 2d3bd61..fe4b9b0 100755
--- a/static/index.html
+++ b/static/index.html
@@ -14,20 +14,23 @@
</script>
</head>
<body>
- <div id="welcomebar" style="display: none">
- <span>Welcome, </span>
- <span id="nickspan"></span>
- </div>
-
- <div id="wrapper">
- <div id="chatPane">
- <div id="messageList"></div>
- <div id="msgInputDiv">
- <input id="msgInput" type="input" disabled="disabled" />
- <input id="msgSubmit" type="submit" value="Enter" disabled="disabled" />
+ <div id="content">
+ <h1>dump.fm</h1>
+ <div id="chatbox">
+ <div id="welcomebar" style="display: none">
+ <span>Welcome, </span>
+ <span id="nickspan"></span>
+ </div>
+ <div id="userList"></div>
+ <div id="messagePane">
+ <div id="messageList"></div>
+ <div id="msgInputDiv">
+ <input id="msgInput" type="input" disabled="disabled" />
+ <input id="msgSubmit" type="submit" value="Enter"
+ disabled="disabled" />
+ </div>
</div>
</div>
- <div id="userList"></div>
</div>
<div id="apDiv3"></div>
@@ -37,6 +40,6 @@
</div>
<div id="apDiv5"></div>
<div id="apDiv6"></div>
-
+ <br />
</body>
</html>
diff --git a/static/pichat.css b/static/pichat.css
index f413736..e2f382c 100755
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -4,7 +4,7 @@ html, body {
padding: 1em;
}
-#content{
+#content {
position:absolute;
z-index:3;
}
@@ -13,7 +13,7 @@ html, body {
position: fixed;
top:48px;
}
-h1,h2{
+h1,h2 {
font: 100% 'helvetica neue',sans-serif;
letter-spacing:10px;
text-transform:uppercase;