Resolved PROD merge

author: Scott Ostler <sostler@deathmachine.local> 2010-04-02 17:06:57 -0400
committer: Scott Ostler <sostler@deathmachine.local> 2010-04-02 17:06:57 -0400
commit: 0447dc0cbea30537eeb55604cad19e265d305585 (patch)
tree: 9b9f78666824b0daa102d26be4c93e24195e79ad /static
parent: bd3925a4a19dd3b2c65abad579887b108d8f8546 (diff)
parent: aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff)
132 files changed, 827 insertions, 196 deletions
diff --git a/static/ako.gif b/static/ako.gif
new file mode 100644
index 0000000..3f94cfa
--- /dev/null
+++ b/static/ako.gif
diff --git a/static/beingpostednow.png b/static/beingpostednow.png
new file mode 100644
index 0000000..5087009
--- /dev/null
+++ b/static/beingpostednow.png
diff --git a/static/duh.gif b/static/duh.gif
new file mode 100644
index 0000000..d39158e
--- /dev/null
+++ b/static/duh.gif
diff --git a/static/dump.css b/static/dump.css
index 36f3231..f8bbe30 100755
--- a/static/dump.css
+++ b/static/dump.css
@@ -61,6 +61,16 @@ right:2;
 bottom:30;
 
 }
+#effects-msg{
+position:fixed;
+bottom:68;
+z-index:1111;
+right:38;
+font-size:15;
+color:#fff;
+text-shadow: #000 1px 1px 1px;
+
+}
 #footerc
 {
 	text-align:center;
diff --git a/static/dumpnewuser.css b/static/dumpnewuser.css
index c15f432..313c228 100644
--- a/static/dumpnewuser.css
+++ b/static/dumpnewuser.css
@@ -22,6 +22,14 @@ z-index:2000;
 right:20px;
 bottom:39px;
 }
+#registerlink{
+top:7;
+padding:5;
+position:fixed;
+}
+#registerlink img{
+margin-right:5;
+}
 #userlisthelp{
 position:fixed;
 top:100px;
@@ -50,7 +58,7 @@ right:10px;
 }
 #readyjoin{
 position:fixed;
-top:27px;
+top:23px;
 left:180px;
 z-index:2000;
 }
diff --git a/static/dumppreview.gif b/static/dumppreview.gif
new file mode 100644
index 0000000..3bb83f0
--- /dev/null
+++ b/static/dumppreview.gif
diff --git a/static/dumppreview.png b/static/dumppreview.png
new file mode 100644
index 0000000..0e3c52d
--- /dev/null
+++ b/static/dumppreview.png
diff --git a/static/hugescreen.png b/static/hugescreen.png
new file mode 100644
index 0000000..eb0266f
--- /dev/null
+++ b/static/hugescreen.png
diff --git a/static/ieburnbtn.gif b/static/ieburnbtn.gif
new file mode 100644
index 0000000..266ccd2
--- /dev/null
+++ b/static/ieburnbtn.gif
diff --git a/static/imageboard.png b/static/imageboard.png
index 807f1dd..7e917f2 100644
--- a/static/imageboard.png
+++ b/static/imageboard.png
diff --git a/static/index.html b/static/index.html
index e8ec712..d8e0de1 100755
--- a/static/index.html
+++ b/static/index.html
@@ -1,196 +1,198 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
   <head>
+    <title>dump.fm</title>
+    <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!">
     <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/sha1.js"></script>
     <script type="text/javascript" src="/static/js/home.js"></script>
+    <script>
+      $(document).ready(initLoginForm);
+    </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">
+    <style type="text/css">
+      body {
+      background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
+      background-repeat:repeat-x;
+      background-position:top;
+      margin:6%;
+      }
+      #preload {
+      position: absolute;
+      left: 0px;
+      top: 0px;
+      }
+      #main {
+      width:460px;
+      margin: 0 auto 0 auto;
+      padding: 19px 0;
+      border-radius: 15px;
+      -webkit-border-radius: 15px;
+      -moz-border-radius: 15px;
+      border:solid 1px #fff;
+      position: relative;
+      box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+      -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+      -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+      }
+      #logo-and-text {
+      position: relative;
+      z-index: 20;
+      padding-bottom: 20px;
+      }
 
-body {
-	background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
-	background-repeat:repeat-x;
-	background-position:top;
-  margin:6%;
-}
-#preload {
-  position: absolute;
-  left: 0px;
-  top: 0px;
-}
-#main {
-	width:460px;
-	margin: 0 auto 0 auto;
-  padding: 19px 0;
-  border-radius: 15px;
-  -webkit-border-radius: 15px;
-	-moz-border-radius: 15px;
-	border:solid 1px #fff;
-	position: relative;
-	box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
-  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
-  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
-}
-#logo-and-text {
-  position: relative;
-  z-index: 20;
-  padding-bottom: 20px;
-}
+      #horse {
+      position: absolute;
+      z-index: 10;
+      top: 12px;
+      left: 140px;
+      }
+      #remember{
 
-#horse {
-	position: absolute;
-	z-index: 10;
-	top: 12px;
-	left: 140px;
-}
-#remember{
+      }
+      #customer {
+      position: absolute;
+      left: -90px;
+      top: -75px;
+      z-index: 10;
 
-}
-#customer {
-  position: absolute;
-  left: -90px;
-  top: -75px;
-  z-index: 10;
+      }
+      #info {
+      width:420px;
+      margin: 11px auto -1px auto;
+      opacity:0.9;
+      height:30;
+      vertical-align: bottom;
+      }
 
-}
-#info {
-	width:420px;
-	margin: 11px auto -1px auto;
-opacity:0.9;
-height:30;
-  vertical-align: bottom;
-}
 
+      p {
+      font-family: Arial, Helvetica, sans-serif;
+      font-size: 24px;
+      }
 
