sostler prod commit

5 files changed, 47 insertions, 68 deletions

diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index 6955429..443cb1c 100644
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -38,6 +38,7 @@ iphone
 jobs
 json
 legal
+library
 links
 live
 log
diff --git a/static/css/profile.css b/static/css/profile.css
index fdac506..e852d95 100755
--- a/static/css/profile.css
+++ b/static/css/profile.css
@@ -1,4 +1,4 @@
-   #edit-toggle{
+    #edit-toggle{
 position:absolute;
 top:0;
 right:0;
@@ -31,11 +31,12 @@ letter-spacing:;
 	float: right;
 	padding: 20px;
 width:auto;
-	position:absolute;
-	top:28px;
+opacity:0.9;
+	position:fixed;
+	top:45px;
 image-rendering: -moz-crisp-edges;
-left:545;
-max-width:180;
+left:28;
+width:180;
 	margin-top:34px;
 background-color:#fff;
 	overflow: hidden;
@@ -44,8 +45,7 @@ background-color:#fff;
 	text-overflow: ellipsis-word;
 	background-position:top;
 	z-index:999;
-	min-height:600px;
-border:1px solid #f0e0d6;
+	min-height:100px;
 	line-height:1.5;
       }
 #lolbanner{
@@ -54,9 +54,7 @@ top:5;display:none;
 margin-left:22;
 }
 #profile h3{
-margin-top:5px;
-line-height:2;
-font-size:22px;
+font-size:15px;
 margin-left:-10px;
 color:#999;
 letter-spacing:-2px;
@@ -73,35 +71,21 @@ background-image:url(/static/img/leftarrow.png);
 	background-repeat:no-repeat;
 	background-position:22 1;
 margin-top:-22;
-
+display:none;
 }
 #profile h7{
 color:#000;
 text-transform:uppercase;
 display:inline-block;
-line-height:1.5;
 bottom:0;
 margin-left:-5px;
 font-size:12px;
 padding-bottom:10;
 position:absolute;
 }
-#profile h7 a:hover{
-margin-top:12;
-font-size:140%;
-letter-spacing:-1px;
-color:#f0e;
-text-transform:uppercase;
-display:inline-block;
-line-height:1.5;
-bottom:0;
-margin-left:-5px;
-font-size:20px;
-padding-bottom:10;
-position:absolute;
-text-shadow:#f0e 1px 1px 1px;
-}
+
 #logavatar img{
+
     max-width:20px;
     width: expression(this.width > 20 ? 20: true);
     max-height:20px;
@@ -125,7 +109,7 @@ color:#000;
 text-shadow:#ccc 1px 1px 1px;
 }
 #chatrap{
-margin-left:15%;
+margin-left:265px;
 }
 
 #upload{
@@ -272,27 +256,16 @@ color:000;
 }
 
 .logged-dump img{
-    max-width:500px;
-    width: expression(this.width > 500 ? 500: true);
-    max-height:400px;
-    height: expression(this.width > 500 ? 500: true);
+    max-width:600px;
+    width: expression(this.width > 600 ? 600: true);
+    max-height:600px;
+    height: expression(this.width > 600 ? 600: true);
 	border:0px;
-	z-index:4;
-	
-   
-  
+	z-index:4;	
 }
-.content2 img{
-    max-width:5000px;
-    width: expression(this.width > 5000 ? 5000: true);
-    max-height:4000px;
-    height: expression(this.width > 5000 ? 5000: true);
-	border:0px;
-	z-index:4;
-	}
 .logged-dump{ 
-width:500;
-    max-width:500px;
+width:600px;
+    max-width:600px;
 text-overflow: ellipsis-word;
 	padding: 18px 18px 6px 18px;
 	font-family: Arial, Helvetica, sans-serif;
@@ -300,19 +273,7 @@ text-overflow: ellipsis-word;
 	text-transform: uppercase;
 	line-height:15px;
 	background-color:#fff;
-border:1px solid #f0e0d6;
-	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-top:0px solid #000;	
 margin-top:20;
 	z-index:4;
 	line-height:20px;
@@ -362,7 +323,7 @@ color:#ccc;
 
 
       img#avatarPic {
-         max-height:250px;
+         max-height:50px;max-width:50px;
 		 border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -449,6 +410,23 @@ top:80;
 .invisible { display: none !important; }
 body,td,th {
 	font-family: Arial, Helvetica, sans-serif;
+	background-color:#fff;
+	background-repeat:repeat-x;	
+	background-position:top;
+background-attachment:fixed;
+		margin: 0;
+	
+
+	
+}@charset "UTF-8";
+  
+#headerbar{
+top:80;
+	background-image:url(/static/img/welcomebar.gif);
+}
+.invisible { display: none !important; }
+body,td,th {
+	font-family: Arial, Helvetica, sans-serif;
 	background-color:#f0f9ff;
 	background-image:url(/static/img/fade-blue.png);
 	background-repeat:repeat-x;	
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index 29991be..8c09944 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -62,6 +62,8 @@ var InvalidDomains = [
     "http://www.3d-onthelevel.com",
     "http://www.heathersanimations.com",
     "http://fortunecity.com",
+    "http://geneology2.com",
+    "http://www.geneology2.com",
     "http://www.kaitaia.com",
     "http://carsdriveingallery.com",
     "http://xxxspacegirls.us",
diff --git a/template/banner.st b/template/banner.st
index 335ea7c..1c5b9a2 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -12,10 +12,10 @@
             $if(user_nick)$
 
 
-      <a href="http://dump.fm/log" ><img src="/static/img/log.gif"width="20px" height="20px"> Log</a>
-        <a href="http://dump.fm/$user_nick$">$if(user_avatar)$<img src="$user_avatar$" width="19px" height="19px" />$else$<img src="/static/img/profile.gif"width="22px" height="22px" />$endif$ Profile</a>
-                  <a href="http://dump.fm/directory"><img src="/static/img/directory.gif"width="20px" height="20px" /> Directory</a>
-             <a href="http://dump.fm/browser"><img src="/static/img/image_draw.gif"/> Image Search</a>
+      <a href="http://dump.fm/log" ><img src="/static/img/log.gif"width="20px" height="20px">&#9827; Log</a>
+        <a href="http://dump.fm/$user_nick$">$if(user_avatar)$<img src="$user_avatar$" width="19px" height="19px" />$else$<img src="/static/img/profile.gif"width="22px" height="22px" />$endif$&#9829; Profile</a>
+                  <a href="http://dump.fm/directory"><img src="/static/img/directory.gif"width="20px" height="20px" />&#9824; Directory</a>
+             <a href="http://dump.fm/browser"><img src="/static/img/image_draw.gif"/>&#9830; Image Search</a>
             
 	    $else$
   
@@ -41,7 +41,7 @@
       </div>
       $endif$
           <div id="logout7" class="white">   
-      <div align="center">$if(user_nick)$ <a href="/logout"><img src="/static/img/door.gif" width="16" height="16" /> Logout</a> $else$ $form_login()$ $endif$
+      <div align="center">$if(user_nick)$ <a href="/logout"> Logout</a> $else$ $form_login()$ $endif$
       </div>
       
     </div>
diff --git a/template/form_login.st b/template/form_login.st
index 7d7adf5..2f87e5a 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -24,9 +24,7 @@
       </p>
 
       <p class="remember"><br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="/static/img/signin.gif" id="signin-submit">
-        
-        <!-- <input id="signin-submit" value="Sign in" tabindex="6" type="submit"> -->
+<input id="signin-submit" value="Sign in" tabindex="6" type="submit">
       </p>
     </form>
   </fieldset>