sostler prod commit

3 files changed, 47 insertions, 18 deletions

diff --git a/template/banner.st b/template/banner.st
index 9f6a4fc..5d629ca 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -81,8 +81,8 @@
     <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>
+<a href="http://dump.fm/static/sticker.html">SUPPORT DUMP.FM! BUY SOME STICKERS!!</a> $else$ Talk with pictures! $endif$ 
+	<a href="http://dis.dump.fm">- dis magazine new style options</a> 
        $if(isadmin)$  -<a href="http://vip.dump.fm/">  NAUGHTY BOYS DELIGHT </a>
 $endif$
     </div>
diff --git a/template/banner_dis.st b/template/banner_dis.st
index 5395dc4..1e075b8 100644
--- a/template/banner_dis.st
+++ b/template/banner_dis.st
@@ -1,10 +1,18 @@
-<link rel="stylesheet" href="http://dismagazine.com/css/dump.css"
-      type="text/css" media="all" />
+
+
+<style type="text/css">
+$if(!user_nick)$
+	@import url('http://dump.fm/static/css/pages.css');	@import url('http://dismagazine.com/css/dump.css?3');
+$else$
+	@import url('http://dismagazine.com/css/dump.css?3');
+	$endif$
+</style>
 
 
 <div id="rapper7">
   <div id="header7">
     <div id="logoicons">
+    
       <div id="dislogo">
 	<div align="center">
 	  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 />
@@ -18,29 +26,33 @@
               $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"
+             
+             <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
 	<img src="$domain$/static/img/thumbs/profilebaricon.png" /> </a>           
-</span>
 
 
       
 
            
 	      $else$
-	      <a href="/register" id="disregister">Register</a>
+	      <a href="http://dump.fm/static/registerdis.html" id="disregister">Register</a>
+	      
 	      $endif$     
             </div>
 	  </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="dissearchbox">
+      <input type="text" name="search-query" id="search-query" />
+	<!--<div class="search_icon"></div>-->
+    </div>
 
  <!--   <div id="searchboxdis">
       <input type="text" name="search-query" id="search-query" />
@@ -69,19 +81,15 @@
            </div>-->
 
     $else$
-    <div id="nouserstripes">
-    
-    </div>
-    
-    
+
     $endif$
-    <div id="topic"></div>
+
 
     
     
     
 $if(user_nick)$
-    <div id="logout7" class="white">   
+    <div id="dislogout7" class="white">   
       <div align="center">
 	<a href="/logout" onclick="pageTracker._trackEvent('button', 'logout'); return true;">Logout</a>
       </div>
@@ -105,4 +113,22 @@ $endif$
     </div>
     <div align="center"><br /></div>
   </div>
-</div>
\ No newline at end of file
+</div>
+$if(!user_nick)$
+
+<div id="dis_content" name="content"> 
+		<p>
+			If you already have an account, <strong><a href="http://dis.dump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://dis.dump.fm/register">register now</a></strong>.
+		</p>
+</div>
+<div id="dis_welcome">
+	<iframe src="http://dismagazine.com/html/dis-dump.html" id="dis_frame" frameborder="0"></iframe>
+</div>
+  <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" />
+  <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> 
+  <script type="text/javascript" src="/static/js/win.js"></script> 
+<script type="text/javascript">
+	var topZ = 7;
+	CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 80); 
+</script>
+$endif$
\ No newline at end of file
diff --git a/template/head.st b/template/head.st
index 08bbd84..e5b03c8 100644
--- a/template/head.st
+++ b/template/head.st
@@ -9,6 +9,9 @@
 
 $if(!user_nick)$
 <link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="$domain$/static/js/popup.js"></script>
+
+
 $endif$
 
 $if(isadmin)$