-p {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 24px;
-}
+      .btnav {  border: 0px #000 solid;} 
 
-.btnav {  border: 0px #000 solid;} 
+      .submit {
+      
+      text-shadow: -1px 1px 1px #ccc;
+      font-size:15px;
+      }
 
-.submit {
-	
-	text-shadow: -1px 1px 1px #ccc;
-	font-size:15px;
-}
+      input {
+      height:40px;
+      width:300px;
+      border:3px #000;
+      background:#e3e3e3;
+      margin:10px;
+      color:#000;
+      font-size:30px;
+      
+      }
+      .txt {
+      font-family:Arial, Helvetica, sans-serif;
+      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:0px;
+      line-height:-1;
+      color:#000;
+      font-size:17px;
+      }
 
-input {
-	height:40px;
-	width:300px;
-	border:3px #000;
-	background:#e3e3e3;
-	margin:10px;
-	color:#000;
-	font-size:30px;
-	
-}
-.txt {
-	font-family:Arial, Helvetica, sans-serif;
-	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:0px;
-line-height:-1;
-	color:#000;
-	font-size:17px;
-}
+      .no-cursor { cursor: none; }
+      .invisible { display: none !important; }
+      #cursor-big { position: absolute; z-index: 1000; }
 
-.no-cursor { cursor: none; }
-.invisible { display: none !important; }
-#cursor-big { position: absolute; z-index: 1000; }
+      #signin-submit {
+      display:inline-block;
+      width:300px;
+      height:33px;
+      font-size:20px;
+      background-image:url(/static/btngrad1.png);
+      font-weight:bold;
+      word-spacing:7;
+      margin-top:12px;
+      text-align:center;
+      z-index:100;
+      font-size:16px;
+      color:#fff;
+      text-shadow:1px 1px 3px #000;
+      border-radius: 5px;
+      -webkit-border-radius: 5px;
+      -moz-border-radius: 5px;*/
+      border:solid 1px #eee;
+      }
 
-#signin-submit {
-	display:inline-block;
-	width:300px;
-  height:33px;
-  font-size:20px;
-  background-image:url(/static/btngrad1.png);
-  font-weight:bold;
-  word-spacing:7;
- margin-top:12px;
-	text-align:center;
-	z-index:100;
-	font-size:16px;
-	color:#fff;
-	text-shadow:1px 1px 3px #000;
-	border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;*/
-	border:solid 1px #eee;
-}
+      #remembermeInput {
+      width: 15px;
+      height: 15px;
+      margin: 1px;
+      }
 
