From 02a283dd0071d090fd712c92ca88c5f3af2908a3 Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Sun, 31 Jan 2010 19:24:15 -0500
Subject: Added registration codes

---
 static/js/register.js | 12 ++++++++++--
 static/register.html  |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'static')

diff --git a/static/js/register.js b/static/js/register.js
index d8f9b6a..a2954e5 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -4,12 +4,19 @@ function validateNick(n) {
     }
 }
 
+// HOPE NO HACKERS ARE READING THIS :o
+var ValidCodes = ['WAXWANYE23',
+		    'HOTDUMPING5000'];
+
 function submitRegistration() {
     var nick = $('#nickInput').val();
     var email = $('#emailInput').val();
     var password = $('#passwordInput').val() || "";
-    var hash = hex_sha1(nick + '$' + password + '$dumpfm');
-
+    var code = $('#codeInput').val();
+    if ($.inArray(code.toUpperCase(), ValidCodes) == -1) {
+	alert("Bad registration code! Better ask someone cool for one." );
+	return;
+    }
     if (nick.length < 3) {
 	alert("Nicks must be at least 3 characters long.");
 	return;
@@ -18,6 +25,7 @@ function submitRegistration() {
 	return;
     }
 
+    var hash = hex_sha1(nick + '$' + password + '$dumpfm');
     var onSuccess = function() {
         location.href = "/";
     };
diff --git a/static/register.html b/static/register.html
index 3cddffa..b398b6f 100755
--- a/static/register.html
+++ b/static/register.html
@@ -224,6 +224,11 @@ body {
         <h1><span>email</span>
           <input type="text" class="feild"id="emailInput" />
         </h1>
+
+	 <h1><span>registration code</span>
+          <input type="text" class="feild" id="codeInput" />
+        </h1>
+
         <h1>&nbsp;</h1>
         <h1>          <br />
           
-- 
cgit v1.2.3-70-g09d2


From 9c2fbfedc1cf55825ce4e496b907f5eea2ee57d8 Mon Sep 17 00:00:00 2001
From: timb <timb@mb.local>
Date: Mon, 1 Feb 2010 12:08:53 -0800
Subject: lavalamp effect

---
 static/header.css  | 62 +++++++++++++++++++-----------------------------------
 static/pichat.css  |  2 +-
 template/banner.st | 14 ++++++------
 template/head.st   |  2 +-
 4 files changed, 30 insertions(+), 50 deletions(-)

(limited to 'static')

diff --git a/static/header.css b/static/header.css
index ab864f0..3697d3d 100755
--- a/static/header.css
+++ b/static/header.css
@@ -19,7 +19,7 @@ margin-right:80%;
 .white a:hover {
 	text-decoration: none;
 	text-shadow: 1px 1px 1px #ccc;
-		background-image:url(/static/dblue2.png);
+		zbackground-image:url(/static/dblue2.png);
 	
 	color: #fff;
 }
@@ -143,44 +143,7 @@ margin-left:9%;
 top:-14;
 z-index:3;
 }
-/* Styles for the entire LavaLamp menu */
-.lavaLamp {
-    position: relative;
-    height: 29px; width: 421px;
-    background: url("/static/red.gif") no-repeat top;
-    padding: 15px; margin: 10px 0;
-    overflow: hidden;
-}
-    /* Force the list to flow horizontally */
-    .lavaLamp li {
-        float: left;
-        list-style: none;
-    }
-        /* Represents the background of the highlighted menu-item. */
-        .lavaLamp li.back {
-            background: url("../image/lava.gif") no-repeat right -30px;
-            width: 9px; height: 30px;
-            z-index: 8;
-            position: absolute;
-        }
-            .lavaLamp li.back .left {
-                background: url("../image/lava.gif") no-repeat top left;
-                height: 30px;
-                margin-right: 9px;
-            }
-        /* Styles for each menu-item. */
-        .lavaLamp li a {
-            position: relative; overflow: hidden;
-            text-decoration: none;
-            text-transform: uppercase;
-            font: bold 14px arial;
-            color: #fff; outline: none;
-            text-align: center;
-            height: 30px; top: 7px;
-            z-index: 10; letter-spacing: 0;
-            float: left; display: block;
-            margin: auto 10px;
-        }
+
 #topnav {
 	padding:10px 0px 12px;
 	font-size:11px;
@@ -208,5 +171,24 @@ z-index:3;
 	*background-position:0 3px!important;
 }
 
+#banner-menu {
+  position: relative;
+}
+
+#banner-menu li {
+  float: left;
+}
+
+#banner-menu li.back {
+  background-image:url(/static/dblue2.png);
+  width: 1px;
+  height: 27px;
+  position: absolute;
+  z-index: 10;
+  margin-left: 10px;
+}
 
-/* End CSS Drop Down Menu */
+#banner-menu li a {
+  position: relative;
+  z-index: 20;
+}
\ No newline at end of file
diff --git a/static/pichat.css b/static/pichat.css
index a5d9418..21eb798 100755
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -312,4 +312,4 @@ left:0;
     bottom
 }
 
