add updating fav counts

11 files changed, 174 insertions, 208 deletions

diff --git a/template/fame.st b/template/fame.st
index df030d3..d773447 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -17,7 +17,7 @@
 	<div id="messageList">
           $if(dumps)$
           <span class="content">
-            $dumps: { d | $fame_dump(dump=d)$ }$
+            $dumps: { dump | $fame_dump()$ }$
           </span>
           $else$
           No dumps!
diff --git a/template/fame_dump.st b/template/fame_dump.st
index 9403696..5a8d637 100644
--- a/template/fame_dump.st
+++ b/template/fame_dump.st
@@ -6,9 +6,9 @@ $endif$
 
 
 $dump.created_on$  -- by <a href="/$dump.nick$"><b>$dump.nick$</b></a>
-<span>&nbsp;&nbsp;&nbsp;<img height="16px" width="16px" src="http://dump.fm/static/img/thumbs/heartfaved.gif">$dump.count$</span>
+<span>&nbsp;&nbsp;&nbsp;<img height="16px" width="16px" src="/static/img/thumbs/heartfaved.gif"><span class="scorecount">$dump.count$</span></span>
 
   <div class="content">$dump.content$</div>
   <hr />
-$share_buttons()$
+$hall_share_buttons()$
   </div>
diff --git a/template/frontpage.st b/template/frontpage.st
index dfca4e2..857c019 100644
--- a/template/frontpage.st
+++ b/template/frontpage.st
@@ -8,65 +8,33 @@ frm.src=frm.src;
 setTimeout("refreshing()",300000);
 }
 </script>
-    <title>dump.fm</title>
-    
-    
-    <!---HEAD
-     --->
-    
+  <title>dump.fm</title>
+    <!---HEAD --->
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps">
-<meta name="description" content="dump.fm - Talk with pictures!" />
-<script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script>
-<link rel="shortcut icon" href="$domain$/static/favicon.ico">
-<link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > 
-<script type="text/javascript" src="$domain$/static/js/pichat.js"></script>
-      <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
-        <script src="$domain$/static/js/jquery.isotope.min.js"></script>
-    <!--     <link rel="stylesheet" href="$domain$/static/css/isostyle.css" type="text/css" media="screen" />-->
-<script>Domain = "$domain$"</script>
-$if(!user_nick)$
-<!--<link href="$domain$/static/css/front.css" media="screen, projection" rel="stylesheet" type="text/css">-->
-<script type="text/javascript" src="$domain$/static/js/popup.js"></script>
-$endif$
-$if(isadmin)$
-<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" 
-      type="text/css" media="all" />
-<!--<link rel="stylesheet" href="$domain$/static/css/admin.css"
-      type="text/css" media="all" />-->
-<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js"
-        type="text/javascript"></script>
-       
-<!--<script src="$domain$/static/js/admin.js" type="text/javascript"></script>-->
-$endif$
-
-<link rel="shortcut icon" href="$domain$/static/favicon.ico">
-      
-
-
-<!--END HEAD-->
-<style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps">
+    <meta name="description" content="dump.fm - Talk with pictures!" />
+    <script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script>
+    <link rel="shortcut icon" href="$domain$/static/favicon.ico">
+    <link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > 
+    <script type="text/javascript" src="$domain$/static/js/pichat.js"></script>
+    <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> 
+    <script src="$domain$/static/js/jquery.isotope.min.js"></script>
+    <script>
+      Domain = "$domain$";
+      Nick = $if(logged_in)$"$user_nick$"$else$null$endif$;
+    </script>
 
+    $if(!logged_in)$
+    <!--<link href="$domain$/static/css/front.css" media="screen, projection" rel="stylesheet" type="text/css">-->
+    <script type="text/javascript" src="$domain$/static/js/popup.js"></script>
+    $endif$
 
+    <link rel="shortcut icon" href="$domain$/static/favicon.ico">
+    
+    <!--END HEAD-->
+    <style>
 
