Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 77 insertions, 79 deletions

diff --git a/template/messagepane.st b/template/messagepane.st
index d6d171a..f925629 100644
--- a/template/messagepane.st
+++ b/template/messagepane.st
@@ -1,79 +1,77 @@
-<div id="messagePane">

-  $if(isadmin)$

-  <style>

-    #textbutton {

-    position: absolute;

-    left: 10px;

-    top: 0px;

-    background: lightblue;

-    z-index: 100000;

-    }

-  </style>

-  <div id="textbutton">

-    <span>show text?</span>

-    <input type="checkbox">

-  </div>

-  <script>

-    jQuery('#textbutton input').attr('checked', TextEnabled).change(setTextEnable);

-  </script>

-  $endif$

-

-  $if(user_nick)$

-  <div id="userList">

-    $users: { u |

-    <div class="username"><a href="/$u.nick$" target="_blank">

-        $u.score_ent$

-        $if(u.avatar)$

-        <img src="$u.avatar$" width="50" height="50">

-        $else$

-        <img src="/static/img/noinfo.png">

-        $endif$

-        $u.nick$</a><br>

-    </div>

-    }$

-  </div>$endif$

-  <div id="favbox" style="display: hidden"></div>

-  <div id="messageList">

-    $messages: { m |

-    <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$ $if(m.is_image)$contains-image$endif$" id="message-$m.message_id$" nick="$m.nick$">

-      <span class="nick">

-        <b><a href="$domain$/$m.nick$" target="_blank">$m.nick$</a></b>

-        $if(m.favorited)$

-        <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)">

-        $else$

-        <img src="/static/img/thumbs/smallheart.gif" class="chat-thumb" onclick="Tag.favorite(this)">

-        $endif$

-      </span>

-      <span class="content">$m.content$</span>

-    </div>

-    }$

-    <hr />

-  </div>

-

-  $if(user_nick)$

-  <div id="msgInputDiv">

-    <div id="msginputrapper">

-      <input id="msgInput" class="msgInput" type="input" />

-    </div>   

-    <input id="msgSubmit" type="submit" value="Send"/>

-    <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>

-  <div id="effects-msg" class="invisible">click on your face for effects!</div>

-</div>

-$else$

-<div id="msgInputDiv">

-  <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   

-  <input id="msgSubmit" type="submit" value="Send" onClick="showAlert();"/>

-  <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"  onClick="showAlert();"></button>

-</div>

-<div id="effects-msg" class="invisible">click on your face for effects!</div>

-</div>

-$endif$

-</div>

-</div>

+<div id="messagePane">
+  <style>
+    #textbutton {
+    position: absolute;
+    left: 10px;
+    top: 0px;
+    background: lightblue;
+    z-index: 100000;
+    }
+  </style>
+  <div id="textbutton">
+    <span>show text?</span>
+    <input type="checkbox">
+  </div>
+  <script>
+    jQuery('#textbutton input').attr('checked', TextEnabled).change(setTextEnable);
+  </script>
+
+  $if(user_nick)$
+  <div id="userList">
+    $users: { u |
+    <div class="username"><a href="/$u.nick$" target="_blank">
+        $u.score_ent$
+        $if(u.avatar)$
+        <img src="$u.avatar$" width="50" height="50">
+        $else$
+        <img src="/static/img/noinfo.png">
+        $endif$
+        $u.nick$</a><br>
+    </div>
+    }$
+  </div>$endif$
+  <div id="favbox" style="display: hidden"></div>
+  <div id="messageList">
+    $messages: { m |
+    <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$ $if(m.is_image)$contains-image$endif$" id="message-$m.message_id$" nick="$m.nick$">
+      <span class="nick">
+        <b><a href="$domain$/$m.nick$" target="_blank">$m.nick$</a></b>
+        $if(m.favorited)$
+        <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)">
+        $else$
+        <img src="/static/img/thumbs/smallheart.gif" class="chat-thumb" onclick="Tag.favorite(this)">
+        $endif$
+      </span>
+      <span class="content">$m.content$</span>
+    </div>
+    }$
+    <hr />
+  </div>
+
+  $if(user_nick)$
+  <div id="msgInputDiv">
+    <div id="msginputrapper">
+      <input id="msgInput" class="msgInput" type="input" />
+    </div>   
+    <input id="msgSubmit" type="submit" value="Send"/>
+    <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>
+  <div id="effects-msg" class="invisible">click on your face for effects!</div>
+</div>
+$else$
+<div id="msgInputDiv">
+  <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
+  <input id="msgSubmit" type="submit" value="Send" onClick="showAlert();"/>
+  <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"  onClick="showAlert();"></button>
+</div>
+<div id="effects-msg" class="invisible">click on your face for effects!</div>
+</div>
+$endif$
+</div>
+</div>