sostler prod commit

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-08-06 03:10:28 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-08-06 03:10:28 -0400
commit: 893fbe9f5c32de7ae1f60f85ae0c7c17a52fe252 (patch)
tree: d844747a62bb32208ac974ffd7129483bfdf839c
parent: e23a925411e08e31c6d53cb489ce848833b01e14 (diff)
12 files changed, 160 insertions, 44 deletions
diff --git a/static/cal.html b/static/cal.html
index 710ca2b..ee300b6 100644
--- a/static/cal.html
+++ b/static/cal.html
@@ -1,10 +1,12 @@
 <html><head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 
 <style>
 a{color:blue;text-decoration:none; font-weight:lighter;}
 a:hover{color:blue;text-decoration:none; font-weight:bold;}
 body{
+  overflow-x: hidden;
 	font-family: Helvetica, sans-serif;margin:5px;
 	background-color:#f0f9ff;
 	background-image:url(/static/img/fade-blue.png)!important;
@@ -24,6 +26,39 @@ background-attachment:fixed;
 
 
 </style>
+<script>
+function randExplosionGif(){
+  var numImages = 3
+  return "http://dump.fm/static/img/explosions/" + (Math.floor(Math.random() * numImages)) + ".gif"
+}
+
+function positionExplosion(id){
+  var h = $($("table")[0]).height()
+  var w = $(window).width()
+  Explosions[id].style.top = (Math.floor(Math.random() * h)) + "px"
+  Explosions[id].style.left = (Math.floor(Math.random() * w)) + "px"
+}
+
+function initExplosions(){
+  var numExplosions = 10
+  Explosions = [];
+  for (var i=0; i<numExplosions; i++) {
+    Explosions[i] = new Image();
+    Explosions[i].src = randExplosionGif()
+    Explosions[i].style.position = "absolute"
+    Explosions[i].style.pointerEvents = "none"
+    positionExplosion(i)
+    $("body").append(Explosions[i])
+  }
+  setTimeout(cycleExplosions, 250)
+}
+function cycleExplosions(){
+  var index = Math.floor(Math.random() * Explosions.length)
+  positionExplosion(index)
+  setTimeout(cycleExplosions, 250)
+}
+
+</script>
 
 </head><body onload='window.focus();'>
 <TABLE width="100%" border=1 bordercolordark="#000000" bordercolorlight="#FFFFFF" cellpadding="5">
@@ -107,15 +142,14 @@ CYBER PUNK/RAVER RELATED IMAGES FOR THE <A target="_blank" href="http://www.face
 <BR><A target="_blank" href="http://dump.fm/m/doublerainbow">VIEW RESULTS!!</A>
 <br></TD>
 
-<TD vAlign=top align=left width="14%" class="doneday" ><font size="5" face="Verdana">15</font><br>
-<A target="_blank" href="http://www.7gadgets.com/wp-content/uploads/2007/07/17455_large.jpg">GHOSTBUSTERS SLIMER!!!</A><br>
-<BR><A target="_blank" href="http://dump.fm/m/slimer">VIEW RESULTS!!</A></TD>
-<TD vAlign=top align=left width="14%" class="doneday"><font size="5" face="Verdana">16</font><br>
+<TD vAlign=top align=left width="14%" ><font size="5" face="Verdana">15</font><br>
+<A target="_blank" href="http://www.7gadgets.com/wp-content/uploads/2007/07/17455_large.jpg">THIS FUCKING DUDE</A><br></TD>
+<TD vAlign=top align=left width="14%" ><font size="5" face="Verdana">16</font><br>
 <A target="_blank" href="http://www.atnet.it/lista/FAQ2/Samples/AccidentReconstruction/humanfalling.gif">THIS GIF</A><br></TD>
-<TD vAlign=top align=left width="14%" class="doneday" ><font size="5" face="Verdana">17</font><br>
-<br></TD>
+<TD vAlign=top align=left width="14%" ><font size="5" face="Verdana">17</font><br>
+<A target="_blank" href="http://media.gamerevolution.com/images/misc/image/jnco_pants.jpg">HEAT WAVE ON DUMP.FM!</A><br></TD>
 </tr><tr>
-<TD vAlign=top align=left width="14%"class="doneday" ><font size="5" face="Verdana">18</font><br>
+<TD vAlign=top align=left width="14%" ><font size="5" face="Verdana">18</font><br>
 <A target="_blank" href="http://i35.photobucket.com/albums/d153/luckykachunk/HEALTH%20TATTOOS/DEATHTATT.jpg">DEATH+</A><br>TEXT MEME<br></TD>
 <TD vAlign=top align=left width="14%" ><font size="5" face="Verdana">19</font><br>
 STUFF WITH THE <A target="_blank" href="http://dump.fm/images/20100629/1277836809689-dumpfm-ryder-tmz_template.png"> TMZ TEMPLATE</A><A target="_blank" href="http://dump.fm/images/20100526/1274894770429-dumpfm-ryder-tmzzzz.gif"><br>EXAMPLE HERE</A><br></TD>
@@ -148,4 +182,5 @@ DO <a target="_blank" href="http://dump.fm/images/20100510/1273518675736-dumpfm-
 <A target="_blank" href="http://i704.photobucket.com/albums/ww48/srikanthck/cam.gif">MAGIC ASS GIFS</A><br></TD>
 </tr><tr>
 </TR></TBODY></TABLE><br>
+<script>initExplosions()</script>
 </body></html>
 \ No newline at end of file
diff --git a/static/css/dis.css b/static/css/dis.css
new file mode 100644
index 0000000..97b3f4a
--- /dev/null
+++ b/static/css/dis.css
@@ -0,0 +1,16 @@
+#header7{
+	margin: 0px auto -1px auto;
+
+height:49px;
+	position:fixed;
+background-position:bottom;
+background-color:#000;
+
+width:100%;
+min-width:600px;
+left:-1px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+
+}
+\ No newline at end of file
diff --git a/static/css/dis.dump.fm.css b/static/css/dis.dump.fm.css
new file mode 100644
index 0000000..97b3f4a
--- /dev/null
+++ b/static/css/dis.dump.fm.css
@@ -0,0 +1,16 @@
+#header7{
+	margin: 0px auto -1px auto;
+
+height:49px;
+	position:fixed;
+background-position:bottom;
+background-color:#000;
+
+width:100%;
+min-width:600px;
+left:-1px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+
+}
+\ No newline at end of file
diff --git a/static/css/dump.css b/static/css/dump.css
index adee317..d906805 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -71,6 +71,18 @@ a.img_roll:hover{
 	display:block;
 	background-image:url(http://dump.fm/static/img/dumppixelhover.png);
 }
+a.img_rolldis:link, .img_rolldis{
+	width:130px;
+	height:46px;
+	display:inline-block;
+	background-image:url(http://dump.fm/static/img/dumppixel.png);
+}
+a.img_rolldis:hover{
+	width:130px;
+	height:46px;
+	display:inline-block;
+	background-image:url(http://dump.fm/static/img/dumppixelhover.png);
+}
 
 #userlist a{
 color:000;
@@ -143,7 +155,19 @@ line-height:1.9;
 	margin-right: 8%;
 	letter-spacing:.2px;
 }
+#bar7dis{
+	top:19px;
+	position:absolute;
+	word-spacing:-1;
+	font-size: 16px;
+height:22;
+text-indent:14px;
+line-height:1.9;
 
+	margin-left: 0.1%;
+	margin-right: 8%;
+	letter-spacing:.2px;
+}
 #bar7 img{
 margin-top:4;
   vertical-align: top;
@@ -1137,7 +1161,7 @@ background-color:#f3f3f3;
 	-moz-border-radius-bottomright:5px;
 }  
 #userList img{
