diff options
| author | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 19:25:03 -0800 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.home> | 2009-12-21 19:25:03 -0800 |
| commit | 8d7953898a23eda31b27b8f0e2b9987113e01776 (patch) | |
| tree | 886a612e7e6149c34585ce7caac3c97e4005c168 | |
| parent | c97fe699625b793e9a9d8f348a0af7a9a375a4cd (diff) | |
| parent | ca93a583b4b7f86f6da4a3caaece8619a357199e (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
| -rwxr-xr-x | template/chat.st | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/template/chat.st b/template/chat.st index 9095901..8270ce7 100755 --- a/template/chat.st +++ b/template/chat.st @@ -12,7 +12,30 @@ jQuery(document).ready(initChat); var Nick = $json_user_nick$; </script> - </head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><style type="text/css"> +<!-- +a { + font-size: 12px; + color: #000; +} +a:link { + text-decoration: none; +} +a:visited { + text-decoration: none; + color: #000; +} +a:hover { + text-decoration: none; + color: #00F; +} +a:active { + text-decoration: none; + color: #000; +} + +--> +</style></head> <body> @@ -28,17 +51,10 @@ </div> <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 class="username"><a href="/u/$u$" class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$</a><br> + </div> }$ - </div> -======= - <div><a href="/u/$u$">$u$</a></div> - }$ - </div> ->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:template/chat.st - + </div> <div id="messagePane"> <div id="messageList"> $messages: { m | |