-body{margin:0px;    background-image:url(http://dump.fm/static/img/bg.dither.gif);	background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+body{margin:0px;    background-image:url($domain$/static/img/bg.dither.gif);	background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
 	background-position:top;*/background-attachment:fixed;min-width:900px;  font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif;
   font-size: 13px;  line-height: 1.5em;}
@@ -90,11 +58,11 @@ img{border:0px;}
 .logged-dump img{max-width:240px;max-height:240px;padding-top:3px;   }
      
       $if(user_nick)$
+      .buttons img{z-index:4;float:left;padding-top:5px;cursor:pointer;}
+      $else$
+      .buttons img{display:none;z-index:4;float:left;padding-top:5px;cursor:pointer;}
+      $endif$
 
-.buttons img{z-index:4;float:left;padding-top:5px;cursor:pointer;}
-$else$
-.buttons img{display:none;z-index:4;float:left;padding-top:5px;cursor:pointer;}
-$endif$
 .buttons .share{cursor:pointer;display:none;}
 img.thumb {
 bottom:3px;
@@ -133,7 +101,8 @@ z-index:4;
     -moz-box-shadow:#777 0 0 0 1px;
     -webkit-box-shadow:#777 0 0 0 1px;
     text-shadow:rgba(0,0,0,.4) 0 1px 0;}
-.hallscore{margin-right:-20px;color:#fff;text-align:center;margin-top:-20px;float:right;font-size:40px;z-index:1;padding:6px;background-image:url('/static/img/hallheart.png');background-position:top left;font-style: oblique;font-weight:100;height:50px;width:50px;text-shadow:-1px 1px 0px #000;line-height:37px;text-indent:4px;cursor:pointer;
+.hallscore{margin-right:-20px;color:#fff;text-align:center;margin-top:-20px;float:right;font-size:40px;z-index:1;padding:6px;background-image:url('/static/img/hallheart.png');background-position:top left;font-style: oblique;font-weight:100;height:50px;width:50px;text-shadow:-1px 1px 0px #000;line-height:37px;text-indent:4px;
+   $if(logged_in)$cursor:pointer;$endif$
    }
 .hallnick{font-size:16px;}
 
@@ -186,7 +155,7 @@ cursor:pointer;
 	margin-left:3px;
 }
 a.signin span {
-	background-image:url("http://dump.fm/static/form_login/images/toggle_down_light.png");
+	background-image:url("$domain$/static/form_login/images/toggle_down_light.png");
 	background-repeat:no-repeat;
 	background-position:100% 50%;
 	padding:4px 16px 6px 0;cursor:pointer;
@@ -202,7 +171,7 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4,
 }
 
 a.signin.menu-open span {cursor:pointer;
-	background-image:url("http://dump.fm/static/form_login/images/toggle_up_dark.png");
+	background-image:url("$domain$/static/form_login/images/toggle_up_dark.png");
 	color:#789;
 }
 
@@ -327,16 +296,13 @@ a#disregister {
 		}
 
 
-
-
-
 /*searchstuff*/
 
 
 
 
 .search_icon  {
-    background:url("http://dump.fm/static/img/hourglass.png") no-repeat scroll center center transparent;
+    background:url("$domain$/static/img/hourglass.png") no-repeat scroll center center transparent;
     bottom:3px;
     cursor:pointer;
     left:6px;
@@ -397,20 +363,6 @@ margin:7px;
             background: url(/images/spinner.gif) no-repeat center center;
         }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </style>
 
 