-.invisible { display: none !important; }
+.invisible { display: none !important; }
\ No newline at end of file
diff --git a/template/banner.st b/template/banner.st
index 1fbc62b..b4f5805 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -10,14 +10,12 @@
       <div id="bar7">    
         <div style="float: left;">
           <div align="center">
-            $if(user_nick)$&nbsp; 
-            <a href="/log"><img src="/static/text.gif" > Log</a>&nbsp;&nbsp;&nbsp; 
-            <a href="/u/$user_nick$">
-              <img src="/static/home4.gif"/> Profile
-            </a> &nbsp;&nbsp;
-            <a href="/browser">
-              <img src="/static/image_draw.gif" /> 
-              Browser Tool</a>&nbsp;&nbsp;
+            $if(user_nick)$
+            <ul id="banner-menu">
+              <li><a href="/log"><img src="/static/text.gif" > Log</a></li>
+              <li><a href="/u/$user_nick$"><img src="/static/home4.gif"/> Profile</a></li>
+              <li><a href="/browser"><img src="/static/image_draw.gif" /> Browser Tool</a></li>
+            </ul>
 	    $else$&nbsp; &nbsp;
             <a href="/register"><img src="/static/answer_good.gif" />Register</a>
 	    <div id="landscape"> <img src="/static/const_landscape.gif"  /> </div>
diff --git a/template/head.st b/template/head.st
index 780d60c..f0e36b1 100755
--- a/template/head.st
+++ b/template/head.st
@@ -40,7 +40,7 @@ function MM_swapImage() { //v3.0
 
 jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); });
 
-    jQuery(function() { jQuery(".lavaLamp").lavaLamp({ fx: "backout", speed: 700 })});
+    jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })});
 
 </script>
 
-- 
cgit v1.2.3-70-g09d2


From e03dedba4c113a87d35e5ddf00e8ccf9acfc760b Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Mon, 1 Feb 2010 15:14:30 -0500
Subject: timb merging ryder's changes

---
 static/bwdump.gif                         | Bin 0 -> 3309 bytes
 static/bwdump.png                         | Bin 0 -> 2213 bytes
 static/dumpfun.png                        | Bin 0 -> 27670 bytes
 static/dumpfunover.gif                    | Bin 0 -> 13818 bytes
 static/dumpmod1.png                       | Bin 0 -> 3004 bytes
 static/favicon.ico                        | Bin 1406 -> 1406 bytes
 static/flyhorse.gif                       | Bin 0 -> 145367 bytes
 static/fundump.png                        | Bin 0 -> 33408 bytes
 static/hugedump2.png                      | Bin 0 -> 20983 bytes
 static/index.html                         | 213 ++++++++++++++-----------
 static/jquery.editinplace.1.0.1.packed.js |   2 +-
 static/js/register.js                     |   2 +-
 static/modbar.png                         | Bin 0 -> 2309 bytes
 static/modbarover.png                     | Bin 0 -> 4540 bytes
 static/profile.css                        |  56 +++++--
 static/register.html                      | 181 ++++++++++-----------
 static/register2.html                     | 256 ++++++++++++++++++++++++++++++
 static/search/browser.html                |   2 +-
 template/profile.st                       |  17 +-
 19 files changed, 523 insertions(+), 206 deletions(-)
 create mode 100644 static/bwdump.gif
 create mode 100644 static/bwdump.png
 create mode 100644 static/dumpfun.png
 create mode 100644 static/dumpfunover.gif
 create mode 100644 static/dumpmod1.png
 mode change 100755 => 100644 static/favicon.ico
 create mode 100644 static/flyhorse.gif
 create mode 100644 static/fundump.png
 create mode 100644 static/hugedump2.png
 create mode 100644 static/modbar.png
 create mode 100644 static/modbarover.png
 mode change 100755 => 100644 static/register.html
 create mode 100755 static/register2.html

(limited to 'static')

diff --git a/static/bwdump.gif b/static/bwdump.gif
new file mode 100644
index 0000000..4702c11
Binary files /dev/null and b/static/bwdump.gif differ
diff --git a/static/bwdump.png b/static/bwdump.png
new file mode 100644
index 0000000..a60e719
Binary files /dev/null and b/static/bwdump.png differ
diff --git a/static/dumpfun.png b/static/dumpfun.png
new file mode 100644
index 0000000..29a5f74
Binary files /dev/null and b/static/dumpfun.png differ
diff --git a/static/dumpfunover.gif b/static/dumpfunover.gif
new file mode 100644
index 0000000..25d5e77
Binary files /dev/null and b/static/dumpfunover.gif differ
diff --git a/static/dumpmod1.png b/static/dumpmod1.png
new file mode 100644
index 0000000..4e5fd6e
Binary files /dev/null and b/static/dumpmod1.png differ
diff --git a/static/favicon.ico b/static/favicon.ico
old mode 100755
new mode 100644
index 6dd74d1..5d63dd0
Binary files a/static/favicon.ico and b/static/favicon.ico differ
diff --git a/static/flyhorse.gif b/static/flyhorse.gif
new file mode 100644
index 0000000..ae9d2ad
Binary files /dev/null and b/static/flyhorse.gif differ
diff --git a/static/fundump.png b/static/fundump.png
new file mode 100644
index 0000000..e5db562
Binary files /dev/null and b/static/fundump.png differ
diff --git a/static/hugedump2.png b/static/hugedump2.png
new file mode 100644
index 0000000..8a15277
Binary files /dev/null and b/static/hugedump2.png differ
diff --git a/static/index.html b/static/index.html
index 8ee70db..38d4977 100755
--- a/static/index.html
+++ b/static/index.html
@@ -4,8 +4,29 @@
     <script type="text/javascript" src="/static/js/sha1.js"></script>
     <script type="text/javascript" src="/static/js/home.js"></script>
 
