add fav to permalinks, link to conextual domain for local testing, longer fadeout on fav, cleanup some html

15 files changed, 50 insertions, 56 deletions

diff --git a/template/banner.st b/template/banner.st
index f94971f..f025fc6 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -4,7 +4,7 @@
       <div id="logo7">
 	<div align="center">
 	  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 />
-	  <a class="img_roll" href="http://dump.fm/"></a>
+	  <a class="img_roll" href="$domain$"></a>
 	</div>
       </div>
       <div class="white">
@@ -12,19 +12,19 @@
           <div style="float: left;">
             <div align="center">
               $if(user_nick)$
-	      <a href="http://dump.fm/log"><img src="/static/img/log.gif"width="20px" height="20px">&#9827; Log</a>
-              <a href="http://dump.fm/$user_nick$">
+	      <a href="$domain$/log"><img src="/static/img/log.gif"width="20px" height="20px">&#9827; Log</a>
+              <a href="$domain$/$user_nick$">
 		$if(user_avatar)$
 		<img src="$user_avatar$" width="19px" height="19px" />
 		$else$
 		<img src="/static/img/profile.gif"width="22px" height="22px" />
 		$endif$
 		&#9829; Profile</a>
-              <a href="http://dump.fm/directory">
+              <a href="$domain$/directory">
 		<img src="/static/img/directory.gif" width="20px" height="20px" />&#9824; Directory
 	      </a>
-              <a href="http://dump.fm/$user_nick$/favorites">&#10084; Favs</a>
-              <a href="http://dump.fm/browser"><img src="/static/img/image_draw.gif"/>&#9830; Image Search</a>
+              <a href="$domain$/$user_nick$/favorites">&#10084; Favs</a>
+              <a href="$domain$/browser"><img src="/static/img/image_draw.gif"/>&#9830; Image Search</a>
 	      $else$
 	      <a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a>
 	      $endif$     
@@ -46,7 +46,7 @@
     <div id="topic"></div>
     <div id="dumplist">
       $if(user_nick)$
-      want a room? <a href="mailto:info@dump.fm">contact us! - <a href="http://dump.fm/chat/vortex"> checkout the image vortex!! </a>$else$ Talk with pictures! - <a href="http://dump.fm/chat/vortex"> checkout the nifty dump fm image vortex! </a> $endif$ $if(isadmin)$ 
+      want a room? <a href="mailto:info@dump.fm">contact us! - <a href="$domain$/chat/vortex"> checkout the image vortex!! </a>$else$ Talk with pictures! - <a href="$domain$/chat/vortex"> checkout the nifty dump fm image vortex! </a> $endif$ $if(isadmin)$ 
 	<a href="http://news.dump.fm">- news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
         -<a href="http://vip.dump.fm/">  VIP PIMP DEN (<del>GIRLS</del> BOYS ARE COOL) </a>
         $endif$
diff --git a/template/chat.st b/template/chat.st
index d9de62c..43a1f34 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -19,13 +19,11 @@
 $head()$
   <title>$roomname$ dump.fm</title>
 
-<META name="keywords" content="credit, mortgage, dating, hot girls, hot guys, debt solutions, get rich quick"> 
-  <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css">
-  <script type="text/javascript" src="http://dump.fm/static/js/invalid_domains.js"></script>
-  <script type="text/javascript" src="http://dump.fm/static/webcam/webcam.js"></script>
-  <script type="text/javascript" src="http://dump.fm/static/js/ajaxupload.js"></script>
+  <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script>
+  <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script>
+  <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script>
 $if(user_nick)$
-  <script type="text/javascript" src="http://dump.fm/json/$user_nick$/favorites"></script>
+  <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script>
 $endif$
   <script>
     jQuery(document).ready(initChat);
@@ -98,7 +96,7 @@ $banner()$
 $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="http://dump.fm/$m.nick$" target="_blank">$m.nick$</a></b>
+                <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$
diff --git a/template/directory.st b/template/directory.st
index 6d16942..1bf1eb5 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -6,7 +6,6 @@
     <title>dump.fm directory</title>
     $endif$
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
     <script>
       jQuery(document).ready(initDirectory);
     </script>
diff --git a/template/fame.st b/template/fame.st
index 0fa5b03..2cda789 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -2,7 +2,6 @@
   <head>
     <title>dump.fm hall of fame</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
     <script>
       jQuery(document).ready(initLog);
     </script>
diff --git a/template/fame_dump.st b/template/fame_dump.st
index 8ebce02..05cc9fe 100644
--- a/template/fame_dump.st
+++ b/template/fame_dump.st
@@ -12,11 +12,13 @@ $else$
       <img height="50" width="50" src="/static/noinfo.png">  
 $endif$
     </div></a>&nbsp;&nbsp;&nbsp;<img height="16px" width="16px" src="http://dump.fm/static/img/thumbs/heartfaved.gif">$dump.count$
+<!--
 $if(dump.favorited)$
   <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
   <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
+-->
   <div class="content">$dump.content$</div>
   <hr />
 $share_buttons()$
