timb commiting prod changes

14 files changed, 43 insertions, 29 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index c149794..fc8ec4a 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -142,7 +142,7 @@ line-height:1.9;
 }
 
 #bar7 img{
-margin-top:4;display:none;
+margin-top:4;
   vertical-align: top;
 }
 #bar7 a{
@@ -993,7 +993,6 @@ border-bottom:2px solid #c8cbce;
 -moz-box-shadow: 3px 3px 3px #c8cbce;
 	text-overflow:ellipsis;
 /* opacity:0.75;*/
-	z-index:18;
 	text-align: left;
 
 background-image:url(/static/img/bg.dither.gif);
@@ -1003,7 +1002,6 @@ background-image:url(/static/img/bg.dither.gif);
 margin-top:6px;
 line-height:20px;
 text-indent:6px;
-z-index:18;
 min-width:90px;
 overflow:hidden;
 
@@ -1057,7 +1055,6 @@ background-color:#f3f3f3;
     max-width:30px;
 	float:right;
 	right:1px;
-	z-index:77;
 	height:30px;
 	border-top-left-radius:3px;
 	border-top-right-radius:3px;
@@ -1248,6 +1245,7 @@ background-color:#0c8fff;
 	-moz-border-radius-bottomleft:5px;
 }
 
+
 #edit-toggle a{font-size:12;
 letter-spacing:;
 
@@ -1905,4 +1903,16 @@ border:1px solid #000;
 position:absolute;
 height:30px;left:255px;
 bottom:30px;
-}
\ No newline at end of file
+}
+
+/*HALL STUFF */
+#messagePaneh {
+width:99%;
+position:fixed;
+margin-left:-3px;
+border:8px inset yellow;
+bottom:25px;
+top:50px;
+	background-color:#fff;
+	z-index:5;
+}
diff --git a/static/css/header.css b/static/css/header.css
index 2c45fc0..1915266 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -109,7 +109,7 @@ line-height:1.9;
 }
 
 #bar7 img{
-margin-top:4;display:none;
+margin-top:4;
   vertical-align: top;
 }
 #bar7 a{
@@ -380,7 +380,7 @@ line-height:1.9;
 }
 
 #bar7 img{
-margin-top:4;display:none;
+margin-top:4;
   vertical-align: top;
 }
 #bar7 a{
diff --git a/static/img/thumbs/directorybaricon.png b/static/img/thumbs/directorybaricon.png
new file mode 100644
index 0000000..bef143b
--- /dev/null
+++ b/static/img/thumbs/directorybaricon.png
diff --git a/static/img/thumbs/favsbaricon.png b/static/img/thumbs/favsbaricon.png
new file mode 100644
index 0000000..c24596b
--- /dev/null
+++ b/static/img/thumbs/favsbaricon.png
diff --git a/static/img/thumbs/halloffamebaricon.png b/static/img/thumbs/halloffamebaricon.png
new file mode 100644
index 0000000..c2516ed
--- /dev/null
+++ b/static/img/thumbs/halloffamebaricon.png
diff --git a/static/img/thumbs/logbaricon.png b/static/img/thumbs/logbaricon.png
new file mode 100644
index 0000000..33edf6e
--- /dev/null
+++ b/static/img/thumbs/logbaricon.png
diff --git a/static/img/thumbs/profilebaricon.png b/static/img/thumbs/profilebaricon.png
new file mode 100644
index 0000000..d6d2a29
--- /dev/null
+++ b/static/img/thumbs/profilebaricon.png
diff --git a/static/img/thumbs/searchbaricon.png b/static/img/thumbs/searchbaricon.png
new file mode 100644
index 0000000..670bfc4
--- /dev/null
+++ b/static/img/thumbs/searchbaricon.png
diff --git a/template/banner.st b/template/banner.st
index f94971f..3bec6fa 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="http://dump.fm/log"><img src="/static/img/log.gif"width="20px" height="20px">&#9827; Log</a>
-              <a href="http://dump.fm/$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">
-		<img src="/static/img/directory.gif" width="20px" height="20px" />&#9824; Directory
+	      <a href="http://dump.fm/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;">	<img src="http://dump.fm/static/img/thumbs/logbaricon.png"/> Log</a>
+              <a href="http://dump.fm/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
+
+	<img src="http://dump.fm/static/img/thumbs/profilebaricon.png"/> Profile</a>           
+              <a href="http://dump.fm/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;">
+		<img src="http://dump.fm/static/img/thumbs/directorybaricon.png"/> Directory
+	      </a>
+	                    <a href="http://dump.fm/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
+		<img src="http://dump.fm/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
 	      </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="http://dump.fm/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="http://dump.fm/static/img/thumbs/favsbaricon.png"/> Favs</a>
+              <a href="http://dump.fm/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="http://dump.fm/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="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)$ 
 	<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 0fa5b03..1088a8f 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -10,13 +10,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 3fd18c6..d88c146 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,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="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 src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" charset="utf-8"></script>
 <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>
 $if(!user_nick)$
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 e70ae41..cc6678d 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -10,6 +10,7 @@
       jQuery(document).ready(initLog);
     </script> 
 
+
   </head>
   <body>
     $banner()$
@@ -47,5 +48,6 @@
         </div>
       </div>
     </div>
+
   </body>
 </html>