-#remembermeInput {
- width: 15px;
- height: 15px;
- margin: 1px;
-}
-
-label {
- display: block;
- width: 300px;
- text-align: right;
- font-size: 16px;
- color: #222;
-}
-
-
-</style>
-</head>
-<body>
-  <div id="main" align="center">
-    
-    <img src="/static/flyhorse.gif" id="horse" />
-    <img src="/static/guaranteed_customer_satisfaction.gif" id="customer" />
-    
-    <div id="registerbox">
-      <div id="logo-and-text">
-        <a href="/"><img src="/static/dumpmod1.png"></a>
-        <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 a registration code, <a href="/register" style="text-decoration:none;">click here!</a> <br>
+      label {
+      display: block;
+      width: 300px;
+      text-align: right;
+      font-size: 16px;
+      color: #222;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="main" align="center">
+      
+      <img src="/static/flyhorse.gif" id="horse" />
+      <img src="/static/guaranteed_customer_satisfaction.gif" id="customer" />
+      
+      <div id="registerbox">
+        <div id="logo-and-text">
+          <a href="/"><img src="/static/dumpmod1.png"></a>
+          <p align="center" class="line">Talk with pictures!</p>
+          <div align="right" class="txt">
+            <br>
+            <div align="center">dump.fm lets you talk with pictures<br>
+              <a href="/register" style="text-decoration:none;">Click here to Register!</a> <br>
+            </div>
           </div>
+          <input type="text" id="nickInput" size="17" />
+          <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+          <input type="password" id="passwordInput" size="17" /><br />
+          <input id="signin-submit" value="Sign In" />
+          <div id="remember"><label>
+              <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+              Remember Me
+          </label></div>
         </div>
       </div>
-      <input type="text" id="nickInput" size="17" />
-      <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
-      <input type="password" id="passwordInput" size="17" /><br />
-      <input id="signin-submit" value="Sign In" />
-      <div id="remember"><label>
-          <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
-          Remember Me
-      </label></div>
-    </div>
-  </div>
-  <div id="info" align="right">
-    <img src="/static/vxhtml.gif">
-    <img src="/static/aol_suck.gif">
-    <img src="/static/html_3_2.gif">
-    <img src="/static/geocities.gif">
-    <img src="/static/valid_html.gif">
-  </div>
+      <div id="info" align="right">
+        <img src="/static/vxhtml.gif">
+        <img src="/static/aol_suck.gif">
+        <img src="/static/html_3_2.gif">
+        <img src="/static/geocities.gif">
+        <img src="/static/valid_html.gif">
+      </div>
 
-  <div id="preload">
-    <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
-  </div>
+      <div id="preload">
+        <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+      </div>
 
-  <script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-  </script>
-  <script type="text/javascript">
-    try {
-    var pageTracker = _gat._getTracker("UA-12364576-1");
-    pageTracker._trackPageview();
-    } catch(err) {}
-  </script>
-</body>
+      <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+        try {
+        var pageTracker = _gat._getTracker("UA-12364576-1");
+        pageTracker._trackPageview();
+        } catch(err) {}
+      </script>
+  </body>
 </html>
diff --git a/static/js/pichat.js b/static/js/pichat.js
index b4b7c7d..a13b572 100755
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -130,9 +130,9 @@ function submitMessage() {
     var content = $.trim($('#msgInput').val());
     $('#msgInput').val('');
     if (content ==  '') { return; }
-    if (content.length > 6666) {
-        alert("POST TOO LONG DUDE!");
-        return;
+    if (content.length > 1000) {
+      alert("POST TOO LONG DUDE!");
+      return;
     } // this shouldn't just be client side :V
     PendingMessages[content] = true;
 
diff --git a/static/js/register.js b/static/js/register.js
index c87eadc..31d32e5 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -4,15 +4,22 @@ function validateNick(n) {
     }
 }
 
-// HOPE NO HACKERS ARE READING THIS :o
-var ValidCodes = ['WAXWANYE23',
-		    'HOTDUMPING5000','RHIZOME','VIP666','HEATNAP','anamanaguchi',];
+
+function submitRegistration() {
+    var nick = $('#nickInput').val();
+    var email = $('#emailInput').val();
+    var password = $('#passwordInput').val() || "";function validateNick(n) {
+    if (n.length <= 2) {
+	return "BAD_NICK_LENGTH";
+    }
+}
+
 
 function submitRegistration() {
     var nick = $('#nickInput').val();
     var email = $('#emailInput').val();
     var password = $('#passwordInput').val() || "";
-    var code = $('#codeInput').val();
+
 
     if (nick.length < 3 || nick.length > 12) {
 	alert("Nicks must be between 3 and 12 characters long.");
@@ -22,11 +29,66 @@ function submitRegistration() {
 	return;
     }
 
-    if ($.inArray(code.toUpperCase(), ValidCodes) == -1) {
-	alert("Bad registration code! Try again dude...." );
+  
+
+    var hash = hex_sha1(nick + '$' + password + '$dumpfm');
+    var onSuccess = function() {
+	 if (typeof pageTracker !== 'undefined') {
+          pageTracker._trackEvent('User', 'Register', nick);
+        }
+        location.href = "/";
+    };
+
+    var onError = function(resp) {
+	var respText = resp.responseText ? resp.responseText.trim() : false;
+	if (respText == 'NICK_TAKEN') {
+	    alert("That nick is already taken! Please choose another.");
+	} else if (respText == 'NICK_INVALID_CHARS') {
+	    alert("Nicks can only contain letters and numbers.");
+	} else {
+            alert("Unable to register!");	    
+	}
+    };
+
+    $.ajax({
+        type: 'POST',
+        timeout: 5000,
+        url: 'submit-registration',
+        data: {'nick': nick, 'email': email, 'hash': hash },
+        cache: false,
+        dataType: 'json',
+        success: onSuccess,
+        error: onError
+
+    });
+}
+
+function initRegister() {
+    $('#submit').click(submitRegistration);
+}
+
+function handleMsgError(resp) {
+    var respText = resp.responseText ? resp.responseText.trim() : false;
+    if (respText  == 'UNKNOWN_USER') {
+        alert("Can't send message! Please login.");
+    } else if (respText) {
+        alert("Cannot send message! (" + respText + ")");
+    } else {
+        alert("Cannot send message!");
+    }
+}
+
+
+    if (nick.length < 3 || nick.length > 12) {
+	alert("Nicks must be between 3 and 12 characters long.");
+	return;
+    } else if (password.length < 5) {
+	alert("Password must be at least 5 characters long.");
 	return;
     }
 
+  
+
     var hash = hex_sha1(nick + '$' + password + '$dumpfm');
     var onSuccess = function() {
 	 if (typeof pageTracker !== 'undefined') {
diff --git a/static/posthere.png b/static/posthere.png
index 99d871d..0e3b8f1 100644
--- a/static/posthere.png
+++ b/static/posthere.png
diff --git a/static/readyjoin.png b/static/readyjoin.png
index da8240c..a2b054b 100644
--- a/static/readyjoin.png
+++ b/static/readyjoin.png
diff --git a/static/register.html b/static/register.html
index 2490542..acdb8ed 100644
--- a/static/register.html
+++ b/static/register.html
@@ -15,6 +15,11 @@
 
 <style type="text/css">
 
+
+
+<!--
+
+
 <!--
 .white a:link {
 	text-decoration: none;
@@ -42,7 +47,7 @@
 	background-position:center;
 	width:460px;
 	margin: 0px auto -1px auto;
-	height:400px;
+padding:25;
 padding-top:5;
 	z-index:2;
 	opacity:0.9;
@@ -67,7 +72,7 @@ padding-top:5;
 -webkit-box-shadow: 5px 5px 100px #c8cbce;
 -moz-box-shadow: 5px 5px 100px #c8cbce;
 }
-#main img{margin-left:80;
+#main img{margin-left:100;
 
 }
 #logout7{
@@ -195,6 +200,8 @@ top:15px;
 
 -->
 
+
+
 </style>
 
 <body>
@@ -228,9 +235,6 @@ top:15px;
           <input type="text" class="field"id="emailInput" />
         </h1>
 
-	 <h1><span> regcode</span>
-          <input type="text" class="field" id="codeInput" />
-        </h1>
 
          
          <h1><br />
diff --git a/static/search/browser.css b/static/search/browser.css
new file mode 100755
index 0000000..75b393a
--- /dev/null
+++ b/static/search/browser.css
@@ -0,0 +1,545 @@
+/* pichat.css */
+
+  body {
+	  font-size:13;
+	  font-family:"Trebuchet MS", Arial, Helvetica, sans-serif;
+	  margin:2%;
+	background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
+	background-repeat:repeat-x;
+	background-position:top;
+	
+}
+#rapper{
+}
+	#container {
+				text-align: left;
+				font-family: sans-serif;
+				color: #4E4848;
+				margin-left: auto;
+				margin-right: auto;
+				width: 1200px;
+			}
+			#description {display:none;width:790px;}
+					#description div, .post, .result {}
+					#description p > p,#description p {margin:0;line-height:1;width:auto;}
+					#description img {float:left;margin:0 12px 12px 0;}
+table.search{font-family:Verdana,Arial,Helvetica,sans-serif;text-align:left;font-size:11px;color:#333}
+.gsc-trailing-more-results,.gsc-resultsHeader,
+.gsc-search-box{display:none;}
+.gsc-results{padding-left:0px;}
+#searchControl 
+.gsc-control{width:600;height:30;padding:0px;padding-left:0;}select, label{font:bold 11px Arial,Helvetica,sans-serif;color:#003;text-transform:uppercase;margin-right:5px;}
+input#q{width:400;height:25px;font:bold Arial,Helvetica,sans-serif;color:#F00;}
+input#submit{
+	width:100px;
+height:28px;
+font-size:20px;
+background-image:url(/static/bg-btn-blue.png);
+	text-align:center;
+	z-index:100;
+	cursor:pointer;
+	background-color:#087cff;
+	font-size:12px;
+	color:#fff;
+	text-shadow:1px 1px 3px rgba(0,0,0,0.5);
+}
+#logo{padding-left:20;}
+
+#ish{width:520;
+padding:20;
+height:550;
+background-color:#fff;
+border:1px solid #f0e0d6;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+	background-color:#ffffee;
+	background-image:url(/static/chanbg.png);
+	background-repeat:repeat-x;
+	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;
+}
+
+#content{
+    z-index: 3;
+    overflow: auto;
+	min-width:600px;
+}
+
+#chatboxx {
+    position: fixed;
+    top:80px;
+}
+
+
+#footerc
+{
+	text-align:center;
+	position:fixed;
+	width:100%;
+	bottom:0px;
+line-height:3.1;
+	font-size:11px;
+word-spacing:8px;
+height:28px;
+	color: #000;
+
+}
+#footerc a {
+	font-size: 11px;
+	color: #000;
+}
+#footerc a:link {
+	text-decoration: none;
+	font-size: 11px;
+color:000;
+}
+
+#footerc a:hover {
+	text-decoration:none;
+	font-size: 11px;
+	color: #f0e;
+}
+
+
+#messagePane {
+
+
+
+top:40px;
+bottom:20px;
+	position:fixed;
+	width: 100%;
+
+left:0.1%;
+
+	z-index:5;
+}
+
+#messageList {
+    height: 100%;
+    width: 100%;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+#msgInputDiv {
+	position:relative;
+	min-width:500px;
+	z-index:100;
+left:1px;
+bottom:10px;
+	width: 100%;
+}
+
+#msgInput {
+    width: 100%;
+	z-index:100;
+    margin-top: 15px;
+	left:-3px;
+    position:relative;
+		border:2px solid #c8cbce;
+height:36px;
+font-size:20px;
+    min-width:500px;
+	
+		box-shadow: 2px 3px 4px #eee;
+-webkit-box-shadow: 2px 3px 4px #eee;
+-moz-box-shadow: 2px 3px 4px #eee;
+filter: progid:DXImageTransform.Microsoft.dropShadow(color=#eee, offX=3, offY=4, positive=true);
+}
+.msgInput {
+    min-width:500px;
+	z-index:100;
+}
+
+#msgSubmit {
+	
+	position:absolute;
+	display:inline-block;
+	width:120px;
+height:35px;
+right:0px;
+font-size:20px;
+background-image:url(/static/bg-btn-blue.png);
+top:15px;
+	text-align:center;
+	z-index:100;
+	cursor:pointer;
+	background-color:#087cff;
+	border-top-right-radius:10px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
+	border-radius:2px;
+	font-size:12px;
+	color:#fff;
+	text-shadow:1px 1px 3px rgba(0,0,0,0.5);
+}
+.msgDiv img{
+    max-width:650px;
+    width: expression(this.width > 650 ? 650: true);
+    max-height:400px;
+    height: expression(this.width > 400 ? 400: true);
+    max-width:400px;
+ z-index: 1;
+}
+.msgDiv {padding:2px;   
+}
+.oldmsg {
+    color: #666;
+}
+
+#userList {
+	overflow-x: hidden;
+	overflow-y:auto;
+	height: auto;
+	margin: 0px;
+	position: absolute;
+	padding: 5px;
+	top:85px;
+	min-width: 150px;
+	width:11%;
+	float:right;
+	right: 6%;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight:420;
+	border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	background-color:#FFF;
+	-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;
+	max-height:450px;
+		box-shadow: 3px 4px 4px #c8cbce;
+-webkit-box-shadow: 3px 4px 4px #c8cbce;
+-moz-box-shadow: 3px 3px 4px #c8cbce;
+filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true);
+	text-overflow:ellipsis;
+	z-index:18;
+	text-align: left;
+}
+.username{height:30px;
+margin-top:6px;
+line-height:20px;
+text-indent:6px;
+z-index:18;
+min-width:90px;
+overflow:hidden;
+
+}
+.username a { 
+display:block; 
+width:100%; 
+height:100%; 
+text-decoration:none; 
+}  
+.username a:hover { 
+display:block; 
+width:100%;
+height:100%;
+background-image:url(/static/moverc.png);
+background-repeat:repeat-x;
+color:#fff;
+text-decoration:none;
+background-color:#f3f3f3;
+	border-top-right-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
+}  
+#userList img{
+    max-width:30px;
+    width: expression(this.width > 30 ? 30: true);
+    max-height:30px;
+    height: expression(this.width > 30 ? 30: true);
+    max-width:30px;
+
+	float:right;
+	right:1px;
+	z-index:77;
+	height:30px;
+	border-top-left-radius:3px;
+	border-top-right-radius:3px;
+	-webkit-border-top-left-radius:3px;
+	-webkit-border-top-right-radius:3px;
+	-moz-border-radius-topleft:3px;
+	-moz-border-radius-topright:3px;
+	border-bottom-left-radius:3px;
+	border-bottom-right-radius:3px;
+	-webkit-border-bottom-left-radius:3px;
+	-webkit-border-bottom-right-radius:3px;
+	-moz-border-radius-bottomleft:3px;
+	-moz-border-radius-bottomright:3px;
+}
+
+#userListicon {
+    overflow: auto;
+    height: 70%;
+    margin: 0px;
+    position: fixed;
+    padding: 5px;
+    top:48px;
+    width: 7%;
+    float:right;
+    right: 35px;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    text-transform: uppercase;
+    min-width:72px;
+    line-height:13px;
+    z-index:1;
+    font-weight: bold;
+    font-family: Arial, Helvetica, sans-serif;
+    color: #666;
+    text-transform:none;
+    
+}
+#avatar
+{	
+	right:1px;
+	float:right;
+	text-align:left;
+	width:auto;
+	
+}
+
+#binfo {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 11px;
+    bottom
+	#chatrap{
+	top: 105px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	padding-bottom:20px;
+}
+#chatrap{
+	top: 105px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	padding-bottom:20px;
+}
+
+#input {
+	padding-right:15px;
+	line-height:22px;
+	font-size: 12px;
+}
+    #loghead {
+	border-bottom:0px;
+	padding-left: -50px;
+	margin-right:60%;
+	width:70%;
+	letter-spacing:-3px;
+	color:#504F61;
+	height:28px;
+	font-size:33px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	text-transform:capitalize;
+	text-shadow: -6px 4px 4px #ccc;
+	padding-bottom:12px;
+	left: -40px;
+	background-color: #FFF;
+	top: 80px;
+	position: fixed;
+      }
+
+#logc
+{
+	margin-right:10%;
+	margin-left:10%;
+	background-color:#FFF;
+	padding-left: 40px;
+	padding-bottom: 30px;
+	padding-top: 15px;
+}
+
+
+  #profile {
+	float: right;
+	border:1px solid #000;
+	padding: 20px;
+	width: 180px;
+	margin-right:15%;
+	background-color:#FFF;
+	background-image:url(/static/cloudbg2.png);
+	background-position:center;
+	z-index:10;
+	border-top-right-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	min-height:600px;
+      }
+#chatrap{
+	top: 105px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	margin: 0;
+	padding-bottom:105px;
+}
+
+#log
+{
+	border: 2px #F1F1F1;
+	margin-right:15%;
+	margin-left:15%;
+	background-color:#FFF;
+	padding-left: 40px;
+	padding-bottom: 80px;
+	padding-top: 15px;
+	min-height: 800px;
+	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;
+}
+#posts {
+	
+	
+	
+}
+.logged-dump img{
+    max-width:650px;
+    width: expression(this.width > 500 ? 500: true);
+    max-height:400px;
+    height: expression(this.width > 500 ? 500: true);
+	border:0px;
+	z-index:4;
+	
+   
+  
+}
+.logged-dump{ 
+
+
+
+
+	padding: 15px;
+	font-family: Arial, Helvetica, sans-serif;
+	margin-left:15%;
+	width:60%;
+	
+	font-size: 12px;
+	text-transform: uppercase;
+	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;
+	min-width:72px;
+	line-height:15px;
+	background-color:#F2F2F2;
+	background-image:/static/footer.png;
+	background-position:bottom;
+	border:solid 1px #0f1e31;
+	z-index:4;
+	text-align: left;
+	margin:15px;
+	line-height:5px;
+	
+	
+}
+      .editable {
+         color: #0AA;
+      }
+      .editing {
+         color: #F0F;
+      }
+      div#avatar {
+          overflow: hidden;
+          text-overflow: ellipsis;
+      }
+
+      img#avatarPic {
+         max-height:250px;
+      }
+
+      #logged-dump {
+          border: 1px solid dotted;
+          padding: 5px;
+      }
+	        #loghead {
+	border-bottom:0px;
+	padding-left: -50px;
+	margin-right:60%;
+	width:auto;
+	letter-spacing:-3px;
+	color:#087cff;
+	height:28px;
+	font-size:33px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	text-transform:capitalize;
+	text-shadow: -6px 4px 4px #ccc;
+	padding-bottom:12px;
+	left: -40px;
+      }
+      #logo7{
+      font-size:30;
+		text-shadow: 1px 1px 1px #000,   2px 3px 1px #f0e;
+color:#fff;  
+font-weight:bold;
+}
+
+p {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 7px;
+}
+a {
+	font-size: 12px;
+	color: #000;
+}
+a:link {
+	text-decoration: none;
+}
+a:visited {
+	text-decoration: none;
+	color: #000;
+}
+a:hover {
+	text-decoration: none;
+	color: #00F;
+}
+a:active {
+	text-decoration: none;
+	color: #000;
+}
+td {
+	font-family: Arial, Helvetica, sans-serif;
+	letter-spacing:-1px;
+	font-size: 12px;
+	color: #000000;
+}
+.btnav {  border: 0px #000000 solid;} 
diff --git a/static/search/browser.html b/static/search/browser.html
index a3e6f17..98cfd45 100755
--- a/static/search/browser.html
+++ b/static/search/browser.html
@@ -2,15 +2,13 @@
 <head> 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
 <title>dump.fm</title> 
-    <link rel="stylesheet" type="text/css" href="/static/browser.css">
+    <link rel="stylesheet" type="text/css" href="/static/search/browser.css">
 
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> 
   <script src="dumpsearch.js" type="text/javascript"></script> 
-  <script type="text/javascript" src="all.js"></script> 
-  <script type="text/javascript" src="cufon-yui.js"></script> 
   <script src="/static/js-global/FancyZoom.js" type="text/javascript"></script>
 <script src="/static/js-global/FancyZoomHTML.js" type="text/javascript"></script>
-  <script type="text/javascript" src="futura.js"></script>
+
   
 </head>
 <body>
@@ -35,15 +33,14 @@ font-weight:bold;">image search</div>
         <table class="search" width="425" border="0" cellpadding="5" cellspacing="0"> 
           
           
-          <a href="#" id="about">options</a></div>
+   
           </table> 
         
         
       </div>
 </div>
     <div id="description"> 
-      <div align="left"><a href="#" class="closeinfo"></a>    
-        </p>        
+       
         
       </div>
       <div>
@@ -88,7 +85,7 @@ font-weight:bold;">image search</div>
                   </td> 
               </tr> 
             
-            <tr> 
+
               
               </tr> 
             <tr> 
@@ -115,9 +112,9 @@ font-weight:bold;">image search</div>
                 <input type="radio" name="size" value="large" onClick="searchImages();"> 
                 Large
                 <input type="radio" name="size"  value="xlarge" onClick="searchImages();"> 
-                Extra Large
+                XXL
                 <input type="radio" name="size"  value="0" checked onClick="searchImages();"> 
-                All Sizes</p></td> 
+                Everything</p></td> 
               </tr> 
             <tr> 
               <td colspan="2"><p>
@@ -253,7 +250,7 @@ font-weight:bold;">image search</div>
 		type: 'POST',
 		timeout: 5000,
 		url: '/msg',
-		data: { 'room': 'RoomA', 'content': res.unescapedUrl },
+		data: { 'room': 'dumpfm', 'content': res.unescapedUrl },
 		cache: false,
 		dataType: 'json'	
    	 });  
