sostler prod commit

1 files changed, 39 insertions, 63 deletions

diff --git a/template/banner.st b/template/banner.st
index f46a4e7..31f7595 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -1,25 +1,20 @@
-<div id="rapper7">
-  <div id="header7">
-    <div id="logoicons">
-      <div id="logo7">
-	<div align="center">
+
+<div id="banner">
 	  
-	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogo.gif"id="sassoon"></a>
-	</div>
-      </div>
-      <div class="white">
+
+	
         $if(!user_nick)$
-	<div id="bar7dis">
+	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
           $else$
-	  <div id="bar7"> 
+	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
+
 	    $endif$
-            <div style="float: left;">
-              <div align="center">
+	    
+              
                 $if(user_nick)$
                 
-	        <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;">	<img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> -->
+<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
@@ -27,13 +22,15 @@
 	        <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$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</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>-->
-
+</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>
+        
 
-                <div id="toptools">
+      <div id="searchbox">
+        <input type="text" name="search-query" id="search-query" searchstyle="mini" />   
+   </div>    
+             <div id="toptools">
                   <form name="Tools" >
                     <select class="toolsmenu" name="menu" onChange="if (document.Tools.menu.selectedIndex != 0) { location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value; } ">
                       <option>Tools</option>
@@ -55,63 +52,45 @@
                     </select>
                   </form>
                   
-                </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"style="float:right;top:15px;"></iframe>
-            
 	        $else$
-	        <a href="http://dump.fm/register" id="disregister">Register</a>
+	                   
+<div id="toplinks">	 
+               <!-- <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
+	          <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </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$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
+    <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$     
-              </div>
-	    </div>
-	  </div>
-        </div>
-      </div>
-      
-      $if(user_nick)$
-      <!--  <div id="facebooklike">
-            <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149%3Fref%3Dts&amp;layout=button_count&amp;show_faces=true&amp;width=100&amp;action=like&amp;font=segoe+ui&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"></iframe>
-      </div> -->
 
 
-      <div id="searchbox">
-        <input type="text" name="search-query" id="search-query" searchstyle="mini" />
-	<!--<div class="search_icon"></div>-->
-      </div>
-      $else$
-      <div id="nouserstripes">
-        
-      </div>
-      
-      
-      $endif$
-      <div id="topic"></div>
-      <div id="dumplist">
 
-        $if(user_nick)$
-        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> - <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$	
-        $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
-        $endif$
-      </div>
-      
-      
+   
+   
+
       
       $if(user_nick)$
-      <div id="logout7" class="white">   
-        <div align="center">
+
+      <div id="logout7"class="white">   
           <form id="logout" action="/logout" method="POST">
 	    <a href="#" onclick="jQuery('#logout').submit(); return false">Logout</a>
           </form>
-        </div>
       </div>    
+      
       $else$
-      <div id="toplogin" class="white">
+      <div id="toplogin">
         $form_login()$
       </div>
+      
       $endif$
 
 
-      <div id="inpage-search-results" style="background-color: white;">
+</div>
+  <div id="inpage-search-results" >
         <div id="search-controls">
           <span id="search-message"></span>
           <a id="search-control-close" href="javascript:Search.close()">close</a>
@@ -119,6 +98,3 @@
         <div id="search-results-images"></div>
       </div>
     </div>
-    <div align="center"><br /></div>
-  </div>
-</div>