diff options
| author | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 14:23:20 -0800 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 14:23:20 -0800 |
| commit | c97fe699625b793e9a9d8f348a0af7a9a375a4cd (patch) | |
| tree | fa8ff2385103b0c10a55a3a0589868718923a5cc /template/chat.st | |
| parent | 458a2627cc6600690fdf78e48b78cf17a6ea4469 (diff) | |
| parent | 7a1af322fa38e1205613bc4767de7cc59b74c69c (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'template/chat.st')
| -rwxr-xr-x | template/chat.st | 13 |
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> |