sostler prod commit

4 files changed, 243 insertions, 116 deletions

diff --git a/template/banner.st b/template/banner.st
index 02759c5..791ef74 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -65,7 +65,7 @@ $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://vip.dump.fm/">  VIP PIMP DEN (NO GIRLS ALLOWED) </a>
+        -<a href="http://vip.dump.fm/">  VIP PIMP DEN (<del>GIRLS</del> BOYS ARE COOL) </a>
               $endif$
       </div>
 $if(user_nick)$
diff --git a/template/chat.st b/template/chat.st
index 9d0ae6c..77e5e86 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -21,6 +21,7 @@ $head()$
 
 <META name="keywords" content="credit, mortgage, dating, hot girls, hot guys, debt solutions, get rich quick"> 
   <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css">
+  <script type="text/javascript" src="http://dump.fm/static/js/invalid_domains.js"></script>
   <script type="text/javascript" src="http://dump.fm/static/webcam/webcam.js"></script>
   <script type="text/javascript" src="http://dump.fm/static/js/ajaxupload.js"></script>
 $if(user_nick)$
diff --git a/template/nigga.st b/template/nigga.st
index 76bb18c..68c85eb 100644
--- a/template/nigga.st
+++ b/template/nigga.st
@@ -14,51 +14,175 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+#dashadminmute{
+position:absolute;
+top:0px;
+background-color:red;
+padding:5px;
+right:0px;
+	border-bottom-left-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+}
+#dashadminmute a{color:white;}
+#edit-toggle{
+position:absolute;
+width:80px;
+top:-10px;
+left:-5px;
+}
+
 #dashrapper{
-border:1px solid black;
+border:1px dotted #0c8fff;
 top:80px;
-padding:50px;
-height:800px;
+padding:20px;
+margin-left:100px;
+	border-bottom-left-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+margin-right:50%;
+background-color:white;
 width:800px;
+min-height:435px;
 position:absolute;
-margin-left:10%;
 }
 #dashuserlist{
+padding:15px;
 border:1px solid black;
-width:200px;
-height:400px;
+width:180px;
+min-height:400px;
+	border-radius:5px;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
+}
+
+#dashuserlist h2{
+font-size:25px;
+padding-top:25px;
+text-transform:capitalize;
+}
+#dashuserlist h3{
+font-size:18px;
+padding-bottom:15px;
+padding-top:1px;
+text-transform:capitalize;
+}
+#middash{
+top:60px;
+position:absolute;
+margin-left:230px;
+}
+#middash h2{
+font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; 
+font-size:50px;
+letter-spacing:-2px;
+margin-bottom:10px;
+
+}
+#middash h3{
+font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; 
+font-size:35px;
+letter-spacing:-2px;
+line-height:20px;
+}
+#middash h2{
+font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; 
+font-size:50px;
+letter-spacing:-2px;
+
+}
+#middash a{
+font-size:100%;
+}
+#middash a:hover{
+color:#f9f9f9;background-color:white;
+font-size:100%;
+text-shadow: -2px 2px 10px #000;
+}
+#dashinfo{
+margin-top:50px;
+
+}
+#dashavatar{
+
+}
+
+#dashpix{
+top:0px;
+float:right;
+
+padding:15px;
+margin-top:-150px;
+width:550px;
+
+}
+#dashpix img{
+    width: expression(this.width > 50 ? 50: true);
+    max-height:100px;
+    height: expression(this.width > 50 ? 50: true);
+    max-width:150px;
+}
+
+
+#favstxt{
+margin-top:-55px;
+margin-left:-10;
+font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; 
+font-size:11px;
+background-color:white;
+padding:7px;
+color:#000;
+position:absolute;
+text-transform:uppercase;
+border:1px solid black;
+	border-radius: 5px;
+	box-shadow:5px 5px 5px #d8dbde;
+  -webkit-box-shadow:5px 5px 5px #d8dbde;
+  -moz-box-shadow:5px 5px 5px #d8dbde;
+	border-radius:5px;
+	-webkit-border-radius:5px;
+	-moz-border-radius:5px;
 }
 
 </style>
 
   </head>
   <body>