-    <script> 
-      $(document).ready(initLoginForm);
+    <script>
+$(document).ready(initLoginForm);
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
     </script>         
     <link rel="stylesheet" type="text/css" href="static/reset.css">
     
@@ -15,6 +36,12 @@
 
 
 <style type="text/css">
+
+
+
+
+
+
 <!--
 .white a:link {
 	text-decoration: none;
@@ -38,77 +65,40 @@
 	text-shadow: -1px 1px 1px #ccc;
 	color: #504F61;
 }
-#header7{
 
-	background-attachment:fixed;
-	margin: 0px auto -1px auto;
-	top: 0px;
-	width:100%;
-	left: 0px;
-	height: 60px;
-}
-#bar7{
-	top:32px;
-	position:absolute;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	width: 500px;
-	font-size: 20px;
-	left: 170px;
-	margin-left: 10%;
-	margin-right: 8%;
-	letter-spacing: -1px;
-	z-index: 999;
-}
 #main {
-	background-position:center;
-	width:500px;
+	width:460px;
 	margin: 0px auto -1px auto;
-	top:150px;
-	height:380px;
-	z-index:2;
-	opacity:0.9;
-	border-top-left-radius:10px;
-	border-top-right-radius:10px;
-	-webkit-border-top-left-radius:10px;
-	-webkit-border-top-right-radius:10px;
-	-moz-border-radius-topleft:10px;
-	-moz-border-radius-topright:10px;
-	border-bottom-left-radius:10px;
-	border-bottom-right-radius:10px;
-	-webkit-border-bottom-left-radius:10px;
-	-webkit-border-bottom-right-radius:10px;
-	-moz-border-radius-bottomleft:10px;
-	-moz-border-radius-bottomright:10px;
-	border:solid 4px #F5F5F5;
+	height:372px;
+padding-top:12;
+	border-top-left-radius:15px;
+	border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	-webkit-border-top-right-radius:15px;
+	-moz-border-radius-topleft:15px;
+	-moz-border-radius-topright:15px;
+	border-bottom-left-radius:15px;
+	border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-moz-border-radius-bottomleft:15px;
+	-moz-border-radius-bottomright:15px;
+	border:solid 1px #fff;
 	position: relative;
-	background-color: #FFF;
-	background-position:center;
-	background-repeat:no-repeat;
+			box-shadow: 5px 5px 100px #c8cbce;
+-webkit-box-shadow: 5px 5px 100px #c8cbce;
+-moz-box-shadow: 5px 5px 100px #c8cbce;
 }
-#logout7{
-	top:5px;
-	position:relative;
-	font-size:13px;
-	margin-right: 10px;
-	float:right;
-	z-index: 999;
-	font-family: "Times New Roman", Times, serif;
-}
-#logo7{
-	top:20px;
-	margin-left: 10%;
-	margin-right: 10%;
-	z-index:1000;
-	float:left;
-}
-#rapper7{
-	top: 0px;
-	left:0px;
-	position:absolute;
-	width: 100%;
-	height: 78px;
-	z-index: 1000;
+#horse {
+	width:460px;
+
+	height:372px;
+padding-top:1;
+	position: relative;
+background:url(/static/flyhorse.gif);
+	background-position:right -10;
+	background-repeat:no-repeat;
+
 }
 #bottombar{
 	top: 69px;