diff --git a/static/20bar.png b/static/trash/20bar.png
index 1bbd234..1bbd234 100644
--- a/static/20bar.png
+++ b/static/trash/20bar.png
diff --git a/static/20bar2.png b/static/trash/20bar2.png
index 1bbd234..1bbd234 100644
--- a/static/20bar2.png
+++ b/static/trash/20bar2.png
diff --git a/static/20bar3.png b/static/trash/20bar3.png
index 1b05876..1b05876 100644
--- a/static/20bar3.png
+++ b/static/trash/20bar3.png
diff --git a/static/20bar4.png b/static/trash/20bar4.png
index 80db403..80db403 100644
--- a/static/20bar4.png
+++ b/static/trash/20bar4.png
diff --git a/static/20bar5.png b/static/trash/20bar5.png
index 51f2a2a..51f2a2a 100644
--- a/static/20bar5.png
+++ b/static/trash/20bar5.png
diff --git a/static/20bar6.png b/static/trash/20bar6.png
index 93dd55a..93dd55a 100644
--- a/static/20bar6.png
+++ b/static/trash/20bar6.png
diff --git a/static/background13.gif b/static/trash/background13.gif
index d087dad..d087dad 100755
--- a/static/background13.gif
+++ b/static/trash/background13.gif
diff --git a/static/background4.gif b/static/trash/background4.gif
index 675add6..675add6 100755
--- a/static/background4.gif
+++ b/static/trash/background4.gif
diff --git a/static/baygrad.png b/static/trash/baygrad.png
index e80c347..e80c347 100644
--- a/static/baygrad.png
+++ b/static/trash/baygrad.png
diff --git a/static/bg-random.gif b/static/trash/bg-random.gif
index 12ce8c5..12ce8c5 100755
--- a/static/bg-random.gif
+++ b/static/trash/bg-random.gif
diff --git a/static/bg4.png b/static/trash/bg4.png
index e20fda8..e20fda8 100755
--- a/static/bg4.png
+++ b/static/trash/bg4.png
diff --git a/static/bg55.png b/static/trash/bg55.png
index f16a548..f16a548 100755
--- a/static/bg55.png
+++ b/static/trash/bg55.png
diff --git a/static/bgb.png b/static/trash/bgb.png
index 3a1c5d2..3a1c5d2 100755
--- a/static/bgb.png
+++ b/static/trash/bgb.png
diff --git a/static/bgpat.gif b/static/trash/bgpat.gif
index 86edce9..86edce9 100755
--- a/static/bgpat.gif
+++ b/static/trash/bgpat.gif
diff --git a/static/bgto.gif b/static/trash/bgto.gif
index 3411a54..3411a54 100755
--- a/static/bgto.gif
+++ b/static/trash/bgto.gif
diff --git a/static/blink.gif b/static/trash/blink.gif
index 0776f7f..0776f7f 100755
--- a/static/blink.gif
+++ b/static/trash/blink.gif
diff --git a/static/bluego.png b/static/trash/bluego.png
index 8bcd35f..8bcd35f 100755
--- a/static/bluego.png
+++ b/static/trash/bluego.png
diff --git a/static/bottoml.png b/static/trash/bottoml.png
index 0f52893..0f52893 100755
--- a/static/bottoml.png
+++ b/static/trash/bottoml.png
diff --git a/static/bottomr.png b/static/trash/bottomr.png
index 5904272..5904272 100755
--- a/static/bottomr.png
+++ b/static/trash/bottomr.png
diff --git a/static/britglobe2.gif b/static/trash/britglobe2.gif
index c972e08..c972e08 100755
--- a/static/britglobe2.gif
+++ b/static/trash/britglobe2.gif
diff --git a/static/brokenlink.gif b/static/trash/brokenlink.gif
index 0e18a55..0e18a55 100755
--- a/static/brokenlink.gif
+++ b/static/trash/brokenlink.gif
diff --git a/static/bubley.png b/static/trash/bubley.png
index fe6eb82..fe6eb82 100755
--- a/static/bubley.png
+++ b/static/trash/bubley.png
diff --git a/static/cat.jpeg b/static/trash/cat.jpeg
index f6bfa16..f6bfa16 100755
--- a/static/cat.jpeg
+++ b/static/trash/cat.jpeg
diff --git a/static/cloudbg.png b/static/trash/cloudbg.png
index f397899..f397899 100755
--- a/static/cloudbg.png
+++ b/static/trash/cloudbg.png
diff --git a/static/cloudbg1.png b/static/trash/cloudbg1.png
index f397899..f397899 100755
--- a/static/cloudbg1.png
+++ b/static/trash/cloudbg1.png
diff --git a/static/cloudbg2.png b/static/trash/cloudbg2.png
index a1d2b6e..a1d2b6e 100755
--- a/static/cloudbg2.png
+++ b/static/trash/cloudbg2.png
diff --git a/static/d.png b/static/trash/d.png
index 63a7bbb..63a7bbb 100755
--- a/static/d.png
+++ b/static/trash/d.png
diff --git a/static/d3d1.gif b/static/trash/d3d1.gif
index 0e88f7b..0e88f7b 100755
--- a/static/d3d1.gif
+++ b/static/trash/d3d1.gif
diff --git a/static/dblue.png b/static/trash/dblue.png
index 3a99764..3a99764 100755
--- a/static/dblue.png
+++ b/static/trash/dblue.png
diff --git a/static/dddump.png b/static/trash/dddump.png
index 593f9a2..593f9a2 100755
--- a/static/dddump.png
+++ b/static/trash/dddump.png
diff --git a/static/dddump2.png b/static/trash/dddump2.png
index df200c7..df200c7 100755
--- a/static/dddump2.png
+++ b/static/trash/dddump2.png
diff --git a/static/dfm.png b/static/trash/dfm.png
index 5e8357e..5e8357e 100755
--- a/static/dfm.png
+++ b/static/trash/dfm.png
diff --git a/static/dumgradbub2.png b/static/trash/dumgradbub2.png
index 1de255d..1de255d 100755
--- a/static/dumgradbub2.png
+++ b/static/trash/dumgradbub2.png
diff --git a/static/dump.gif b/static/trash/dump.gif
index f1633be..f1633be 100755
--- a/static/dump.gif
+++ b/static/trash/dump.gif
diff --git a/static/dumpbgword.gif b/static/trash/dumpbgword.gif
index 27754fa..27754fa 100755
--- a/static/dumpbgword.gif
+++ b/static/trash/dumpbgword.gif
diff --git a/static/dumpbub.png b/static/trash/dumpbub.png
index 382a25c..382a25c 100755
--- a/static/dumpbub.png
+++ b/static/trash/dumpbub.png
diff --git a/static/dumpd.gif b/static/trash/dumpd.gif
index e571668..e571668 100755
--- a/static/dumpd.gif
+++ b/static/trash/dumpd.gif
diff --git a/static/dumpd.png b/static/trash/dumpd.png
index 0f56f50..0f56f50 100755
--- a/static/dumpd.png
+++ b/static/trash/dumpd.png
diff --git a/static/dumpl2.png b/static/trash/dumpl2.png
index f0c7263..f0c7263 100755
--- a/static/dumpl2.png
+++ b/static/trash/dumpl2.png
diff --git a/static/favicon2.ico b/static/trash/favicon2.ico
index c64876f..c64876f 100755
--- a/static/favicon2.ico
+++ b/static/trash/favicon2.ico
diff --git a/static/favicon6.ico b/static/trash/favicon6.ico
index 027dae5..027dae5 100755
--- a/static/favicon6.ico
+++ b/static/trash/favicon6.ico
diff --git a/static/favicon7.ico b/static/trash/favicon7.ico
index 064a3f9..064a3f9 100755
--- a/static/favicon7.ico
+++ b/static/trash/favicon7.ico
diff --git a/static/footer.png b/static/trash/footer.png
index d83aafd..d83aafd 100755
--- a/static/footer.png
+++ b/static/trash/footer.png
diff --git a/static/footer1.png b/static/trash/footer1.png
index b471698..b471698 100755
--- a/static/footer1.png
+++ b/static/trash/footer1.png
diff --git a/static/forealz.gif b/static/trash/forealz.gif
index 63723bf..63723bf 100755
--- a/static/forealz.gif
+++ b/static/trash/forealz.gif
diff --git a/static/fuckit.gif b/static/trash/fuckit.gif
index 9f94cf6..9f94cf6 100755
--- a/static/fuckit.gif
+++ b/static/trash/fuckit.gif
diff --git a/static/gaga.gif b/static/trash/gaga.gif
index efaf4eb..efaf4eb 100755
--- a/static/gaga.gif
+++ b/static/trash/gaga.gif
diff --git a/static/getstarted.gif b/static/trash/getstarted.gif
index b581589..b581589 100755
--- a/static/getstarted.gif
+++ b/static/trash/getstarted.gif
diff --git a/static/getstarted.html b/static/trash/getstarted.html
index c1ac1b1..c1ac1b1 100755
--- a/static/getstarted.html
+++ b/static/trash/getstarted.html
diff --git a/static/headerbg.png b/static/trash/headerbg.png
index 9f218f9..9f218f9 100644
--- a/static/headerbg.png
+++ b/static/trash/headerbg.png
diff --git a/static/headerbg1.png b/static/trash/headerbg1.png
index 9f218f9..9f218f9 100644
--- a/static/headerbg1.png
+++ b/static/trash/headerbg1.png
diff --git a/static/headerbg2.png b/static/trash/headerbg2.png
index 71eee98..71eee98 100644
--- a/static/headerbg2.png
+++ b/static/trash/headerbg2.png
diff --git a/static/headerbg3.png b/static/trash/headerbg3.png
index 3c8902b..3c8902b 100644
--- a/static/headerbg3.png
+++ b/static/trash/headerbg3.png
diff --git a/static/index5.html b/static/trash/index5.html
index b30e42f..b30e42f 100755
--- a/static/index5.html
+++ b/static/trash/index5.html
diff --git a/static/lil-wayne.jpg b/static/trash/lil-wayne.jpg
index 34c6481..34c6481 100755
--- a/static/lil-wayne.jpg
+++ b/static/trash/lil-wayne.jpg
diff --git a/static/lillogo.png b/static/trash/lillogo.png
index fff9d17..fff9d17 100755
--- a/static/lillogo.png
+++ b/static/trash/lillogo.png
diff --git a/static/log4.png b/static/trash/log4.png
index de76494..de76494 100755
--- a/static/log4.png
+++ b/static/trash/log4.png
diff --git a/static/logo.png b/static/trash/logo.png
index a52b0c9..a52b0c9 100755
--- a/static/logo.png
+++ b/static/trash/logo.png
diff --git a/static/lolz.gif b/static/trash/lolz.gif
index ce248c5..ce248c5 100755
--- a/static/lolz.gif
+++ b/static/trash/lolz.gif
diff --git a/static/main.css b/static/trash/main.css
index b3eef67..b3eef67 100755
--- a/static/main.css
+++ b/static/trash/main.css
diff --git a/static/main2.css b/static/trash/main2.css
index 5eeab65..5eeab65 100755
--- a/static/main2.css
+++ b/static/trash/main2.css
diff --git a/static/mark1.png b/static/trash/mark1.png
index 50566ba..50566ba 100755
--- a/static/mark1.png
+++ b/static/trash/mark1.png
diff --git a/static/mask_shaq.jpg b/static/trash/mask_shaq.jpg
index 4c04e8b..4c04e8b 100755
--- a/static/mask_shaq.jpg
+++ b/static/trash/mask_shaq.jpg
diff --git a/static/mouseover.gif b/static/trash/mouseover.gif
index 2c6ee3e..2c6ee3e 100755
--- a/static/mouseover.gif
+++ b/static/trash/mouseover.gif
diff --git a/static/over.png b/static/trash/over.png
index f80754b..f80754b 100755
--- a/static/over.png
+++ b/static/trash/over.png
diff --git a/static/rhianamoney.gif b/static/trash/rhianamoney.gif
index 99f348a..99f348a 100755
--- a/static/rhianamoney.gif
+++ b/static/trash/rhianamoney.gif
diff --git a/static/s.png b/static/trash/s.png
index fdc8c1d..fdc8c1d 100755
--- a/static/s.png
+++ b/static/trash/s.png
diff --git a/static/shaq.gif b/static/trash/shaq.gif
index cfdaa11..cfdaa11 100755
--- a/static/shaq.gif
+++ b/static/trash/shaq.gif
diff --git a/static/shaqg.gif b/static/trash/shaqg.gif
index 6106d3d..6106d3d 100755
--- a/static/shaqg.gif
+++ b/static/trash/shaqg.gif
diff --git a/static/slo.png b/static/trash/slo.png
index 6ad74e6..6ad74e6 100755
--- a/static/slo.png
+++ b/static/trash/slo.png
diff --git a/static/spex.png b/static/trash/spex.png
index fd0231f..fd0231f 100755
--- a/static/spex.png
+++ b/static/trash/spex.png
diff --git a/static/spinner.gif b/static/trash/spinner.gif
index 5b33f7e..5b33f7e 100755
--- a/static/spinner.gif
+++ b/static/trash/spinner.gif
diff --git a/static/startpage.html b/static/trash/startpage.html
index 85f3350..85f3350 100755
--- a/static/startpage.html
+++ b/static/trash/startpage.html
diff --git a/static/startpage1.html b/static/trash/startpage1.html
index dbf5edf..dbf5edf 100755
--- a/static/startpage1.html
+++ b/static/trash/startpage1.html
diff --git a/static/startpage7.html b/static/trash/startpage7.html
index eea492c..eea492c 100755
--- a/static/startpage7.html
+++ b/static/trash/startpage7.html
diff --git a/static/starts/bg4.png b/static/trash/starts/bg4.png
index e20fda8..e20fda8 100755
--- a/static/starts/bg4.png
+++ b/static/trash/starts/bg4.png
diff --git a/static/starts/bottoml.png b/static/trash/starts/bottoml.png
index 0f52893..0f52893 100755
--- a/static/starts/bottoml.png
+++ b/static/trash/starts/bottoml.png
diff --git a/static/starts/bottomr.png b/static/trash/starts/bottomr.png
index 5904272..5904272 100755
--- a/static/starts/bottomr.png
+++ b/static/trash/starts/bottomr.png
diff --git a/static/starts/cloudbg.png b/static/trash/starts/cloudbg.png
index f397899..f397899 100755
--- a/static/starts/cloudbg.png
+++ b/static/trash/starts/cloudbg.png
diff --git a/static/starts/cloudbg1.png b/static/trash/starts/cloudbg1.png
index f397899..f397899 100755
--- a/static/starts/cloudbg1.png
+++ b/static/trash/starts/cloudbg1.png
diff --git a/static/starts/getstarted.gif b/static/trash/starts/getstarted.gif
index b581589..b581589 100755
--- a/static/starts/getstarted.gif
+++ b/static/trash/starts/getstarted.gif
diff --git a/static/starts/index.html b/static/trash/starts/index.html
index b309f74..b309f74 100755
--- a/static/starts/index.html
+++ b/static/trash/starts/index.html
diff --git a/static/starts/logbg.png b/static/trash/starts/logbg.png
index 0e41857..0e41857 100755
--- a/static/starts/logbg.png
+++ b/static/trash/starts/logbg.png
diff --git a/static/starts/main.css b/static/trash/starts/main.css
index 8503c50..8503c50 100755
--- a/static/starts/main.css
+++ b/static/trash/starts/main.css
diff --git a/static/starts/mark1.png b/static/trash/starts/mark1.png
index 50566ba..50566ba 100755
--- a/static/starts/mark1.png
+++ b/static/trash/starts/mark1.png
diff --git a/static/starts/startpage1.html b/static/trash/starts/startpage1.html
index b938eb5..b938eb5 100755
--- a/static/starts/startpage1.html
+++ b/static/trash/starts/startpage1.html
diff --git a/static/starts/topl.png b/static/trash/starts/topl.png
index dcfe5b9..dcfe5b9 100755
--- a/static/starts/topl.png
+++ b/static/trash/starts/topl.png
diff --git a/static/starts/topr.png b/static/trash/starts/topr.png
index 9cfab08..9cfab08 100755
--- a/static/starts/topr.png
+++ b/static/trash/starts/topr.png
diff --git a/static/style.css b/static/trash/style.css
index 4524037..4524037 100755
--- a/static/style.css
+++ b/static/trash/style.css
diff --git a/static/topb.png b/static/trash/topb.png
index 51cc4cc..51cc4cc 100755
--- a/static/topb.png
+++ b/static/trash/topb.png
diff --git a/static/topbg.gif b/static/trash/topbg.gif
index 9432446..9432446 100755
--- a/static/topbg.gif
+++ b/static/trash/topbg.gif
diff --git a/static/topbi.gif b/static/trash/topbi.gif
index a032a08..a032a08 100755
--- a/static/topbi.gif
+++ b/static/trash/topbi.gif
diff --git a/static/topl.png b/static/trash/topl.png
index dcfe5b9..dcfe5b9 100755
--- a/static/topl.png
+++ b/static/trash/topl.png
diff --git a/static/topr.png b/static/trash/topr.png
index 9cfab08..9cfab08 100755
--- a/static/topr.png
+++ b/static/trash/topr.png
diff --git a/static/try.gif b/static/trash/try.gif
index cbe2d89..cbe2d89 100755
--- a/static/try.gif
+++ b/static/trash/try.gif
diff --git a/static/try.png b/static/trash/try.png
index a7021f8..a7021f8 100755
--- a/static/try.png
+++ b/static/trash/try.png
diff --git a/static/uggs.gif b/static/trash/uggs.gif
index a8b763a..a8b763a 100755
--- a/static/uggs.gif
+++ b/static/trash/uggs.gif
diff --git a/static/up.png b/static/trash/up.png
index b13da1c..b13da1c 100755
--- a/static/up.png
+++ b/static/trash/up.png
diff --git a/static/upload1.png b/static/trash/upload1.png
index f46b6a8..f46b6a8 100644
--- a/static/upload1.png
+++ b/static/trash/upload1.png
diff --git a/static/upload2.png b/static/trash/upload2.png
index 10b2237..10b2237 100644
--- a/static/upload2.png
+++ b/static/trash/upload2.png
diff --git a/static/upload3.png b/static/trash/upload3.png
index 714acb1..714acb1 100644
--- a/static/upload3.png
+++ b/static/trash/upload3.png
diff --git a/static/upload4.png b/static/trash/upload4.png
index 5771bc7..5771bc7 100644
--- a/static/upload4.png
+++ b/static/trash/upload4.png
diff --git a/static/upload5.png b/static/trash/upload5.png
index 552bab7..552bab7 100644
--- a/static/upload5.png
+++ b/static/trash/upload5.png
diff --git a/static/upload6.png b/static/trash/upload6.png
index 413261d..413261d 100644
--- a/static/upload6.png
+++ b/static/trash/upload6.png
diff --git a/static/upload7.png b/static/trash/upload7.png
index b677b26..b677b26 100644
--- a/static/upload7.png
+++ b/static/trash/upload7.png
diff --git a/static/upload8.png b/static/trash/upload8.png
index 329b072..329b072 100644
--- a/static/upload8.png
+++ b/static/trash/upload8.png
diff --git a/static/url1.png b/static/trash/url1.png
index 51e0b55..51e0b55 100644
--- a/static/url1.png
+++ b/static/trash/url1.png
diff --git a/static/wayne.gif b/static/trash/wayne.gif
index 13dde42..13dde42 100755
--- a/static/wayne.gif
+++ b/static/trash/wayne.gif
diff --git a/static/wordlogo.gif b/static/trash/wordlogo.gif
index dbef59d..dbef59d 100755
--- a/static/wordlogo.gif
+++ b/static/trash/wordlogo.gif
diff --git a/static/wordlogo2.gif b/static/trash/wordlogo2.gif
index b6f22da..b6f22da 100755
--- a/static/wordlogo2.gif
+++ b/static/trash/wordlogo2.gif
diff --git a/static/yb.png b/static/trash/yb.png
index af2e410..af2e410 100755
--- a/static/yb.png
+++ b/static/trash/yb.png
diff --git a/static/urlbutton.png b/static/urlbutton.png
index ef5ab64..1fc486b 100644
--- a/static/urlbutton.png
+++ b/static/urlbutton.png
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js
index 42af499..f2e287b 100644
--- a/static/webcam/webcam.js
+++ b/static/webcam/webcam.js
@@ -56,12 +56,15 @@ window.webcam = {
     $("body").append(camHtml)
     $("#webcam-button-upload").addClass("invisible")
     $("#webcam-button-snap").removeClass("invisible")
+    $("#effects-msg").removeClass("invisible").fadeOut(70000)
+    
     blinkStart()
 	},
 	
 	hide: function() {
     $("#webcam-button-snap").addClass("invisible")
     $("#webcam-button-upload").removeClass("invisible")
+      $("#effects-msg").addClass("invisible")
     blinkStop()
 	  $("#webcam-preview").remove()
 	},
diff --git a/static/webcam/webcam.swf b/static/webcam/webcam.swf
index 9285dc9..ce7b114 100644
--- a/static/webcam/webcam.swf
+++ b/static/webcam/webcam.swf
author	Scott Ostler <sostler@deathmachine.local>	2010-04-02 17:06:57 -0400
committer	Scott Ostler <sostler@deathmachine.local>	2010-04-02 17:06:57 -0400
commit	0447dc0cbea30537eeb55604cad19e265d305585 (patch)
tree	9b9f78666824b0daa102d26be4c93e24195e79ad /static
parent	bd3925a4a19dd3b2c65abad579887b108d8f8546 (diff)
parent	aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff)