fix merge

6 files changed, 26 insertions, 22 deletions

diff --git a/template/banner.st b/template/banner.st
index f025fc6..cbd4639 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -12,19 +12,18 @@
           <div style="float: left;">
             <div align="center">
               $if(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="$domain$/directory">
-		<img src="/static/img/directory.gif" width="20px" height="20px" />&#9824; Directory
+	      <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;">	<img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a>
+              <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>
-              <a href="$domain$/$user_nick$/favorites">&#10084; Favs</a>
-              <a href="$domain$/browser"><img src="/static/img/image_draw.gif"/>&#9830; Image Search</a>
+   <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a>
+              <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a>
 	      $else$
 	      <a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a>
 	      $endif$     
@@ -48,13 +47,13 @@
       $if(user_nick)$
       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>
+        -<a href="http://vip.dump.fm/">  NAUGHTY BOYS DELIGHT </a>
         $endif$
     </div>
     $if(user_nick)$
     <div id="logout7" class="white">   
       <div align="center">
-	<a href="/logout">Logout</a>
+	<a href="/logout" onclick="pageTracker._trackEvent('button', 'logout'); return true;">Logout</a>
       </div>
       $else$
       <div id="toplogin" class="white">
diff --git a/template/dealwithit.st b/template/dealwithit.st
index 00472a5..91e268e 100644
--- a/template/dealwithit.st
+++ b/template/dealwithit.st
@@ -81,7 +81,7 @@ text-decoration:none;
 
     
     </style>
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
 
 
     <script src="http://dump.fm/static/js/jquery.lazyload.js" type="text/javascript"></script>
@@ -121,8 +121,11 @@ text-decoration:none;
              
                                                 <img src="http://dump.fm/images/20100601/1275429111424-dumpfm-noisia-deal-with-it-premie-pout.gif"><br>
                                                 
-                                                <img src="http://dump.fm/images/20100622/1277237949745-dumpfm-melipone-raydeal.gif"><br>
-                                                
+                                                <img src="http://dump.fm/images/20100623/1277324893609-dumpfm-glasspopcorn-heelwithit.gif"><br>
+                                                 <img src="http://dump.fm/images/20100623/1277325063273-dumpfm-glasspopcorn-congealwithit.gif"><br>
+                                                 <img src="http://dump.fm/images/20100623/1277324378232-dumpfm-glasspopcorn-peelwithit.gif"><br>
+                                                 <img src="http://dump.fm/images/20100623/1277325268634-dumpfm-SCHUBRE-dealwithittemplate.gif"><br>
+                                                             <img src="http://dump.fm/images/20100621/1277112354380-dumpfm-arielrebel-dolewithit.gif"><br>
                                                     <img src="http://dump.fm/images/20100614/1276502591622-dumpfm-askin4hell-deal-with-it2.gif"><br>
                                                         <img src="http://dump.fm/images/20100612/1276318959542-dumpfm-mwilliamson-deal-with-itdorritos.gif"><br>
                                                             <img src="http://dump.fm/images/20100612/1276320346688-dumpfm-mwilliamson-deal-with-tm.gif"><br>
diff --git a/template/fame.st b/template/fame.st
index 2cda789..4735cab 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -9,13 +9,13 @@
   <body>
     $banner()$
     <div id="content">
-      <div id="rapper">
 
       
-      <div id="messagePanep">
+      <div id="messagePaneh">
         
         <div id="userListp">
-          <h2>Hall Of Fame </h2><br><h3>Updated every few hours</h3>      
+        <img src="http://dump.fm/static/img/halloffametrophy.gif" id="halltrophy">
+          <h2>Hall Of Fame </h2><br><h3>updated hourly</h3>      
         </div>
         
 	<div id="messageList">
diff --git a/template/head.st b/template/head.st
index faca979..1ebb8f8 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,7 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <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://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.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">
diff --git a/template/slothgoth.st b/template/slothgoth.st
index 127fcd2..2e653c8 100644
--- a/template/slothgoth.st
+++ b/template/slothgoth.st
@@ -83,7 +83,7 @@ text-decoration:none;
     
     
     </style>
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
 
 
     <script src="http://dump.fm/static/js/jquery.lazyload.js" type="text/javascript"></script>
diff --git a/template/userlog.st b/template/userlog.st
index d52efd6..ee01b09 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -9,6 +9,7 @@
       jQuery(document).ready(initLog);
     </script> 
 
+
   </head>
   <body>
     $banner()$
@@ -46,5 +47,6 @@
         </div>
       </div>
     </div>
+
   </body>
 </html>