-display:none;
+
     max-width:30px;
     width: expression(this.width > 30 ? 30: true);
     max-height:30px;
@@ -2032,4 +2056,28 @@ background-color:#fff;
 .faver-list{
 max-width:80%;
 font-size:20px;font-weight:bold;word-spacing:-3px;
-}
-\ No newline at end of file
+}
+
+/*DIS STUFF*/
+#searchboxdis{position:absolute;left:10px;display:inline-block;top:15px;}
+#toptoolsdis{position:absolute;left:155px;display:inline-block;top:2px;}
+#disregister{ 
+
+left:8;
+color:#fff;
+	position: absolute;
+top:-14;	
+filter:alpha(opacity=90);
+	-moz-opacity:0.9;
+	-khtml-opacity: 0.9;
+	opacity: 0.9;color:#000;
+font-size:15px;
+	padding:0px 5px 0px 0px;
+	text-decoration:none;
+	background-color:#fff;
+
+}
+#disregister a:link, a:visited {
+	color:#000;
+	text-decoration:none;
+}
diff --git a/static/img/dis.png b/static/img/dis.png
new file mode 100644
index 0000000..37ff361
--- /dev/null
+++ b/static/img/dis.png
diff --git a/static/img/explosions/0.gif b/static/img/explosions/0.gif
new file mode 100644
index 0000000..3eb64dc
--- /dev/null
+++ b/static/img/explosions/0.gif
diff --git a/static/img/explosions/1.gif b/static/img/explosions/1.gif
new file mode 100644
index 0000000..d914f21
--- /dev/null
+++ b/static/img/explosions/1.gif
diff --git a/static/img/explosions/2.gif b/static/img/explosions/2.gif
new file mode 100644
index 0000000..532861a
--- /dev/null
+++ b/static/img/explosions/2.gif
diff --git a/static/img/thumbs/stripes.gif b/static/img/thumbs/stripes.gif
index d1be3bd..0d7f6fa 100644
--- a/static/img/thumbs/stripes.gif
+++ b/static/img/thumbs/stripes.gif
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$
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-08-06 03:10:28 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-08-06 03:10:28 -0400
commit	893fbe9f5c32de7ae1f60f85ae0c7c17a52fe252 (patch)
tree	d844747a62bb32208ac974ffd7129483bfdf839c
parent	e23a925411e08e31c6d53cb489ce848833b01e14 (diff)