+  <div id="dashtotal"style="background-image:url($avatar$);opacity:0.1;width:100%;height:100%;z-index:-1"></div>
     $banner()$
-      <div id="content">
+
 
   
         <div id="dashrapper">
-          <div id="dashuserlist"><br>    $if(is_home)$<br>$endif$  
-
+        
+        
+          <div id="dashuserlist">
                     $if(avatar)$
-                    <div id="dashavatar">
+                    <div id="dashavatar" style="background-image:url($avatar$);height:100px;width:100%">
                <img id="avatarPic" src="$avatar$"/>
-                $else$<br><br>
+                $else$<br>
               <img id="avatarPic" src="/static/img/noinfo.png">
+                        </div>
               $endif$
-          </div>
-                         <h2>  
-               $nick$              
-               
-               <br>
-              $if(score_ent)$
-              <h8>
-              fav score: $score$ 
-              <h9>$score_ent$</h9>
-			  $endif$</h8>
-              $if(isadmin)$<br><br>
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+     
+     
+    
+              $if(isadmin)$
+               <div id="dashadminmute">
+              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a>
               </div>
               $endif$
 
@@ -72,42 +196,61 @@ height:400px;
                 <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
               </div>
               $endif$
-              
+              <div id="dashinfo">
+              <h2>  
+               $nick$$if(score_ent)$$score_ent$$endif$ </h2>           
+               
 	     <br> <h3>contact info</h3>
               $if(contact)$
-	      <br><div id="contact" class="linkify">$contact$</div>
+	    <div id="contact" class="linkify">$contact$</div>
 	      
 	      $else$
 	    <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
 	    
 	      $endif$            
-	  
-	      <br><br><h3>bio</h3>
+	  <br>
+	      <h3>bio</h3>
               $if(bio)$
-	    <br> <div id="bio" class="linkify">$bio$</div>
+	     <div id="bio" class="linkify">$bio$</div>
 	      $else$
 	      
 	     <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
 	      $endif$
 
-       
+</div>
     
 
               $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div><br><br>
-              $endif$
-
-              <br>
               
-         <a href="http://dump.fm/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-</div></div>
+              <div id="edit-toggle"><a href="#">edit profile</a></div></div>
+              $endif$   
+</div>
 	    
+	    <div id="middash">
+	  
 	    
- 
+ 	    <h2><a href="http://dump.fm/$nick$">$dump_cnt$ dumps &#10145;</a></h2>
+	    <hr>
+	   
+
       
+		</h8>
+	      <h2><a href="http://dump.fm/$nick$/favorites">$dumps_user_faved_cnt$ dumps Faved &#10145;</a></h2>
+	    <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>
+	<img src="http://www.poppindots.com/Images/Quote_Glitter_Graphics/images/quote11.gif">
+	<img src="http://polisat.com/Images/MotherEarthFlatNoMore-Gif-At377x480.gif">
+	<img src="http://www.leconcombre.com/gifgallery/cuke/image/oiseaubleu1.gif">
+	<img src="http://dump.fm/images/20100618/1276900577123-dumpfm-saywhaaa-webcam.jpg">
+	</div>
+	</div>    
+</div></div></div>
   <div id="footerc">
               $footer()$
+              </div>
 
   </body>
 </html>
diff --git a/template/profile.st b/template/profile.st
index 547772e..1abee8e 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -8,38 +8,37 @@
     <script>
       jQuery(document).ready(initProfile);
     </script> 
-
   </head>
   <body>
+                 $if(avatar)$
+  <div id="dashtotal"style="background-image:url($avatar$);opacity:0.1;width:100%;height:100%;z-index:-1"></div>
+  $else$
+    <div id="dashtotal"style="background-image:url(http://dump.fm/static/img/thumbs/stripes.gif);width:100%;height:100%;z-index:-1"></div>
+    $endif$
+    
     $banner()$
-      <div id="dcontent">
-        <div id="messagetabs"></div>
-        <div id="rapper">
-        </div>
   
