summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-10 17:02:25 -0400
committerdumpfmprod <dumpfmprod@ubuntu.(none)>2010-04-10 17:02:25 -0400
commit0a7f44ad32e7393402f8086e4dd932828acd2c29 (patch)
tree8410cd42207728b48a086b7b2cf342f05ac64ef3
parent15cfbb08971a661b6582d1f49a774907fdbd8455 (diff)
timb comitting prod change so i can merge
-rw-r--r--template/chat.st10
1 files changed, 6 insertions, 4 deletions
diff --git a/template/chat.st b/template/chat.st
index 2ab2369..b17dc68 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -60,14 +60,14 @@ $users: { u |
$messages: { m |
<div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$">
<span class="nick">
- <b><a href="/u/$m.nick$">$m.nick$</a></b>
+ <b><a href="/u/$m.nick$">$m.nick$</a>:</b>
$if(m.favorited)$
<img src="/static/img/thumbs/color.right.gif" class="thumb chat-thumb" onclick="Tag.favorite(this)">
$else$
<img src="/static/img/thumbs/pink.circle.gif" class="thumb chat-thumb" onclick="Tag.favorite(this)">
$endif$
</span>
- <span class="content">$m.content$<span>
+ <span class="content">$m.content$</span>
</div>
}$
<hr />
@@ -76,10 +76,11 @@ $if(user_avatar)$
<div id="msgInputDiv">
<div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div>
<input id="msgSubmit" type="submit" value="Send"/>
- <button id="palette-button"><img src="/static/img/palette.gif"></button>
+
<input id="upload" value="Upload" type="submit">
<input id="webcam-button-upload" value="Webcam" type="submit">
<input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">
+ <button id="palette-button"><img src="/static/img/palette.gif"></button>
<div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/img/trophyicon.gif"></a></div>
</div><div id="effects-msg"class="invisible">click on your face for effects!</div>
</div>
@@ -87,10 +88,11 @@ $else$
<div id="msgInputDiv">
<div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div>
<input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"/>
- <button id="palette-button"><img src="/static/img/palette.gif"></button>
+
<input id="upload" value="Upload" type="submit"onClick="showAlert();">
<input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();">
<input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink" onClick="showAlert();">
+ <button id="palette-button"><img src="/static/img/palette.gif"></button>
<div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/img/trophyicon.gif"></a></div>
</div>
</div>