sostler prod commit

13 files changed, 238 insertions, 41 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index 71fed17..706dbd3 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -1859,4 +1859,31 @@ border:1px solid black;
 #dashavatarPic img{
 max-height:70px;
 max-width:150px;
+}
+.dash-dump {
+    background-color:#f0f9ff;
+    text-overflow: ellipsis-word;
+    padding: 18px 18px 6px 18px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    text-transform: uppercase;
+    margin-left:3px;
+    line-height:15px;
+    z-index:4;
+    line-height:20px;
+    text-align: left;
+}
+
+.dash-dump {
+background-color:white;
+padding:0px;
+display:inline-block;
+
+}
+.dash-dump img{
+background-color:white;
+padding:1px;
+}
+.profiledash{
+overflow:auto;
 }
\ No newline at end of file
diff --git a/static/css/index.css b/static/css/index.css
index 5ab6076..b0c3ae3 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -68,12 +68,12 @@ body {
 display:none;
 }
 #rapper{
-margin-top:6%;
+margin-top:2%;
 }
 #content{
-	background:url(/static/img/cloudbg.png);
+	background:url(http://dump.fm/images/20100622/1277257188414-dumpfm-ryder-cloudsslower.gif);
 background-position:top center;
-	background-repeat:no-repeat;
+	background-repeat:repeat-x;
 }
 #preload {
   position: absolute;
@@ -116,14 +116,14 @@ width:150;
 #main {
 	width:460px;
 	margin: 0 auto 0 auto;
-  padding: 19px 0;
+background-color:white;
 z-index:2;
 	position: relative;
-  -webkit-border-radius: 15px;
-	-moz-border-radius: 15px;
-	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
-  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
-  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+border:1px solid black;
+padding-bottom:15px;
+	box-shadow: 0 0 10px #000;
+  -webkit-box-shadow: 0 0 10px #000;
+  -moz-box-shadow: 0 0 10px #000;
 }
 }
 .menu2 li {
@@ -319,8 +319,8 @@ margin-bottom:7px;
 #remember a{text-decoration:none;font-size:11px;display:block;z-index:30;}
 #furie3 {
   position: absolute;
-  left:294px;
-  margin-top:250px;
+  left:298px;
+  margin-top:295px;
   z-index: 10;
 
 }
diff --git a/static/img/dumppixellarge3.png b/static/img/dumppixellarge3.png
new file mode 100644
index 0000000..c701a29
--- /dev/null
+++ b/static/img/dumppixellarge3.png
diff --git a/static/img/lilflagr.png b/static/img/lilflagr.png
new file mode 100644
index 0000000..d4ca82e
--- /dev/null
+++ b/static/img/lilflagr.png
diff --git a/static/index.html b/static/index.html
index acbcb2a..c8301b2 100644
--- a/static/index.html
+++ b/static/index.html
@@ -38,8 +38,6 @@ jQuery(window).load(function() {
 <style>
 
 
-
-
 body{margin:0px;
 background-color:#fff;
 	font-family:Arial, Helvetica, sans-serif;	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
@@ -109,21 +107,21 @@ background-image:url(/static/img/ylgrad.png);
 #previewdump{
 background-color:#fff;
 padding:5px;
-padding-left:15px;
-padding-right:15px;
-font-size:16px;
-border:1px solid #ccc;
+padding-left:10px;
+padding-right:10px;
+padding-bottom:9px;
+font-size:13px;
+border:2px solid #ccc;
 margin-top:-300px;
 z-index:5;
 float:right;
-margin-right:-210px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
+margin-right:-45px;
+line-height:8px;
 background-image:url(/static/img/grgrad.png);
+display:none;
+}
+#previewdump a:link{
+color:black;
 }
 #previewdump a:hover{
 color:#000000;
@@ -212,6 +210,22 @@ margin-left:-13px;text-decoration:none;
 #lilflag a:link {
 text-decoration:none;
 }
+#lilflagr{
+background-image:url(/static/img/lilflagr.png);
+width: 193px; height: 59px;
+top:15px;
+padding-right:20px;
+position:absolute;
+color:#fff;
+padding-top:1px;
+text-align:right;
+word-spacing:8px;padding-right:10px;
+font-size:19px;
+margin-left:610px;text-decoration:none;
+}
+#lilflagr a:link {
+text-decoration:none;
+}
 #footer{
 padding-bottom:5px;
 padding-top:15px;
@@ -256,9 +270,6 @@ padding:5px;
 		ul.pagination li { float:left; margin:0 5px;display:none; }	
 		ul.pagination a { display:block; width:12px; padding-top:12px; height:0; overflow:hidden; background-image:url(/static/img/pagination.png); background-position:0 0; background-repeat:no-repeat;}
 