@@ -130,16 +120,15 @@ td {
 }
 .btnav {  border: 0px #000000 solid;} 
 body {
-	background-color:#e3e3e3;
-	background-image:url(static/shaq.gif);
-	background-position:center;
+	background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
+	background-repeat:repeat-x;
+	background-position:top;
 	overflow:hidden;
+margin:5%;
 }
 .submit {
 	
-	
 	text-shadow: -1px 1px 1px #ccc;
-	
 	font-size:15px;
 }
 .feild {
@@ -155,16 +144,18 @@ body {
 }
 .txt {
 	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-shadow: -1px 1px 1px #ccc;
+	font-size:14px;
+line-height:1.2;
+	text-shadow:1px 1px 0.5px #ccc;
+	word-spacing: 3px;
 }
 	.line {
 	font-family:Arial, Helvetica, sans-serif;
-	
-	letter-spacing: -1px;
+	letter-spacing:0px;
+line-height:-1;
+
 	color:#000;
-	font-size:18px;
-	
+	font-size:17px;
 }
 #nickInput {color:#000;
 }
@@ -172,8 +163,41 @@ body {
 .invisible { display: none !important; }
 #cursor-big { position: absolute; z-index: 1000; }
 
+#signin-submit {
+	display:inline-block;
+	width:300px;
+height:37px;
+font-size:20px;
+background-image:url(/static/btngrad1.png);
+font-weight:bold;
+word-spacing:7;
+padding-top:6px;
+	text-align:center;
+	z-index:100;
+	font-size:18px;
+	color:#fff;
+	text-shadow:1px 1px 3px rgba(0,0,0,1);
+		border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-topright:5px;
+	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;
+	border:solid 1px #eee;
+}
 
 -->
+
+
+
+
+
 </style>
 
 <body>
@@ -181,8 +205,7 @@ body {
 <div id="header7">
     <div id="bottombar"></div>
     <div align="center">
-        <p><img src="static/wordlogo2.gif" width="500" height="239"><br>
-        </p>
+<br>
     </div>
 
     <div class="white"></div>
@@ -190,31 +213,35 @@ body {
 </div>
 </div>
 </div>
-<div id="main" align="center">
+<div id="main" align="center"><div id="horse">
+
+  <p align="center">
 
-            <p align="center"><br /> 
-  </p> 
   <div id="registerbox">
-    <p align="right" class="line">&nbsp;</p>
-    <p align="right" class="line">&nbsp;</p>
-    <p align="center" class="line">Talk with pictures. </p>
+  <div align="center"><a href="/chat")"><img src="/static/dumpmod1.png" border="0"></a></div>
+  </p> 
+
+    <p align="center" class="line">Talk with pictures!</p>
+    <div align="right" class="txt">
+<br>
+      <div align="center">Right now dump.fm is invite only...<br>
+      If you have registration code, <a href="/register" style="text-decoration:none;">click here!</a> <br>
+      </div>
+    </div>
     <h1 align="center">&nbsp;</h1>
-    <h1 align="center"><br />
+    <h1 align="center">
       <input type="text" class="feild" id="nickInput" size="17"  /> 
       <br />
       <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible feild">
       <input type="password" class="feild" id="passwordInput" size="17" />
     </h1>
     <h1 align="center">      <br />
-      <img src="/static/signin.gif" id="signin-submit">             
+      <input id="signin-submit" value="Sign In">             
       <!-- <input type="submit" class="submit" id="loginSubmit" value="Log In" /> -->
     </h1>
     <p align="center">&nbsp;</p>
     <p>&nbsp;</p>
-    <div align="right" class="txt">
-      <div align="center"></div>
-      <div align="center"><a href="javascript:void(0);" onclick="javascript:alert('dump.fm is invite only, you must be really really really really really really cool. ok?');return false;" style="text-decoration:line-through;">Register</a></div>
-    </div>
+    
     <div align="center"></div>
   </div>
 </div>
diff --git a/static/jquery.editinplace.1.0.1.packed.js b/static/jquery.editinplace.1.0.1.packed.js
index 7b6fe5e..4f505b0 100755
--- a/static/jquery.editinplace.1.0.1.packed.js
+++ b/static/jquery.editinplace.1.0.1.packed.js
@@ -138,7 +138,7 @@ jQuery.fn.editInPlace = function(options) {
 
 				if (settings.field_type == "textarea")
 				{
-					var use_field_type = '<textarea name="inplace_value" class="inplace_field" rows="' + settings.textarea_rows + '" cols="' + settings.textarea_cols + '">' + jQuery(this).text().trim().escape_html() + '</textarea>';
+					var use_field_type = '<textarea name="inplace_value" class="inplace_field">' + jQuery(this).text().trim().escape_html() + '</textarea>';
 				}
 				else if(settings.field_type == "text")
 				{
diff --git a/static/js/register.js b/static/js/register.js
index a2954e5..682efcb 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -14,7 +14,7 @@ function submitRegistration() {
     var password = $('#passwordInput').val() || "";
     var code = $('#codeInput').val();
     if ($.inArray(code.toUpperCase(), ValidCodes) == -1) {
-	alert("Bad registration code! Better ask someone cool for one." );
+	alert("Bad registration code! Try again dude...." );
 	return;
     }
     if (nick.length < 3) {
diff --git a/static/modbar.png b/static/modbar.png
new file mode 100644
index 0000000..6522fb8
Binary files /dev/null and b/static/modbar.png differ
diff --git a/static/modbarover.png b/static/modbarover.png
new file mode 100644
index 0000000..3d3be48
Binary files /dev/null and b/static/modbarover.png differ
diff --git a/static/profile.css b/static/profile.css
index f146e60..0c6c71e 100755
--- a/static/profile.css
+++ b/static/profile.css
@@ -199,7 +199,6 @@ margin-top:20;
 }
       .editable {
          color: #0AA;
-		 width:250px;
       }
       .editing {
          color: #F0F;
@@ -207,19 +206,29 @@ margin-top:20;
       div#avatar {
 	overflow: hidden;
 	text-overflow: ellipsis;
-	max-width: 160px;
-	padding-bottom:40px;
+
+	padding-bottom:20px;
       }
-	  #contact {
-		  max-width: 200px;
-		  
+	#contact {
+
+		
 	
 		  text-overflow: ellipsis-word;
 	  }
 	    #bio {
-		  max-width: 200px;
+
 	text-overflow: ellipsis-word;
 	  }
+
+	input.inplace_field {
+		width: 100%;	
+	}
+
+	textarea.inplace_field {
+		width: 100%;
+		height: 50px;
+	}
+
 	  h2 {
 
 	letter-spacing:-1px;
@@ -253,7 +262,7 @@ color:#087cff;
 
    
       #newuser
-     {height:400px;
+     {height:100%;
 
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
@@ -269,22 +278,39 @@ color:#087cff;
 	-moz-border-radius-bottomright:5px;
 		box-shadow: 15px 15px 10px #c8cbce;
 -webkit-box-shadow: 15px 15px 10px #c8cbce;
--moz-box-shadow: 5px 5px 10px #c8cbce;
+-moz-box-shadow: 5px 5px 100px #c8cbce;
 padding:20;
 color:#;
 line-height:1.5;
-margin-top:-80px;
+margin-top:-100px;
      width:600;
 background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
 	background-position:top;
-margin-left:40}
-     #newuser a:link{text-size:30px;}
-#newuser h1{font-size:30;
+margin-left:70}
+
+     #newuser a{font-size:20;
+line-height:2;
+
+letter-spacing:-1;
+color:#f0e;
+
+}
+
+#newuser h1{font-size:40;
 letter-spacing:-2;
-color:f0e;
+color:#000;
+text-indent:-5;
+text-align:left;font-family:serif;
 }
-     
+#newuser h2{font-size:52;
+margin-top:-10;
+color:#fff;
+text-transform:lowercase;
+letter-spacing:-5;
+text-align:center;
+
+}     
 #date{
 font-size:60%;
 }
