sostler prod commit

7 files changed, 76 insertions, 35 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" />