-        <div id="messagePanep">
-          <div id="userListp"><br>    $if(is_home)$<br>$endif$  
-               <h2>  
+        <div id="dashrapper">
+          <div id="dashuserlist">
                     $if(avatar)$
-               <img id="avatarPic" src="$avatar$"/>
-                $else$<br><br>
+                    <div id="dashavatar">
+               <img id="dashavatarPic" src="$avatar$"/>             </div>
+                $else$
               <img id="avatarPic" src="/static/img/noinfo.png">
+           
               $endif$
-                 
-               $nick$               </h2><br>
-              $if(score_ent)$
-              <h8>
-              fav score: $score$ 
-              <h9>$score_ent$</h9>
-			  $endif$</h8>
-              $if(isadmin)$<br><br>
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+     
+     
+    
+              $if(isadmin)$
+               <div id="dashadminmute">
+              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a>
               </div>
               $endif$
 
-               <div>dumps posted: $dump_cnt$</div>
-               <div>dumps $nick$ faved: $dumps_user_faved_cnt$</div>
+         
+        
+             
               
               $if(is_home)$
               <div id="avatar-editing" style="display: none">
@@ -47,77 +46,61 @@
                 <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
               </div>
               $endif$
-              
+              <div id="dashinfo">
+              <h2>  
+               $nick$$if(score_ent)$$score_ent$$endif$ </h2>           
+               
 	     <br> <h3>contact info</h3>
               $if(contact)$
-	      <br><div id="contact" class="linkify">$contact$</div>
+	    <div id="contact" class="linkify">$contact$</div>
+	      
 	      $else$
-	    <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
+<img src="/static/img/noinfo.png">
+	    
 	      $endif$            
-	  
-	      <br><br><h3>bio</h3>
+	  <br>
+	      <h3>bio</h3>
               $if(bio)$
-	    <br> <div id="bio" class="linkify">$bio$</div>
+	     <div id="bio" class="linkify">$bio$</div>
 	      $else$
-	     <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
+	      
+<img src="/static/img/noinfo.png">
 	      $endif$
 
-       
+</div>
     
 
               $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div><br><br>
-              $endif$
-
-              <br>
               
-         <a href="http://dump.fm/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$   
+</div>
 	    
-	          <div id="favbox" style="display: hidden"></div>
-          <div id="messageList">
-          
-            $if(dumps)$ <span class="content">
-            $dumps:{ d | $profile_dump(dump=d)$ }$
-            
-            
-
-          </span>
-         
-
-
-	    $else$
-	    no dumps
-	    $endif$
-	    </div>
+	    <div id="middash">
+	  
 	    
+ 	    <h2><a onclick="alert('Back soon! We promise.'); return false;" href="http://dump.fm/$nick$/log">$dump_cnt$ dumps &#10145;</a></h2>
+	    <hr>
+	   
 
-
-         <div id="msgInputDiv">
-    <div id="msginputrapper"> 
-                 
-             $if(prev)$
-              <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
-  $else$
-<input id="prevbutton">
- $endif$
-
-          $if(next)$
-                       <a href="/$nick$/$next$">  <input id="nextbutton" value="Next ->"></a>
-     $else$
-     <input id="nextbutton" value="nomodumps">
-     $endif$
-     
-
-              </div>
+      
+		</h8>
+	      <h2><a href="http://dump.fm/$nick$/favorites">$dumps_user_faved_cnt$ dumps Faved &#10145;</a></h2>
+	    <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" style="display:none;">
+	<div id="favstxt">$nick$'s most recent favs</div>
+	<img src="http://www.poppindots.com/Images/Quote_Glitter_Graphics/images/quote11.gif">
+	<img src="http://polisat.com/Images/MotherEarthFlatNoMore-Gif-At377x480.gif">
+	<img src="http://www.leconcombre.com/gifgallery/cuke/image/oiseaubleu1.gif">
+	<img src="http://dump.fm/images/20100618/1276900577123-dumpfm-saywhaaa-webcam.jpg">
+	</div>
+	</div>    
+</div></div></div>
   <div id="footerc">
               $footer()$
-            </div>
-          </div>
-    </div></div></div>
+              </div>
+
   </body>
 </html>