sostler prod commit

3 files changed, 36 insertions, 35 deletions

diff --git a/template/banner.st b/template/banner.st
index b8e4af8..9f6a4fc 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -23,7 +23,7 @@
 	                    <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$/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>
 
diff --git a/template/banner_dis.st b/template/banner_dis.st
index 6aa0111..5395dc4 100644
--- a/template/banner_dis.st
+++ b/template/banner_dis.st
@@ -1,26 +1,52 @@
+<link rel="stylesheet" href="http://dismagazine.com/css/dump.css"
+      type="text/css" media="all" />
+
+
 <div id="rapper7">
   <div id="header7">
     <div id="logoicons">
-      <div id="logo7">
+      <div id="dislogo">
 	<div align="center">
 	  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 />
-	  <a class="img_roll" href="$domain$"></a>
+	<a href="http://dismagazine.com"><img src="$domain$/static/img/dis.png" class="dislogo"><a class="img_rolldis" href="$domain$"></a>
 	</div>
       </div>
-      <div class="white">
-	<div id="bar7">    
+
+	<div id="bar7dis">    
           <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> -->
               <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
+<span style="opacity:0.5"
+	<img src="$domain$/static/img/thumbs/profilebaricon.png" /> </a>           
+</span>
 
-	<img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a>           
 
+      
 
+           
+	      $else$
+	      <a href="/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="toptools">
+
+ <!--   <div id="searchboxdis">
+      <input type="text" name="search-query" id="search-query" />
+	<!--<div class="search_icon"></div>-->
+	
+	   <!--  <div id="toptoolsdis">
            <form name="Tools" >
 <select class="toolsmenu" name="menu" onChange="location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value;">
 <option>Tools</option>
@@ -40,28 +66,8 @@
 
 </select>
 </form>
-           </div>
+           </div>-->
 
-           
-	      $else$
-	      <a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</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" />
-	<!--<div class="search_icon"></div>-->
-    </div>
     $else$
     <div id="nouserstripes">
     
@@ -70,13 +76,7 @@
     
     $endif$
     <div id="topic"></div>
-    <div id="dumplist">
-$if(user_nick)$
-      talk with pictures! - <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$ 
-	<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>
-       $if(isadmin)$  -<a href="http://vip.dump.fm/">  NAUGHTY BOYS DELIGHT </a>
-$endif$
-    </div>
+
     
     
     
diff --git a/template/head.st b/template/head.st
index a898df8..08bbd84 100644
--- a/template/head.st
+++ b/template/head.st
@@ -6,6 +6,7 @@
 <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="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
 $endif$