@@ -441,7 +393,7 @@ jQuery(window).load(function(){
  <body onload="refreshing()">
  
  <!--
- <iframe src="http://dump.fm/fullscreen"style="overflow:hidden;width:100%;height:100%;border:0px;z-index:-1;position:fixed;top:0px;left:0px;"></iframe>
+ <iframe src="$domain$/fullscreen"style="overflow:hidden;width:100%;height:100%;border:0px;z-index:-1;position:fixed;top:0px;left:0px;"></iframe>
  -->
 <!--START BANNER-->
 
@@ -449,30 +401,25 @@ jQuery(window).load(function(){
 	  
 
 	
-        $if(!user_nick)$
-	  <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
-          $else$
-	  <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
-
-	    $endif$
+        $if(!logged_in)$
+	<a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
+        $else$
+	<a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
+	$endif$
 	    
-              
-                $if(user_nick)$
-                
-<div id="toplinks">	 
-                <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
-	          <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a>           
-                <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;">
-		  <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory
-	        </a>
-	        <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
-		  <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
-	        </a>
-</div>
-
-    <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
-            
-	        $else$
+        $if(user_nick)$
+        <div id="toplinks">	 
+          <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
+	    <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a>           
+          <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;">
+	    <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory
+	  </a>
+	  <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
+	    <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
+	  </a>
+        </div>
+        <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
+	$else$
 	                   <!--
 <div id="toplinks">	 
                 <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
@@ -484,35 +431,28 @@ jQuery(window).load(function(){
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a>
 </div>-->
     <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
-           <a href="http://dump.fm/register" id="disregister">Register!</a>
-	        $endif$     
-
-
-
+           <a href="$domain$/register" id="disregister">Register!</a>
+	   $endif$     
 
-      <div id="searchbox">
-        <input type="text" name="search-query" id="search-query" searchstyle="mini" />   
-   </div>
-   
+           <div id="searchbox">
+             <input type="text" name="search-query" id="search-query" searchstyle="mini" />   
+           </div>
+           
    
 
       
-      $if(user_nick)$
-
-      <div id="logout7"class="white">   
-          <form id="logout" action="/logout" method="POST">
-	    <a href="#" onclick="jQuery('#logout').submit(); return false">Logout</a>
-          </form>
-      </div>    
-      
-      $else$
-      <div id="toplogin">
-        $form_login()$
-      </div>
-      
-      $endif$
-
-
+           $if(logged_in)$
+           <div id="logout7"class="white">   
+             <form id="logout" action="/logout" method="POST">
+	       <a href="#" onclick="jQuery('#logout').submit(); return false">Logout</a>
+             </form>
+           </div>
+           
+           $else$
+           <div id="toplogin">
+             $form_login()$
+           </div>
+           $endif$
 </div>
 
 
@@ -521,49 +461,39 @@ jQuery(window).load(function(){
 
 <div id="posts" name="posts"class="clickable clearfix">
   <div id="sideinfo">
+
     $if(user_nick)$
     <b><a href="$domain$/chat">JOIN CHAT!</a></b>
     <div id="hallnick">
       <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
     </div>
     $else$
-    
-    
- Currently hot on <a href="$domain$/chat">dump.fm</a>
-    <!--
-       <div id="hallnick">
-      <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
-    </div>
--->
-    <div class="alttxt"><br>Join the conversation!<strong><br><br><a href="$domain$/login" class="signin">sign in</a></strong> or <strong><a href="$domain$/register">register!</a></strong>
+    Currently hot on <a href="$domain$/chat">dump.fm</a>
+    <div class="alttxt">
+      <br>Join the conversation!<br><br>
+      <strong>
+        <a href="$domain$/login" class="signin">sign in</a></strong> or <strong><a href="$domain$/register">register!</a>
+      </strong>
     </div>
     $endif$
   </div>
      
-  <!--   <div class="logged-dump">
- <div id="hallnick">On dump.fm now..</i>
-    <iframe src="http://dump.fm/fullscreen"style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
-     </div>-->
      
-          $if(dumps)$
-          $dumps: { d | $hall_log_dump(dump=d)$ }$
-          $endif$
-          </div>
+  $if(dumps)$
+  $dumps: { dump | $hall_log_dump()$ }$
+  $endif$
+</div>
           
 <div id="pgbuttons">
-                 
-             $if(prev)$
-              <a href="http://$roomkey$dump.fm/log/$prev$"><input class="pgbutton"id="prevbutton" value="<- Prev" readonly="true"type="button"></a>
-  $else$
-
- $endif$
-
-          $if(next)$
-                       <a href="http://$roomkey$dump.fm/log/$next$">  <input class="pgbutton"id="nextbutton" value="Next ->" readonly="true"type="button"></a>
-     $else$
-   
-     $endif$
+  $if(prev)$
+  <a href="http://$roomkey$dump.fm/log/$prev$"><input class="pgbutton"id="prevbutton" value="<- Prev" readonly="true"type="button"></a>
+  $endif$
 
+  $if(next)$
+  <a href="http://$roomkey$dump.fm/log/$next$">
+    <input class="pgbutton"id="nextbutton" value="Next ->" readonly="true"type="button">
+  </a>
+  $endif$
 </div>   
      
 <!--START FOOTER
@@ -571,10 +501,10 @@ jQuery(window).load(function(){
 <br><br><center>
 <div id="footer">
 @2010 <a href="/">dump.fm</a>
-<a href="http://dump.fm/about_us" style="word-spacing: normal">About Us</a> 
-<a href="http://dump.fm/help" style="word-spacing: normal">Help FAQ</a> 
-<a href="http://dump.fm/terms">Terms</a>
-<a href="http://dump.fm/privacy">Privacy</a>
+<a href="$domain$/about_us" style="word-spacing: normal">About Us</a> 
+<a href="$domain$/help" style="word-spacing: normal">Help FAQ</a> 
+<a href="$domain$/terms">Terms</a>
+<a href="$domain$/privacy">Privacy</a>
 </div></center>
 </div>
 $google_analytics()$
diff --git a/template/frontpage_share_buttons.st b/template/frontpage_share_buttons.st
index 003795e..020f60e 100644
--- a/template/frontpage_share_buttons.st
+++ b/template/frontpage_share_buttons.st
@@ -1,10 +1,10 @@
 <span class="buttons frontpage">
   <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a>
 $if(dump.favorited)$
-  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.frontpage_fav(this)">
+  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.hallscore', '60px', '40px')">
 $else$
   <div style="position: relative">
-    <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.frontpage_fav(this)">
+    <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.animated_fav(this, '.hallscore', '60px', '40px')">
   </div>
 $endif$
 </span>
diff --git a/template/hall_log_dump.st b/template/hall_log_dump.st
index 9cde345..4cd7ba7 100644
--- a/template/hall_log_dump.st
+++ b/template/hall_log_dump.st
@@ -1,5 +1,6 @@
 <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <a href="/$dump.nick$"><b class="hallnick">$dump.nick$</a></b>$if(dump.score)$<span class="hallscore" onclick="Tag.frontpage_fav(this)">$dump.score$</span>$endif$
+  <a href="/$dump.nick$"><b class="hallnick">$dump.nick$</a></b>
+  $if(dump.score)$<span class="hallscore" onclick="Tag.animated_fav(this, '.hallscore', '60px', '40px')">$dump.score$</span>$endif$
   <div class="content" data-category="posts">$dump.content$</div>
   <hr />
   $frontpage_share_buttons()$
diff --git a/template/hall_share_buttons.st b/template/hall_share_buttons.st
new file mode 100644
index 0000000..6addd09
--- /dev/null
+++ b/template/hall_share_buttons.st
@@ -0,0 +1,19 @@
+<span class="buttons">
+  <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
+  <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
+  <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
+  <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+  <a class="permalink" href="/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a>
+$if(logged_in)$
+$if(dump.favorited)$
+  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.scorecount', '18px', '12px')">
+$else$
+  <div style="position: relative">
+    <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.animated_fav(this, '.scorecount', '24px', '12px')">
+  </div>
+$endif$
+$endif$
+$if(dump.favcount)$
+  $dump.favcount$
+$endif$
+</span>
diff --git a/template/head.st b/template/head.st
index f6bcdb0..66276e2 100644
--- a/template/head.st
+++ b/template/head.st
@@ -7,7 +7,10 @@
 <!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> -->
 <script type="text/javascript" src="$domain$/static/js/pichat.js"></script>
 <link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css">
-<script>Domain = "$domain$"</script>
+<script>
+  Domain = "$domain$";
+  Nick = $if(user_nick)$"$user_nick$"$else$null$endif$;
+</script>
 $if(!user_nick)$
 <script type="text/javascript" src="$domain$/static/js/popup.js"></script>
 $endif$
diff --git a/template/profile.st b/template/profile.st
index 82c77e6..f37aeba 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -34,7 +34,7 @@ jQuery(document).ready(function() {
     $if(avatar)$
     <div id="dashtotal"style="background-image:url($avatar$);opacity:0.1;width:100%;height:100%;z-index:-1"></div>
     $else$
-    <div id="dashtotal"style="background-image:url(http://dump.fm/static/img/thumbs/stripes.gif);width:100%;height:100%;z-index:-1"></div>
+    <div id="dashtotal"style="background-image:url($domain$/static/img/thumbs/stripes.gif);width:100%;height:100%;z-index:-1"></div>
     $endif$
     
     $banner()$
@@ -46,7 +46,7 @@ jQuery(document).ready(function() {
           <img id="dashavatarPic" src="$avatar$"/>
 	</div>
         $else$
-        <img id="avatarPic" src="/static/img/noinfo.png">
+        <img id="avatarPic" src="$domain$/static/img/noinfo.png">
         
         $endif$
 
@@ -60,18 +60,16 @@ jQuery(document).ready(function() {
         $if(is_home)$
         <div id="avatar-editing" style="display: none">
           <input id="uploadp" value="Upload Icon" type="submit">
-          <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
+          <img id="spinner" src="$domain$/static/img/spinner.gif" style="display: none" />
         </div>
         $endif$
         <div id="dashinfo">
-          <h2>  
-            $nick$$if(score_ent)$$score_ent$$endif$ </h2>           
-          
+          <h2>$nick$$if(score_ent)$$score_ent$$endif$</h2>           
 	  <br> <h3>contact info</h3>
           $if(contact)$
 	  <div id="contact" class="linkify-text">$contact$</div>
 	  $else$
-          <img id="contact" src="/static/img/noinfo.png">
+          <img id="contact" src="$domain$/static/img/noinfo.png">
 	  $endif$            
 	  <br>
 	  <h3>bio</h3>
@@ -90,16 +88,16 @@ jQuery(document).ready(function() {
       
       <div id="middash">	
     
-  	<h2><a href="http://dump.fm/$nick$/log">$if(is_home)$ your $else$ $nick$'s$endif$ posts &#10145;</a></h2>
+  	<h2><a href="/$nick$/log">$if(is_home)$ your $else$ $nick$'s$endif$ posts &#10145;</a></h2>
 	<hr>
-	<h2><a href="http://dump.fm/$nick$/favorites"> $if(is_home)$ your $else$ $nick$'s $endif$ favs &#10145;</a></h2>
+	<h2><a href="/$nick$/favorites"> $if(is_home)$ your $else$ $nick$'s $endif$ favs &#10145;</a></h2>
 	
   <hr>
-	<a href="http://dump.fm/$nick$/popular"><h3> $if(is_home)$ your $else$ $nick$'s$endif$ most popular &#10145;</h3></a>
+	<a href="/$nick$/popular"><h3> $if(is_home)$ your $else$ $nick$'s$endif$ most popular &#10145;</h3></a>
   
       </div>
     <div id="dashpix">
-	<a href="http://dump.fm/$nick$/log"><div id="favstxt">$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps</div></a>
+	<a href="/$nick$/log"><div id="favstxt">$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps</div></a>
 	<div id="mostrecentdumps">
 	$imgs: { img | <a target="_blank" href="$img$"><img src="$img$"></img></a> }$
 	</div>
diff --git a/template/share_buttons.st b/template/share_buttons.st
index 7cb874f..67dd762 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -4,6 +4,7 @@
   <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
   <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)">
   <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a>
+$if(logged_in)$
 $if(dump.favorited)$
   <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
@@ -11,6 +12,7 @@ $else$
     <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
   </div>
 $endif$
+$endif$
 $if(dump.favcount)$
   $dump.favcount$
 $endif$
diff --git a/template/single_message.st b/template/single_message.st
index 3bf49ac..872ff24 100644
--- a/template/single_message.st
+++ b/template/single_message.st
@@ -11,39 +11,33 @@
   <body class="permalink">
     $banner()$
     <div class="content"><br><br><br>
-
       <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-
         <div id="profiletxt">
-                <a href="/$dump.nick$">
-        $if(dump.avatar)$
-        <div style="border-image:url($dump.avatar$)">  
-          <div id="avatarPic">
-            <img height="50" width="50" src="$dump.avatar$"></img>
-          </div>
-          <b>$dump.nick$</b>
-
-        </div>
-        $endif$
-      </a>
-          
+          <a href="/$dump.nick$">
+            $if(dump.avatar)$
+            <div style="border-image:url($dump.avatar$)">  
+              <div id="avatarPic">
+                <img height="50" width="50" src="$dump.avatar$"></img>
+              </div>
+              <b>$dump.nick$</b>
+            </div>
+            $endif$
+          </a>
           $dump.created_on$  - in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
-
+          
         </div>
-
-
         <div class="content">$dump.content$</div>
         <hr/>
         <div class="faver-list">
-          $dump.count$ <img src="http://dump.fm/static/img/thumbs/heartfavedsm.gif"></span> $dump.favers: { nick | <a href="http://dump.fm/$nick$/popular"><b>$nick$</b></a> &nbsp; }$
-</div>
-$share_buttons()$
-</div>
-
-
-<div id="footerc">
-  $footer()$
-</div>
-</div>
-</body>
+          <span class="dump_score">$dump.count$</span>
+          <img src="http://dump.fm/static/img/thumbs/heartfavedsm.gif">
+          $dump.favers: { nick | <a href="http://dump.fm/$nick$/popular"><b>$nick$</b>&nbsp;</a> }$
+        </div>
+        $single_message_share_buttons()$
+      </div>
+      <div id="footerc">
+        $footer()$
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/template/single_message_share_buttons.st b/template/single_message_share_buttons.st
new file mode 100644
index 0000000..313bcb1
--- /dev/null
+++ b/template/single_message_share_buttons.st
@@ -0,0 +1,19 @@
+<span class="buttons">
+  <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
+  <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
+  <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
+  <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+  <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a>
+$if(user_nick)$
+  $if(dump.favorited)$
+  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.dump_score', '30px', '20px')">
+  $else$
+  <div style="position: relative">
+    <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.animated_fav(this, '.dump_score', '30px', '20px')">
+  </div>
+  $endif$
+$endif$
+$if(dump.favcount)$
+  $dump.favcount$
+$endif$
+</span>