Merge branch 'master' of ssh://sostler@dump.fm/home/dumpfmprod/prod

2 files changed, 12 insertions, 12 deletions

diff --git a/template/chat.st b/template/chat.st
index 9122c93..61018c5 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -17,17 +17,6 @@
     </script>
     <script type="text/javascript">
 </script>
-    $if(isadminroom)$
-    <style>
-      iframe {
-          z-index: 50000;
-          position: fixed;
-          top: 200px;
-          right: 25px;
-      }
-    </style>
-    <script src="http://widgets.getclicky.com/tally/?site_id=170656&sitekey=736f7dd41a0612d8d50797c65768e71a&width=175&height=250&title=Visitors" type="text/javascript"></script>
-    $endif$
     <script src="/static/away.js"></script>
     <script src="/static/js/ajaxupload.js"></script>
     <script>
diff --git a/template/logged_dump.st b/template/logged_dump.st
index 86465e3..26021a9 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -32,7 +32,18 @@ img{
     </style>
 <div class="logged-dump">
   <div>$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div>
-  <a href="/u/$dump.nick$"><div id="logavatar"><img height="50" width="50" src="$dump.avatar$" /></div></a>
+  <a href="/u/$dump.nick$">
+  
+  <div id="logavatar">
+  
+  $if(dump.avatar)$<img height="50" width="50" src="$dump.avatar$" />
+  
+  $else$
+  
+  <img height="50" width="50" src="/static/noinfo.png">
+  
+  $endif$
+  </div></a>
   <div class="content">$dump.content$</div>
   <hr />
 </div>