diff --git a/template/head.st b/template/head.st
index 3fd18c6..faca979 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,24 +1,25 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="keywords" content="dump.fm,mortgage, dating, hot girls, hot guys, debt solutions, get rich quick,buy gold,free stuff, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board,credit,">
+<meta name="keywords" content="dump.fm,hot girls, hot guys, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
 <meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
-<script type="text/javascript" src="http://dump.fm/static/js/jquery-ui-1.8.effects.min.js"></script>
-<script type="text/javascript" src="http://dump.fm/static/js/pichat.js"></script>
+<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">
 $if(!user_nick)$
-<link href="http://dump.fm/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
+<link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
 $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="http://dump.fm/static/css/admin.css"
+<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="http://dump.fm/static/js/admin.js" type="text/javascript"></script>
+<script src="$domain$/static/js/admin.js" type="text/javascript"></script>
 $endif$
 
-<link rel="shortcut icon" href="http://dump.fm/static/favicon.ico">
+<link rel="shortcut icon" href="$domain$/static/favicon.ico">
       
 <!--[if IE]>
 <script>
diff --git a/template/log.st b/template/log.st
index 5c44f4e..c747305 100644
--- a/template/log.st
+++ b/template/log.st
@@ -2,7 +2,6 @@
   <head>
     <title>dump.fm log</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
     <script>
       jQuery(document).ready(initLog);
     </script>
diff --git a/template/log_dump.st b/template/log_dump.st
index fca3b82..f594cea 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -12,11 +12,13 @@ $else$
       <img height="50" width="50" src="/static/noinfo.png">  
 $endif$
     </div></a>
+<!--
 $if(dump.favorited)$
   <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
   <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
+-->
   <div class="content">$dump.content$</div>
   <hr />
 $share_buttons()$
diff --git a/template/nigga.st b/template/nigga.st
index 68c85eb..e46e61b 100644
--- a/template/nigga.st
+++ b/template/nigga.st
@@ -2,7 +2,6 @@
   <head>
     <title>$nick$'s dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>
     <script>
diff --git a/template/profile.st b/template/profile.st
index 97fcfa8..22e2978 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -5,7 +5,6 @@
  <meta property="og:title" content="$nick$'s dump.fm"/>
  <meta property="og:site_name" content="dump.fm"/>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>
     <script>
diff --git a/template/profile_dump.st b/template/profile_dump.st
index 8866ae4..b101a08 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -10,11 +10,13 @@ $else$
   <img height="50" width="50" src="/static/img/noinfo.png">  
 $endif$
   </div></a>
+<!--
 $if(dump.favorited)$
   <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
   <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
+-->
   <div class="content">$dump.content$</div>
 <hr/>
 $share_buttons()$
diff --git a/template/profilelog.st b/template/profilelog.st
index 7189377..24e9e07 100644
--- a/template/profilelog.st
+++ b/template/profilelog.st
@@ -2,7 +2,6 @@
   <head>
     <title>$nick$'s dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>
     <script>
diff --git a/template/share_buttons.st b/template/share_buttons.st
index a251cff..ca51b23 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,11 +1,12 @@
 <div class="buttons">
-  <span class="other-sites">
-  <div id="profiletxt"> 
-    <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 href="http://dump.fm/p/$dump.nick$/$dump.message_id$"><img src="http://dump.fm/static/img/link.gif"></a>
-    </div>
-  </span>
+  <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(dump.favorited)$
+  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+$else$
+  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
+$endif$
 </div>
\ No newline at end of file
diff --git a/template/single_message.st b/template/single_message.st
index 79ef06f..13c3ac0 100644
--- a/template/single_message.st
+++ b/template/single_message.st
@@ -3,40 +3,35 @@
     
     <title>dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css">
     <script>
-      jQuery(document).ready(initDirectory);
+      jQuery(document).ready(initLog);
     </script>
     
     
   </head>
-  <body>
+  <body class="permalink">
     $banner()$
-      <div id="content">
-
-        <div id="messagePanep"> 
-<br>   <a href="/$message.nick$">
-              $if(message.avatar)$
-              <div style="border-image:url($message.avatar$)">  
+      <div class="content">
+          <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
+<br>   <a href="/$dump.nick$">
+$if(dump.avatar)$
+              <div style="border-image:url($dump.avatar$)">  
                 <div id="avatarPic">
-                  <img height="50" width="50" src="$message.avatar$"></img>
+                  <img height="50" width="50" src="$dump.avatar$"></img>
                 </div>
-                         
-              <b>$message.nick$</b>
+              <b>$dump.nick$</b>
                 <hr>
-              $endif$
+              </div>
+$endif$
             </a>
-                  <div id="messageList">
-          <div class="content" id="message-$message.message_id$">
-        
-            <span class="linkify">$message.content$</span>
+            <div class="content">$dump.content$</div>
             <hr />
-            </div>
+$share_buttons()$            
 
           </div>
         <div id="footerc">
             $footer()$
-          </div>
         </div>
+      </div>
   </body>
 </html>
diff --git a/template/userlog.st b/template/userlog.st
index e70ae41..d52efd6 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -2,7 +2,6 @@
   <head>
     <title>$nick$'s dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>