diff --git a/static/register.html b/static/register.html
old mode 100755
new mode 100644
index b398b6f..ce222e1
--- a/static/register.html
+++ b/static/register.html
@@ -1,19 +1,25 @@
-<html>
-
-<head>
-
-    <link rel="shortcut icon" href="static/favicon.ico">
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-    <script type="text/javascript" src="static/js/sha1.js"></script>
+</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/sha1.js"></script>
     <script type="text/javascript" src="static/js/register.js"></script>
     <script>
       $(document).ready(initRegister);
-    </script>        
+    </script>           
     <link rel="stylesheet" type="text/css" href="static/reset.css">
+    
         <link rel="shortcut icon" href="static/favicon.ico">
         
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head>
+
+
 <style type="text/css">
+
+
+
+
+
+
 <!--
 .white a:link {
 	text-decoration: none;
@@ -37,35 +43,12 @@
 	text-shadow: -1px 1px 1px #ccc;
 	color: #504F61;
 }
-#header7{
-	background-color:#666;
-	background-image:url(/static/dblue2.png);
-	background-attachment:fixed;
-	margin: 0px auto -1px auto;
-	top: 0px;
-	width:100%;
-	left: 0px;
-	height: 60px;
-}
-#bar7{
-	top:32px;
-	position:absolute;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	width: 500px;
-	font-size: 20px;
-	left: 170px;
-	margin-left: 10%;
-	margin-right: 8%;
-	letter-spacing: -1px;
-	z-index: 999;
-}
 #main {
 	background-position:center;
-	width:500px;
+	width:460px;
 	margin: 0px auto -1px auto;
-	top:150px;
-	height:380px;
+	height:400px;
+padding-top:15;
 	z-index:2;
 	opacity:0.9;
 	border-top-left-radius:10px;
@@ -80,11 +63,14 @@
 	-webkit-border-bottom-right-radius:10px;
 	-moz-border-radius-bottomleft:10px;
 	-moz-border-radius-bottomright:10px;
-	border:solid 4px #F5F5F5;
+	border:solid 2px #000;
 	position: relative;
 	background-color: #FFF;
 	background-position:center;
 	background-repeat:no-repeat;
+			box-shadow: 5px 5px 100px #c8cbce;
+-webkit-box-shadow: 5px 5px 100px #c8cbce;
+-moz-box-shadow: 5px 5px 100px #c8cbce;
 }
 #logout7{
 	top:5px;
@@ -118,7 +104,6 @@
 	height: 20px;
 	z-index: 1000;
 }