-
-
-
 </style>
 </head>
 <body>
@@ -266,10 +277,14 @@ padding:5px;
 <div id="rapper">
 <div id="toplogo">
 <img src="/static/img/dumppixellarge.png">
-<a href="http://dump.fm/chat/slothgoth">
+<a href="http://dump.fm/m/slothgoth">
 <div id="lilflag">
 HOME OF THE SLOTHGOTH!!!!!
 </div></a>
+<a href="http://dump.fm/m/dealwithit">
+<div id="lilflagr">
+HOME OF DEAL WITH IT!!!!!
+</div></a>
 </div>
 
 <div id="bottomcontainer">
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 1f64c20..5f66ee2 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -530,11 +530,10 @@ function initProfile() {
     $('#edit-toggle').click(enableProfileEdit);
     activateProfileEditable();
 
-    $('.logged-dump .content').each(function() {
+    $('.dash-dump .content').each(function() {
         var t = $(this);
         t.html(buildMsgContent(t.text()));
     });
-    initLogThumb()
 };
 
 function initLog() {
@@ -545,8 +544,6 @@ function initLog() {
     initLogThumb();
 }
 
-
-
 // jesus this logic is ugly
 function initLogThumb(){
   $(".logged-dump .thumb").bind('mouseover mouseout', 
diff --git a/static/register.html b/static/register.html
index b6730a5..a39610a 100644
--- a/static/register.html
+++ b/static/register.html
@@ -1,13 +1,15 @@
 <html><head>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/js/underscore-min.js"></script>
     <script type="text/javascript" src="/static/js/register.js"></script>
     <script>
       $(document).ready(initRegister);
     </script>           
     <link rel="stylesheet" type="text/css" href="static/css/index.css">  
-    <link rel="shortcut icon" href="static/favicon.ico">
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+        <link rel="shortcut icon" href="static/favicon.ico">
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
     <META NAME="description" CONTENT="Talk with pictures!">
     <title>dump.fm - register</title></head>
@@ -22,7 +24,7 @@
       <img src="/static/img/furie3.png" id="furie3" />
    <div id="passwordreset">
     <div id="logo-and-text">
-      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
+      <a href="/"><img src="/static/img/dumppixellarge3.png"></a>
         <div align="center">
         <label style="text-align:left;margin-bottom:-8px;">username</label>
           <input type="text" class="field"id="nickInput" />
diff --git a/template/dash_dump.st b/template/dash_dump.st
new file mode 100644
index 0000000..5722eef
--- /dev/null
+++ b/template/dash_dump.st
@@ -0,0 +1,9 @@
+$if(dump.ztags)$
+  <div class="dash-dump dump" id="message-$dump.message_id$" nick="$dump.nick$" tags="$dump.tags: { tag | $tag.nick$:$tag.tag$ }$">
+$else$
+  <div class="dash-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
+$endif$
+
+<div class="content">$dump.content$</div>
+
+</div>
\ No newline at end of file
diff --git a/template/dealwithit.st b/template/dealwithit.st
new file mode 100644
index 0000000..903ad71
--- /dev/null
+++ b/template/dealwithit.st
@@ -0,0 +1,143 @@
+<html>
+  <head>
+    
+    <title>dump.fm - deal with it</title>
+  
+    <style>
+
+
+
+
+    body{margin:0px;
+background-color:#fff;
+	font-family:Arial, Helvetica, sans-serif;	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+}
+    .memes{overflow:auto;}
+#rapper{
+background-color:#f2f9fe;
+width:800px;
+	margin: 0 auto 0 auto;
+background-position:top center;
+background-image:url(/static/img/blue2fade.png);
+	background-repeat:repeat-x;
+	box-shadow: 0 0 10px #000;
+  -webkit-box-shadow: 0 0 10px #000;
+  -moz-box-shadow: 0 0 10px #000;
+}
+    
+  #rapper img{
+max-width:750px;
+padding:10px;
+
+}  
+#footer{
+padding-bottom:5px;
+padding-top:15px;
+text-align: center;
+color:#000;
+font-size:11px;
+word-spacing:30px;
+	margin: 0 auto 0 auto;
+background-color:#eff5fb;
+margin-top:250px;
+width:798px;
+}
+#infotxt{
+font-family: 'courier new', typewriter, matrix, monospace; 
+line-height:15px;
+background-image:url(/static/img/bg.dither.gif);
+width:130px;
+padding:10px;
+position:fixed;
+top:0px;
+left:0px;
+font-size:12px;
+    border-bottom-right-radius:10px;
+    -webkit-border-bottom-right-radius:10px;
+    -moz-border-radius-bottomright:10px;
+text-align:right;
+	box-shadow: 0 0 4px #000;
+  -webkit-box-shadow: 0 0 4px #000;
+  -moz-box-shadow: 0 0 4px #000;
+margin:-1;
+}
+.together{display:block;}
+  .together img{
+width:230px;display:inline-block;
+}  
+.returnlink{
+text-decoration:none;
+	font-family: Arial, Helvetica, sans-serif;
+	color:#f0e;
+}
+    .returnlink a:hover{
+text-decoration:none;
+	font-family: Arial, Helvetica, sans-serif;
+	color:blue;
+}
+
+    
+    </style>
+  </head>
+  <body class="memes">
+<div id="infotxt">deal with it on dump.fm<br><br>A Collection of images that 'deal with it' by users of dump.fm. <br><br><a href="http://dump.fm/static/templates/dealwithittemplate.psd">Click Here</a> to download the deal with it photoshop template.<br><br><a href="http://dump.fm" class="returnlink"> Return Home</a><br></div>
+      <div id="rapper"><center>
+       <img src="http://dump.fm/images/20100622/1277238939818-dumpfm-ryder-dealwithitbanner.gif" class="slothbanner"><br>
+        <img src="http://dump.fm/images/20100601/1275432708585-dumpfm-noisia-teal-with-it.gif"><br>
+                <img src="http://dump.fm/images/20100601/1275428903719-dumpfm-noisia-deal-with-it-misplaced.gif"><br>
+                        <img src="http://dump.fm/images/20100604/1275637155979-dumpfm-ryder-1275428499992-dumpfm-noisia-deal-with-it-pondercat.gif"><br>
+                                <img src="http://dump.fm/images/20100602/1275501379140-dumpfm-noisia-deal-with-it-twins.gif"><br>
+                      
+                                               
+             
+                                                <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/20100601/1275428310383-dumpfm-noisia-deal-with-incarceration.gif"><br>
+ <img src="http://dump.fm/images/20100601/1275385439990-dumpfm-erikhaspresence-dealwithittemplate-google.gif"><br>
+ <img src="http://dump.fm/images/20100617/1276756183534-dumpfm-colc-1275934400042-dumpfm-ryder-dealwithitcry.gif"><br>
+ <img src="http://dump.fm/images/20100606/1275854322682-dumpfm-scotty2hotty69-jnetdealwithitt.gif"><br>
+       <img src="http://dump.fm/images/20100620/1277026084924-dumpfm-arielrebel-ikaridwi.gif"><br>
+              <img src="http://dump.fm/images/20100607/1275928234484-dumpfm-ryder-bpdealwithit.gif"><br>
+                         <img src="http://dump.fm/images/20100601/1275427538422-dumpfm-ryder-glassdealwithit.gif"><br>
+                  <img src="http://dump.fm/images/20100611/1276233518431-dumpfm-glasspopcorn-icedealwithit.gif"><br>
+                             <img src="http://dump.fm/images/20100601/1275383600094-dumpfm-ryder-dealwithitsloth.gif"><br>
+                
+               <img src="http://dump.fm/images/20100607/1275890489193-dumpfm-jertronic-dwiguyhai.gif"><br>
+                     <img src="http://dump.fm/images/20100604/1275685658733-dumpfm-mwilliamson-dealwithit.gif"><br>
+               <img src="http://dump.fm/images/20100604/1275637189390-dumpfm-ryder-1275384582055-dumpfm-ryder-dealwithitfat.gif"><br>
+               <img src="http://dump.fm/images/20100601/1275427155764-dumpfm-ryder-dealwithitd.gif"><br>
+               <img src="http://dump.fm/images/20100601/1275384668045-dumpfm-ryder-dealwithitabomb.gif"><br>
+               <img src="http://dump.fm/images/20100602/1275514162391-dumpfm-CelineDion-deadbabydealwithit.gif"><br>
+ <img src="http://dump.fm/images/20100601/1275383910833-dumpfm-ryder-idgidealwithit.gif"><br>
+ <img src="http://dump.fm/images/20100601/1275429723422-dumpfm-ryder-dealwithitbug.gif"><br>
+  <img src="http://dump.fm/images/20100601/1275384816608-dumpfm-erikhaspresence-dealwithittemplate.gif"><br>
+   <img src="http://dump.fm/images/20100601/1275386468425-dumpfm-ryder-paypaldealwithit.gif"><br>
+    <img src="http://dump.fm/images/20100411/1271039975904-dumpfm-stultissimus-dealwithityoshi.gif"><br>
+     <img src="http://dump.fm/images/20100601/1275386117129-dumpfm-ryder-brokebackdealwithit.gif"><br>
+     <img src="http://dump.fm/images/20100601/1275384933233-dumpfm-erikhaspresence-dealwithittemplate-eggplant.gif"><br>
+      <img src="http://dump.fm/images/20100619/1276929730052-dumpfm-jertronic-modemDWI.gif"><br>
+                  <img src="http://dump.fm/images/20100601/1275431434247-dumpfm-noisia-pauline-kael-with-it.gif"><br>
+        <img src="http://dump.fm/images/20100620/1277091350600-dumpfm-soupykatz-tealwithitjerry.gif"><br>
+         <img src="http://dump.fm/images/20100611/1276277188144-dumpfm-ryder-deawithit.gif"><br>
+
+
+            <img src="http://dump.fm/images/20100606/1275803751624-dumpfm-ryder-eelwithit.gif"><br>
+                        <img src="http://dump.fm/images/20100606/1275803228991-dumpfm-ryder-NEILWITHIT.gif"><br>
+             <img src="http://dump.fm/images/20100601/1275429882637-dumpfm-ryder-ALLYBEALWITHIT.gif"><br>
+              <img src="http://dump.fm/images/20100604/1275631983360-dumpfm-ryder-SEALWITHIT.gif"><br>
+
+                <img src="http://dump.fm/images/20100601/1275384806531-dumpfm-ryder-wtcdealewithit.gif"><br>
+        
+                 
+
+
+</center>
+          </div>
+        <div id="footer" style="display:none;">
+            $footer()$
+
+        </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/template/preload.st b/template/preload.st
index 8ade411..1495ace 100644
--- a/template/preload.st
+++ b/template/preload.st
@@ -5,5 +5,7 @@
    <img src="/static/img/fade-blue.png" class="invisible" />
    <img src="/static/img/dumppixellarge.png" class="invisible" />
       <img src="/static/img/dumppixel.png" class="invisible" />
+       <img src="/static/img/zoom.gif" class="invisible" />
+         <img src="/static/img/thumbs/heartcolorshift.gif" class="invisible" />
          <img src="/static/img/dumppixelhover.png" class="invisible" />
 </div>
\ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index ea554ab..8c9b8f1 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -9,7 +9,7 @@
       jQuery(document).ready(initProfile);
     </script> 
   </head>
-  <body>
+  <body class="profiledash">
     $if(avatar)$
     <div id="dashtotal"style="background-image:url($avatar$);opacity:0.1;width:100%;height:100%;z-index:-1"></div>
     $else$
@@ -74,9 +74,11 @@
 	<hr>
 	<h3>$if(score_ent)$ $score$ $else$ 0 $endif$ of $if(is_home)$ your $else$ $nick$'s$endif$ dumps Faved</h3>
       </div>
-      <div id="dashpix">
-	<div id="favstxt">$nick$'s most recent favs</div>
-	$dumps: { d | $log_dump(dump=d)$ }$
+      <div id="dashpix">        $if(isadmin)$
+	<div id="favstxt">$nick$'s most recent dumps</div>
+	<div id="mostrecentdumps">
+	$dumps: { d | $dash_dump(dump=d)$ }$
+	</div>$endif$
       </div>
     </div>
 <div id="footerc">
diff --git a/template/slothgoth.st b/template/slothgoth.st
index 806d146..7bfbd5b 100644
--- a/template/slothgoth.st
+++ b/template/slothgoth.st
@@ -96,6 +96,7 @@ text-decoration:none;
                                                                                           <img src="http://blackmoth.org/2010img/tumblrkzfjervd3w1qabtb3o1400.gif">
                                                                                     </div>      
                <img src="http://dump.fm/images/20100622/1277222345961-dumpfm-noisia-slothgoth.gif"><br>
+                              <img src="http://dump.fm/images/20100623/1277267792163-dumpfm-thekraken-untitled_neighborslothgothwink.gif"><br>
                      <img src="http://dump.fm/images/20100601/1275382464453-dumpfm-frankhats-us.jpg"><br>
                <img src="http://pizzadog.org/gifofday/gif74.gif"><br>
                <img src="http://dump.fm/images/20100604/1275660669087-dumpfm-thekraken-untitledslothwink2.gif"><br>
diff --git a/template/userlog.st b/template/userlog.st
index e393e03..5a9cc9b 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -6,7 +6,7 @@
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
     <script src="/static/js/ajaxupload.js"></script>
     <script>
-      jQuery(document).ready(initProfile);
+      jQuery(document).ready(initLog);
     </script> 
 
   </head>
@@ -30,7 +30,6 @@
 
         <div id="msgInputDiv">
 	  <div id="msginputrapper"> 
-            $mini_profile()$
             $if(prev)$
             <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
 	    $else$