sostler prod commit

3 files changed, 26 insertions, 77 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index aa393c4..5a6c0de 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -610,12 +610,12 @@ a:active {
  color: #fff;
 }
 #dcontent{
-    z-index: 3;
+
     overflow: auto;
 	min-width:600px;
 }
 #content{
-    z-index: 3;
+
     overflow: auto;
 
 }
@@ -636,15 +636,7 @@ font-size:15;
 color:#000;
 
 }
-#tinychat-wrapper{
-z-index:55;
-width:700px;
-right:30px;height:350px;
-position:absolute;
-bottom:76;
-}
-#tinychat-wrapper object{
-}
+
 #footerc
 {
 	text-align:center;
@@ -710,7 +702,7 @@ bottom:65px;
 	width: 99.6%;
 	background-color:#fff;
 left:0.2%;
-	z-index:5;
+
 }
 
 #messagePane a:hover {
@@ -739,14 +731,12 @@ left:0.2%;
 #msgInputDiv {
 	position:relative;
 	min-width:500px;
-	z-index:100;
 left:3px;
 bottom: -5px;
 	width: 100%;
 }
 
 #msgInput {
-	z-index:100;
 	left:-3px;border:1px solid #000;
     position:relative;border-right:0px;
 height:35px;
@@ -756,7 +746,7 @@ font-size:20px;
 }
 .msgInput {
     min-width:500px;width:100%;
-	z-index:100;background-color:#eff5fb;
+	background-color:#eff5fb;
 }
 #msginputrapper{
 margin-right:374;
@@ -772,7 +762,6 @@ right:285px;
 font-size:20px;background-color:#eff5fb;
 top:0;
 	text-align:center;
-	z-index:100;
 border:1px solid #000;
 border-right:0px;
 	cursor:pointer;
@@ -824,27 +813,7 @@ padding-bottom:1;
 	font-size:12px;
 	color:#000;
 }
-#cyberiawebcam-button-upload{
-		border-top-right-radius:10px;
-	-webkit-border-top-right-radius:5px;background-color:#eff5fb;
-	-moz-border-radius-topright:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomright:5px;
-	position:absolute;
-	display:inline-block;
-	width:100%;
-height:35px;
-background-position:center;
-right:5px;
-border:1px solid #000;
-top:0;
-padding-bottom:1;
-	text-align:center;
-	cursor:pointer;
-	font-size:12px;
-	color:#000;
-}
+
 #nextbutton{
 border:1px solid #000;
 		border-top-right-radius:10px;
@@ -885,36 +854,13 @@ right:5px;
 top:0;
 padding-bottom:4;
 	text-align:center;
-	z-index:100;
-	cursor:pointer;
-background-color:#ccc;
-	font-size:17px;
-	color:#fff;
-border:1px solid #000;
-}
-#cyberiawebcam-button-snap{
-		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;
-	position:absolute;
-	display:inline-block;
-	width:100%;
-height:35px;
-background-position:center;
-right:5px;
-top:0;
-padding-bottom:4;
-	text-align:center;
-	z-index:100;
 	cursor:pointer;
 background-color:#ccc;
 	font-size:17px;
 	color:#fff;
 border:1px solid #000;
 }
+
 #webcam-button-snap.blink{
   color:#4f4;
 }
@@ -953,7 +899,7 @@ top:0;
 background-color:#eff5fb;
 padding-bottom:1;
 	text-align:center;
-	z-index:100;
+
 	cursor:pointer;
 	font-size:12px;
 	color:#000;
@@ -966,12 +912,7 @@ border:1px solid #000;border-right:0px;
     height: expression(this.width > 400 ? 400: true);
     max-width:400px;
     margin:-2;
-    z-index: 1;
     opacity:1;
-    -webkit-transition: opacity;
-    -webkit-transition-timing-function: ease-out;
-    -webkit-transition-duration: 500ms;
-    
 }
 
 .msgDiv {
@@ -993,7 +934,6 @@ background-position:top right;
   top:0;
   padding-bottom:1;
 	text-align:center;
-	z-index:100;
 	cursor:pointer;
 	font-size:12px;
 	color:#fff;
@@ -1451,7 +1391,6 @@ display:inline-block;
 margin-bottom:10;
 margin-left:-2;
 	text-align:center;
-	z-index:100;
 	font-size:16px;
 	color:#fff;
 	text-shadow:1px 1px 3px #000;
@@ -2147,7 +2086,18 @@ text-align: justify; text-justify: newspaper
 		-webkit-box-shadow: 0 3px 10px #110000;
 		
 	}
-		#dis_welcome #dis_content {
+	
+		#signintxt {
+		line-height: 1em;
+	position:absolute;
+		   font: 17px Helvetica, Arial, Sans-Serif;
+		text-align: center;
+	}
+			#signintxt a {
+			color: #3B5998;
+		}
+			#signintxt a:hover { text-decoration: underline; }
+	#dis_welcome #dis_content {
 			display: none;
 		}
 		#dis_content a {
@@ -2183,6 +2133,6 @@ background-color:#fff;
 color:#000;	text-shadow: 0px 1px 0px #fff;
 }
 #pwreset a{
-margin-left:23px;
+margin-left:20px;color:#66AACC;
 font-size:11px;	
 }
\ No newline at end of file
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index bdddf26..ea1c1c5 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -64,7 +64,7 @@ var InvalidDomains = [
     "http://fortunecity.com",
     "http://geneology2.com",
     "http://www.geneology2.com",
-	"genealogy2.com",
+    "genealogy2.com",
     "http://img.waffleimages.com",
     "http://www.worldofstock.com",
     "http://aphrodite.cooltext.com",
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 4f8b47b..9287cc1 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -224,7 +224,8 @@ function buildMsgContent(content) {
 // isLoading doesn't get passed the right thing by $.map in addMessages
 function buildMessageDiv(msg, isLoading) {
     var nick = escapeHtml(msg.nick);
-//    if (nick == 'frakbuddy' && Nick != 'frakbuddy') return;
+    if (nick == 'frakbuddy' && Nick != 'frakbuddy') return;
+    if (nick == 'FAUXreal' && Nick != 'FAUXreal') return;
     removeOldMessages()
     var msgId = ('msg_id' in msg) ? 'id="message-' + msg.msg_id + '"' : '';
     var loadingClass = isLoading ? ' loading' : '';
@@ -1224,13 +1225,11 @@ function onBlur() {
 }
 
 function titleUpdater() {
-    if (HasFocus || UnseenMsgCounter == 0 || $('title').text() != OrigTitle) {
-        $('title').text(OrigTitle);
-    } else {
+    if (UnseenMsgCounter > 0) {
         var plural = UnseenMsgCounter > 1 ? 's' : '';
         $('title').text(UnseenMsgCounter + ' new dump' + plural + '! | ' + OrigTitle);
     }
-    setTimeout(titleUpdater, 2000);
+    setTimeout(titleUpdater, 4000);
 }
 
 function startTitleUpdater() {