-
 p {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 24px;
@@ -131,14 +116,14 @@ td {
 }
 .btnav {  border: 0px #000000 solid;} 
 body {
-	
-	background-color:#e3e3e3;
-	
-	background-image:url(static/brokenlinkk.gif);
-	background-position:center;
-	
-	background-repeat:no-repeat;
+	background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
+	background-repeat:repeat-x;
+	background-position:top;
 	overflow:hidden;
+margin:8%;
+}
+body a{border:0;
+text-decoration:none;
 }
 .submit {
 	
@@ -150,68 +135,94 @@ body {
 .feild {
 	height:40px;
 	width:300px;
-	border:3px #ccc;
+	border:3px #000;
 	background:#e3e3e3;
 	margin:10px;
+	color:#000;
+	
 	font-size:30px;
+	
 }
 .txt {
 	font-family:Arial, Helvetica, sans-serif;
-	font-size:12px;
-	text-shadow: -1px 1px 1px #ccc;
+	font-size:14px;
+line-height:1.2;
+	text-shadow:1px 1px 0.5px #ccc;
+	word-spacing: 3px;
 }
 	.line {
 	font-family:Arial, Helvetica, sans-serif;
-	
-	letter-spacing: -1px;
+	letter-spacing: 1px;
+line-height:1;
+	text-shadow:0px 1px 50px #999;
 	color:#000;
-	font-size:18px;
-	
+	font-size:19px;
 }
-.line2 {
-	font-family:Arial, Helvetica, sans-serif;
-	margin-right:12px;
-	
+#nickInput {color:#000;
+}
+.no-cursor { cursor: none; }
+.invisible { display: none !important; }
+#cursor-big { position: absolute; z-index: 1000; }
+
+#submit {
 	
-	color:#000;
-	font-size:13px;
 	
+	display:inline-block;
+	width:300px;
+height:35px;
+margin-top:-5;
+font-size:14px;
+background-image:url(/static/btngrad1.png);
+margin-left:140;
+top:15px;
+	text-align:center;
+	z-index:100;
+	font-size:18px;
+	color:#fff;
+	text-shadow:1px 1px 1px rgba(0,0,0,1);
+		border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-topright:5px;
+	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;
+	border:solid 1px #fff;
 }
 
-
 -->
-</style>
 
-<body>
-<div id="rapper7">
-<div id="header7">
 
- <div id="bottombar"></div>
 
 
 
-        <div align="center">
-          <p><img src="static/wordlogo2.gif" width="500" height="239"><br>
-          </p>
-        </div>
 
-    <div class="white"></div>
-    <div align="center"><br />
+
+</style>
+
+<body>
+<div id="rapper7">
+<div id="header7">
+    <div id="bottombar"></div>
+    <div align="center">
+<br>
     </div>
+
+    <div class="white"></div>
+    <div align="center"><br /></div>
 </div>
 </div>
 </div>
 <div id="main" align="center">
 
-            <p align="center"><br /> 
-  </p> 
-  <div id="registerbox">
-    <p align="right" class="line">&nbsp;</p>
-    <p align="right" class="line">&nbsp;</p>
-    <p align="center" class="line">Talk with pictures. 
-    <h1 align="center"><br />
-    </h1>
-    <div id="registerbox">
+  <p align="center">
+
+  <div id="registerbox"> <a href="/"><img src="static/fundump.png"></a>
       <div align="right">
         <h1>&nbsp;</h1>
         <h1><span>username</span>
@@ -225,32 +236,24 @@ body {
           <input type="text" class="feild"id="emailInput" />
         </h1>
 
-	 <h1><span>registration code</span>
+	 <h1><span> regcode</span>
           <input type="text" class="feild" id="codeInput" />
         </h1>
 
-        <h1>&nbsp;</h1>
+
         <h1>          <br />
           
         </h1>
                   <div align="center">
                   
-                    <input type="submit" class="submit" id="submit" value="Done" />
+                    <input type="submit" class="submit" id="submit" value="Register!" />
         </div>
       </div>
     </div>
   </div>
-    <div align="center"></div>
-  </div>
 </div>
-    </div></div> 
 
-</div>
-              </h1>
-              </div>
-</div>
 
-<div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onClick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/static/register2.html b/static/register2.html
new file mode 100755
index 0000000..b398b6f
--- /dev/null
+++ b/static/register2.html
@@ -0,0 +1,256 @@
+<html>
+
+<head>
+
+    <link rel="shortcut icon" href="static/favicon.ico">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+    <script type="text/javascript" src="static/js/sha1.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/reset.css">
+        <link rel="shortcut icon" href="static/favicon.ico">
+        
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head>
+<style type="text/css">
+<!--
+.white a:link {
+	text-decoration: none;
+	text-shadow: -1px 1px 1px #ccc;
+	color: #504F61;
+}
+.white a:visited {
+	text-decoration: none;
+	text-shadow: -1px 1px 1px #ccc;
+	color: #504F61;
+}
+.white a:hover {
+	text-decoration: none;
+	text-shadow: -1px 1px 1px #ccc;
+	background-color:#e3e3e3;
+	
+	color: #fff;
+}
+.white a:active {
+	text-decoration: none;
+	text-shadow: -1px 1px 1px #ccc;
+	color: #504F61;
+}
+#header7{
+	background-color:#666;
+	background-image:url(/static/dblue2.png);
+	background-attachment:fixed;
+	margin: 0px auto -1px auto;
+	top: 0px;
+	width:100%;
+	left: 0px;
+	height: 60px;
+}
+#bar7{
+	top:32px;
+	position:absolute;
+	font-family: Arial, Helvetica, sans-serif;
+	font-weight: bold;
+	width: 500px;
+	font-size: 20px;
+	left: 170px;
+	margin-left: 10%;
+	margin-right: 8%;
+	letter-spacing: -1px;
+	z-index: 999;
+}
+#main {
+	background-position:center;
+	width:500px;
+	margin: 0px auto -1px auto;
+	top:150px;
+	height:380px;
+	z-index:2;
+	opacity:0.9;
+	border-top-left-radius:10px;
+	border-top-right-radius:10px;
+	-webkit-border-top-left-radius:10px;
+	-webkit-border-top-right-radius:10px;
+	-moz-border-radius-topleft:10px;
+	-moz-border-radius-topright:10px;
+	border-bottom-left-radius:10px;
+	border-bottom-right-radius:10px;
+	-webkit-border-bottom-left-radius:10px;
+	-webkit-border-bottom-right-radius:10px;
+	-moz-border-radius-bottomleft:10px;
+	-moz-border-radius-bottomright:10px;
+	border:solid 4px #F5F5F5;
+	position: relative;
+	background-color: #FFF;
+	background-position:center;
+	background-repeat:no-repeat;
+}
+#logout7{
+	top:5px;
+	position:relative;
+	font-size:13px;
+	margin-right: 10px;
+	float:right;
+	z-index: 999;
+	font-family: "Times New Roman", Times, serif;
+}
+#logo7{
+	top:20px;
+	margin-left: 10%;
+	margin-right: 10%;
+	z-index:1000;
+	float:left;
+}
+#rapper7{
+	top: 0px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	height: 78px;
+	z-index: 1000;
+}
+#bottombar{
+	top: 69px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	height: 20px;
+	z-index: 1000;
+}
+
+p {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 24px;
+}
+td {
+	font-family: Arial, Helvetica, sans-serif;
+	letter-spacing:-1px;
+	font-size: 12px;
+	color: #000000;
+}
+.btnav {  border: 0px #000000 solid;} 
+body {
+	
+	background-color:#e3e3e3;
+	
+	background-image:url(static/brokenlinkk.gif);
+	background-position:center;
+	
+	background-repeat:no-repeat;
+	overflow:hidden;
+}
+.submit {
+	
+	
+	text-shadow: -1px 1px 1px #ccc;
+	
+	font-size:15px;
+}
+.feild {
+	height:40px;
+	width:300px;
+	border:3px #ccc;
+	background:#e3e3e3;
+	margin:10px;
+	font-size:30px;
+}
+.txt {
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:12px;
+	text-shadow: -1px 1px 1px #ccc;
+}
+	.line {
+	font-family:Arial, Helvetica, sans-serif;
+	
+	letter-spacing: -1px;
+	color:#000;
+	font-size:18px;
+	
+}
+.line2 {
+	font-family:Arial, Helvetica, sans-serif;
+	margin-right:12px;
+	
+	
+	color:#000;
+	font-size:13px;
+	
+}
+
+
+-->
+</style>
+
+<body>
+<div id="rapper7">
+<div id="header7">
+
+ <div id="bottombar"></div>
+
+
+
+        <div align="center">
+          <p><img src="static/wordlogo2.gif" width="500" height="239"><br>
+          </p>
+        </div>
+
+    <div class="white"></div>
+    <div align="center"><br />
+    </div>
+</div>
+</div>
+</div>
+<div id="main" align="center">
+
+            <p align="center"><br /> 
+  </p> 
+  <div id="registerbox">
+    <p align="right" class="line">&nbsp;</p>
+    <p align="right" class="line">&nbsp;</p>
+    <p align="center" class="line">Talk with pictures. 
+    <h1 align="center"><br />
+    </h1>
+    <div id="registerbox">
+      <div align="right">
+        <h1>&nbsp;</h1>
+        <h1><span>username</span>
+          <input type="text" class="feild"id="nickInput" />
+          <br />
+          
+          <span>password</span>
+          <input type="password"class="feild" id="passwordInput" />
+        </h1>
+        <h1><span>email</span>
+          <input type="text" class="feild"id="emailInput" />
+        </h1>
+
+	 <h1><span>registration code</span>
+          <input type="text" class="feild" id="codeInput" />
+        </h1>
+
+        <h1>&nbsp;</h1>
+        <h1>          <br />
+          
+        </h1>
+                  <div align="center">
+                  
+                    <input type="submit" class="submit" id="submit" value="Done" />
+        </div>
+      </div>
+    </div>
+  </div>
+    <div align="center"></div>
+  </div>
+</div>
+    </div></div> 
+
+</div>
+              </h1>
+              </div>
+</div>
+
+<div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onClick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/static/search/browser.html b/static/search/browser.html
index 917294f..f1fa8f6 100755
--- a/static/search/browser.html
+++ b/static/search/browser.html
@@ -319,7 +319,7 @@ background-image:url(/static/bg-btn-blue.png);
 
         function keepResult(res) {
                 $.ajax({
-		type: 'GET',
+		type: 'POST',
 		timeout: 5000,
 		url: '/msg',
 		data: { 'room': 'RoomA', 'content': res.unescapedUrl },
diff --git a/template/profile.st b/template/profile.st
index 20ba72c..e71e2bd 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -91,27 +91,32 @@
 	  <h3>&nbsp;</h3><div id="newuser">
 <h2>&#x263A;&#x270C; Welcome to dump.fm &#x270C;&#x263A;</h2>
 
-<br><br><br>
+<br><br>
 
-<h1>&#x2776; Find a cool image you want as your avatar</h1>
-	    To get started <a href="/chat">join in</a> and post a few pictures.</h3>
+<h1>Step &#x2776;</h1>
+<h3>&#x261F; Find a sweet image for your avatar, paste the URL below &#x261F;</h3>
 	      $if(avatar)$
           <img id="avatarPic" src="$avatar$" width="150px"/>
           $else$
-          <b id="avatarPic">No avatar</b>
+          <b id="avatarPic"></b>
           $endif$
 
           $if(is_home)$
           <div id="avatar" class="editable">$avatar$</div>
           $endif$
 
-          <h3>contact info</h3>
+<h1>Step &#x2777;</h1>
+<h3>&#x261F; Enter some contact info below &#x261F;</h3>
           <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div>
           <br>
 
-	  <h3>personal info</h3>
+<h1>Step &#x2778;</h1>
+<h3>&#x261F; Enter some personal info below &#x261F;</h3>
           <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div>
           <br>
+          <h1>Step &#x2779;</h1>
+
+         <h3> <a href="/chat">Join the &#x2663; and start posting pictures!</a></h3>
 	  <h3>&nbsp;</h3></div>
 	  <h3>&nbsp;</h3>
 	  <h3>&nbsp;</h3>	  
-- 
cgit v1.2.3-70-g09d2


From c5d2f05f287613a61fb32d20514f44c83a309d21 Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Mon, 1 Feb 2010 15:21:15 -0500
Subject: timb merging ryder's changes

---
 static/header.css  | 10 +++++-----
 template/banner.st |  2 +-
 template/head.st   |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'static')

diff --git a/static/header.css b/static/header.css
index ab864f0..8b7f17e 100755
--- a/static/header.css
+++ b/static/header.css
@@ -35,6 +35,7 @@ margin-right:80%;
 	margin: 0px auto -1px auto;
 	top: 0px;
 	position:fixed;
+background-repeat:repeat-x;
 	width:100%;
 	left: 0px;
 
@@ -52,7 +53,7 @@ color:#ccc;
 text-indent:14;
 line-height:1.8;
 	text-shadow: 1px 1px 0px #000;
-	left: 155px;
+	left: 270px;
 	margin-left: 1.2%;
 	margin-right: 8%;
 	letter-spacing:.2px;
@@ -75,12 +76,11 @@ line-height:1.8;
 #logout7 a:hover{font-size:12px;
 }
 #logo7{
-	top:20px;
-	margin-left: 15px;
+	margin-left: -2px;
 	margin-right: 10%;
 	z-index:1000;
 	float:left;
-	margin-top: 4px;
+	margin-top: -5px;
 }
 #logo7 a{font-size:60;
 	text-shadow: 2px 1px 1px #000;
@@ -104,7 +104,7 @@ color:#ccc;
 text-indent:14;
 line-height:1.8;
 	text-shadow: -1px 1px 0px #;
-	right: 10px;
+	right: 50px;
 
 	margin-right: 3%;
 	letter-spacing:.2px;
diff --git a/template/banner.st b/template/banner.st
index 1fbc62b..981fe3b 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -2,7 +2,7 @@
   <div id="header7">
   <div id="logoicons">
     <div id="logo7">
- <div align="center"><a href="/chat" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image2','','/static/mouseover.gif',1)"><img src="/static/wordlogo2.gif" name="Image2" width="153" height="73" border="0"></a></div>   
+  <div align="center"><a href="/chat" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image2','','/static/modbarover.png',1)"><img src="/static/modbar.png" name="Image2" border="0"></a></div>
       <div id="strapline"><img src="/static/talkwith.png" width="179" height="53" /></div>
     </div>
     <div class="white">
diff --git a/template/head.st b/template/head.st
index 780d60c..d1037fb 100755
--- a/template/head.st
+++ b/template/head.st
@@ -1,4 +1,4 @@
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<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/jquery.min.js"></script>
 <!-- <script type="text/javascript" src="/static/jquery-1.3.2.min.js"></script> -->
-- 
cgit v1.2.3-70-g09d2