summaryrefslogtreecommitdiff
path: root/template/chat.st
diff options
context:
space:
mode:
Diffstat (limited to 'template/chat.st')
-rwxr-xr-xtemplate/chat.st13
1 files changed, 10 insertions, 3 deletions
diff --git a/template/chat.st b/template/chat.st
index 3a4cbfd..9095901 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -2,7 +2,7 @@
<head>
<title>dump.fm</title>
<link rel="stylesheet" type="text/css" href="/static/reset.css">
- <link rel="stylesheet" type="text/css" href="/static/pichat.css">
+ <link rel="stylesheet" type="text/css" href="static/pichat.css">
<link rel="shortcut icon" href="/static/favicon.ico">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
@@ -26,11 +26,18 @@
<div id="rapper">
<div id="loghead"></div>
</div>
- <div id="userList">
+ <div id="userList">
$users: { u |
+<<<<<<< HEAD:template/chat.st
+ <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br>
+ </div>
+ }$
+ </div>
+=======
<div><a href="/u/$u$">$u$</a></div>
}$
</div>
+>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:template/chat.st
<div id="messagePane">
<div id="messageList">
@@ -42,7 +49,7 @@
</div>
$if(user_nick)$
<div id="msgInputDiv">
- <input id="msgInput" type="input" />
+ <input id="msgInput" class="msgInput" type="input" />
<input id="msgSubmit" type="submit" value="Send Image URL"
/>
</div>