sostler prod commit

14 files changed, 622 insertions, 88 deletions

diff --git a/static/css/index.css b/static/css/index.css
index 1b99c1e..bf15dc4 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -7,6 +7,9 @@ body {
 	background-position:top;
 
 }
+#passwordreset{
+
+}
 #video{
 display:none;
 }
@@ -178,7 +181,26 @@ p {
 	font-size:15px;
   z-index: 11;
 }
-
+#submit{
+cursor:pointer;
+	display:inline-block;
+	width:300px;
+  height:33px;
+  font-size:20px;
+  background-image:url(/static/img/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;
+}
 input {
 	height:40px;
 	width:300px;
@@ -246,4 +268,10 @@ margin-bottom:7px;
 }
 #remember{margin-top:-6px;}
 #remember a{text-decoration:none;font-size:13px;margin-left:14px;color:#f0e;}
+#furie3 {
+  position: absolute;
+  left:385px;
+  top:240px;
+  z-index: 10;
 
+}
diff --git a/static/css/pages.css b/static/css/pages.css
index c16d34c..875a9c3 100644
--- a/static/css/pages.css
+++ b/static/css/pages.css
@@ -108,10 +108,10 @@ top:80;
 }
 .invisible { display: none !important; }
 body{
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
+	background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
 	background-position:top;
+	background-position:top;
 background-attachment:fixed;
 		margin: 0;
 	
diff --git a/static/css/profiletest.css b/static/css/profiletest.css
new file mode 100644
index 0000000..0092a09
--- /dev/null
+++ b/static/css/profiletest.css
@@ -0,0 +1,516 @@
+#activestuff{
+
+position:absolute;
+left:-225;
+border:2px solid #ccc;
+width:160px;
+margin-top:34;
+background-color:#fff;
+padding:10;
+height:400px;
+}
+#newfavs{
+border:2px solid #ccc;
+margin-top:22;
+margin-bottom:10;
+padding:3;
+	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;
+}   
+#newfavs img{width:4%;
+
+}
+
+#newdogs{
+border:2px solid #ccc;
+margin-bottom:-8;
+padding:3;
+	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;
+} 
+
+
+#edit-toggle{
+position:absolute;
+top:0;
+right:0;
+height:auto;
+background-image:url(/static/img/upload.png);
+width:auto;
+padding:2;
+color:#fff;
+text-align:center;
+background-color:#0c8fff;
+border-bottom:1px solid #f0e0d6;
+border-left:1px solid #f0e0d6;
+	box-shadow:5px 5px 5px #d8dbde;
+  -webkit-box-shadow:5px 5px 5px #d8dbde;
+  -moz-box-shadow:5px 5px 5px #d8dbde;
+
+}
+#edit-toggle a{font-size:12;
+letter-spacing:;
+
+color:#fff;
+}
+#edit-toggle a:hover{font-size:12;
+letter-spacing:;
+
+}
+   
+   #profile {
+	float: right;
+	padding: 20px;
+width:auto;
+	position:absolute;
+	top:29px;
+image-rendering: -moz-crisp-edges;
+left:545;
+max-width:180;
+	margin-top:34px;
+background-color:#fff;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	height:auto;
+	text-overflow: ellipsis-word;
+	background-position:top;
+	z-index:999;
+	min-height:600px;
+border:1px solid #f0e0d6;
+	line-height:1.5;
+      }
+#lolbanner{
+position:absolute;
+top:5;
+margin-left:22;
+}
+#profile h3{
+margin-top:12;
+line-height:2;
+color:#fff;
+text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0;
+}
+#profile h2{
+text-indent:-10;
+margin-top:-5;
+margin-bottom:15;
+}
+#logavatar{
+margin-left:-49;
+height:22;
+background-image:url(/static/img/leftarrow.png);
+	background-repeat:no-repeat;
+	background-position:22 1;
+margin-top:-22;
+
+}
+#profile h7{
+margin-top:12;
+font-size:140%;
+letter-spacing:1.5;
+color:blue;
+text-transform:uppercase;
+font-weight:bold;
+display:inline-block;
+line-height:1.5;
+bottom:0;
+padding-bottom:10;
+position:absolute;
+text-shadow:#EEF2FF -1px -1px 1;
+}
+
+#logavatar img{
+    max-width:20px;
+    width: expression(this.width > 20 ? 20: true);
+    max-height:20px;
+    height: expression(this.width > 20 ? 20: true);
+    max-width:20px;
+margin-top:0;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
+  -moz-box-shadow: 0 0 10px #d8dbde, 2px 2px 5px #d8dbde;
+
+}
+#chatrap{
+  width:550;
+left:300;
+
+  margin-left:auto;
+  margin-right: auto ;
+}
+
+
+}
+
+#upload{
+display:inline-block;
+	width:181px;
+  height:33px;
+  font-size:20px;
+  background-image:url(/static/img/btngrad1.png);
+  font-weight:bold;
+  word-spacing:7;
+ margin-top:15;
+margin-bottom:0;
+margin-left:-2;
+	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;
+
+}
+#pnav{position:absolute;
+padding-left:270;
+margin-top:15;
+background-position:top;
+font-weight:bold;
+margin-left:0;
+text-align:left;
+
+
+
+}
+#pnavo{
+margin-top:-18;
+padding:2;
+width:105;
+letter-spacing:-2;
+text-indent:6;
+		 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;
+height:32;
+text-transform:capitalize;
+	background-image:url(/static/img/upload.png);
+
+
+}
+#pnavn{
+position:absolute;
+top:-1;
+left:395;
+letter-spacing:-2;
+text-indent:5;
+width:96;
+height:32;
+padding:2;
+border:1px;
+	background-image:url(/static/img/upload.png);
+		 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;
+
+}
+#pnav a {
+	font-size: 30px;
+	color:#fff;
+text-transform:lowercase;
+text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0;
+}
+pnav a:link {
+	text-decoration: none;
+color:fff;
+}
+a:visited {
+	text-decoration: none;
+	color: #000;
+}
+#pnav a:hover {
+	text-decoration: none;
+	color: #fff;
+text-shadow: blue 2px 2px 0, red -20px -2px 0, green 6px 4px 0;
+
+
+}
+a:active {
+	text-decoration: none;
+	color: #000;
+}
+#footer
+{
+	text-align:center;
+	position:absolute;
+	width:100%;
+	bottom:-50px;
+padding-bottom:4;
+line-height:1;
+	font-size:11px;
+word-spacing:6px;
+	color: #000;
+
+}
+#footer a {
+	font-size: 11px;
+	color: #000;
+}
+#footer a:link {
+	text-decoration: none;
+	font-size: 11px;
+color:000;
+}
+
+#footer a:hover {
+	text-decoration:none;
+	font-size: 11px;
+	color: #f0e;
+}
+
+
+#log
+{
+	position:absolute;
+	
+	top:57px;
+	padding-top: 25px;
+
+	
+	
+}
+#posts {
+	
+	
+	
+}
+.logged-dump img{
+    max-width:500px;
+    width: expression(this.width > 500 ? 500: true);
+    max-height:400px;
+    height: expression(this.width > 500 ? 500: true);
+	border:0px;
+	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;
+text-overflow: ellipsis-word;
+	padding: 18px 18px 6px 18px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	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;
+margin-top:20;
+	z-index:4;
+
+	line-height:20px;
+	text-align: left;
+
+	
+}
+      .editable {
+         color: #0AA;
+      }
+      .editing {
+         color: #F0F;
+      }
+      div#avatar {
+	overflow: hidden;
+	text-overflow: ellipsis;
+
+	padding-bottom:20px;
+      }
+	#contact {
+
+		
+	
+		  text-overflow: ellipsis-word;
+	  }
+	    #bio {
+
+	text-overflow: ellipsis-word;
+	  }
+
+	input.inplace_field {
+		width: 100%;	
+	}
+
+	textarea.inplace_field {
+		width: 100%;
+		height: 50px;
+	}
+
+	  h2 {
+
+	letter-spacing:-1px;
+color:#087cff;
+	height:40px;
+	font-size:24px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	text-transform:capitalize;
+	
+
+	text-shadow: 1px 3px 3px #c8cbce;
+}
+
+
+      img#avatarPic {
+         max-height:250px;
+		 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;
+      }
+
+   
+      #newuser
+     {
+	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:15px;
+border:1px solid black;
+	box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
+  -moz-box-shadow: 0 0 10px #d8dbde, 1px 1px 1px #d8dbde;
+padding:20;
+line-height:1.5;
+height:auto;
+margin-top:-100px;
+     width:600;
+
+	background-image:url(/static/img/hearts.gif);
+margin-left:40}
+
+     #newuser a{font-size:28;
+line-height:3;
+	text-shadow: 1px 1px 1px #000;
+letter-spacing:-1;
+color:#f0e;
+
+
+}
+.logged-dump a:hover {
+ text-decoration: none;
+ color: #00F;
+}
+#newuser h1{font-size:20;
+letter-spacing:-2;
+color:#fff;
+text-indent:250;	text-shadow: 1px 1px 1px #000;
+display:none;
+text-transform:uppercase;
+
+}
+#newuser h3{font-size:18;
+letter-spacing:-1;
+color:#000;
+	text-shadow: 1px 1px 1px #ccc;
+text-transform:uppercase;
+
+}
+#newuser h2{font-size:35;
+margin-top:-10;
+color:#000;
+	text-shadow: 0px 2px px #f0e;
+text-transform:lowercase;
+letter-spacing:5;
+text-align:center;
+
+}     
+#date{
+font-size:60%;
+}
+#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:#ffffee;
+	background-image:url(/static/img/chanbg.png);
+	background-repeat:repeat-x;	
+	background-position:top;
+background-attachment:fixed;
+		margin: 0;
+	
+
+	
+}@charset "UTF-8";
diff --git a/static/css/register.css b/static/css/register.css
index 4339cc9..57691a5 100644
--- a/static/css/register.css
+++ b/static/css/register.css
@@ -167,7 +167,7 @@ line-height:1;
 
 #submit {
 	
-	
+	cursor:pointer;
 	display:inline-block;
 	width:300px;
 height:35px;
diff --git a/static/css/win.css b/static/css/win.css
index 6b59e51..21f235c 100644
--- a/static/css/win.css
+++ b/static/css/win.css
@@ -1,15 +1,6 @@
 
 /* CSS Document */
-
-body {
-	font-family: Arial, Helvetica, sans-serif;
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
-	background-repeat:repeat-x;
-	background-position:1 10;
-background-attachment:fixed;
-		margin: 0;
-}	
+	
 
 #content {
 	font-family: Arial, Helvetica, sans-serif;
diff --git a/static/js/pichat.js b/static/js/pichat.js
index ab95c77..d8f71c6 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -182,7 +182,7 @@ function buildMessageDiv(msg, isLoading) {
     var loadingClass = isLoading ? ' loading' : '';
     var containsImageClass = LastMsgContainsImage ? ' contains-image' : '';
     return '<div class="msgDiv dump ' + loadingClass + containsImageClass + '" ' + msgId  + '>'
-        + '<span class="nick"><b><a href="/u/' + nick + ' ">' + nick + '</a></b>'
+        + '<span class="nick"><b><a href="/' + nick + ' ">' + nick + '</a></b>'
         + ' <img src="'+Imgs.chatThumbDot+'" class="chat-thumb" onclick="Tag.favorite(this)"> '
         + '</span>'
         + buildMsgContent(msg.content)
@@ -192,12 +192,12 @@ function buildMessageDiv(msg, isLoading) {
 function buildUserDiv(user) {
     if (user.avatar) {
         return '<div class="username">'
-            + '<a href="/u/' + escapeHtml(user.nick) + '" target="_blank">'
+            + '<a href="/' + escapeHtml(user.nick) + '" target="_blank">'
             + '<img src="' + user.avatar + '" width="50" height="50">'
             + escapeHtml(user.nick) + '</a></div>';
     } else {
         return '<div class="username">'
-            + '<a href="/u/' + escapeHtml(user.nick) + '" target="_blank">'
+            + '<a href="/' + escapeHtml(user.nick) + '" target="_blank">'
             + '<img src="/static/img/noinfo.png" width="50" height="50">'
             + escapeHtml(user.nick) + '</a></div>';
     }
@@ -207,7 +207,7 @@ function buildUserDiv(user) {
 
 function buildGrowlDataAndPopDatShit(msg) {
     var nick = escapeHtml(msg.nick);
-    nick = '<a href="/u/' + nick + ' " style="color:pink">' + nick + '</a>:'
+    nick = '<a href="/' + nick + ' " style="color:pink">' + nick + '</a>:'
     var msg = buildMsgContent(msg.content)
     growl(nick, msg)
 }
@@ -489,7 +489,7 @@ function initProfile() {
         t.html(buildMsgContent(t.text()));
     });
     initLogThumb()
-    if (window.location.href == 'http://dump.fm/u/scottbot') {
+    if (window.location.href == 'http://dump.fm/scottbot') {
         $('body').append($('<embed src="/static/tunes/busters.mid" autostart="true" hidden="true">'));
     }
 };
diff --git a/static/register.html b/static/register.html
index 644ad2b..00540d7 100644
--- a/static/register.html
+++ b/static/register.html
@@ -7,55 +7,46 @@
       $(document).ready(initRegister);
     </script>           
     <link rel="stylesheet" type="text/css" href="static/css/reset.css">
-     <link rel="stylesheet" type="text/css" href="static/css/register.css">
-        <link rel="shortcut icon" href="static/favicon.ico">
-        
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm - register</title></head>
-
-
+    <link rel="stylesheet" type="text/css" href="static/css/index.css">  
 
+        <link rel="shortcut icon" href="static/favicon.ico">
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
+    <META NAME="description" CONTENT="Talk with pictures!">
+    <title>dump.fm - register</title></head>
 <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">
+<div id="rapper"></div>
+<div id="content" style="z-index:77;">
 
-  <p align="center">
+<div id="main" align="center">
 
-  <div id="registerbox"> 
+  <div id="passwordreset">
       <img src="/static/img/furie3.png" id="furie3" />
-  <a href="/"><img src="static/img/fundump.png"></a>
-      <div align="right">
-        <h1>&nbsp;</h1>
-        <h1><span>username</span>
+   <div id="passwordreset">
+    <div id="logo-and-text">
+      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
+        <div align="center">
+        <label style="text-align:left;margin-bottom:-8px;">username</label>
           <input type="text" class="field"id="nickInput" />
-          <br />
+          <br>
           
-          <span>password</span>
+           <label style="text-align:left;margin-bottom:-8px;">password</label>
           <input type="password" class="field" id="passwordInput" />
-          <br />
-          <span>password2x</span>
+          <br>
+           <label style="text-align:left;margin-bottom:-8px;">password2x</label>
           <input type="password" class="field" id="passwordInput2" />
       
-        </h1>
-        <h1><span>email</span>
+        <label style="text-align:left;margin-bottom:-8px;">email</label>
           <input type="text" class="field"id="emailInput" />
         </h1>
 
                            </form>
          
-         <h1><br />
+        <br>
            
-        </h1>
+       
          <div align="center">                  
            <input type="submit" class="submit" id="submit" value="Register!" />
         </div>
diff --git a/template/about_us.st b/template/about_us.st
index b860cf4..43d148e 100644
--- a/template/about_us.st
+++ b/template/about_us.st
@@ -14,10 +14,9 @@ jQuery(function()
     $head()$
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
+background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
-	background-position:1 10;
+	background-position:top;
 background-attachment:fixed;" onload="    
              javascript:CreateDropdownWindow('about the site', '360px', true, 'news', 70, 75);
                 javascript:CreateDropdownWindow('about the team', '380px', true, 'link', 500, 60); 
diff --git a/template/help.st b/template/help.st
index d1a999c..440db28 100644
--- a/template/help.st
+++ b/template/help.st
@@ -18,10 +18,9 @@ jQuery(function()
     $head()$
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
+background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
-	background-position:1 10;
+	background-position:top;
 background-attachment:fixed;" onload="    
              javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 30, 115);
  
diff --git a/template/privacy.st b/template/privacy.st
index d904951..167016f 100644
--- a/template/privacy.st
+++ b/template/privacy.st
@@ -19,10 +19,9 @@ jQuery(function()
     $head()$
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
+	background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
-	background-position:1 10;
+	background-position:top;
 background-attachment:fixed;" onload="    
              javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 20, 115);
                 javascript:CreateDropdownWindow('privacy agreement', '560px', true, 'archive', 420, 60); 
diff --git a/template/profile.st b/template/profile.st
index 431e51b..2890d60 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -154,7 +154,7 @@ $share_buttons()$
 
               <br>
               
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
+         <a href="/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
               
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
@@ -165,12 +165,12 @@ $share_buttons()$
 	    <div id="pnav">
 
               $if(next)$
-              <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div> 
+              <div id="pnavn"><a href="/$nick$/$next$">next &#9758;</a></div> 
               $endif$
 
               &nbsp;
               $if(prev)$
-              <div id="pnavo">  <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
+              <div id="pnavo">  <a href="/$nick$/$prev$">&#9756; prev</a></div>
               $endif$
               
               <br><br>
diff --git a/template/req_reset.st b/template/req_reset.st
index 4089298..936bc73 100644
--- a/template/req_reset.st
+++ b/template/req_reset.st
@@ -2,7 +2,8 @@
   <head>
     <title>dump.fm Password Reset</title>
 
-    $head()$
+$head()$
+
     <style>
       #main {      
       padding: 100px 2em 0px 2em;
@@ -49,21 +50,31 @@
         });
         });
     </script>
+      <link rel="stylesheet" type="text/css" href="static/css/index.css">  
   </head>
   <body>
-    $banner()$
-    <div id="main">
+
+<div id="rapper"></div>
+<div id="content" style="z-index:77;">
+
+<div id="main" align="center">
+
+  <div id="passwordreset">
+    <div id="logo-and-text">
+      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
+        <div align="center">
+        
+        
       <div id="feedback" style="display: none; color: red; margin-bottom: 2em;"></div>
       <h1>Forgot your password?</h1>
       <br>
       <div>
-        Enter your nick, and we'll send you an email to reset your password.
+        Enter your nick and we'll email you the password reset stuff!
       </div>
-      <br />
-      <label>Nick:</label>
+      <br /><label style="display:none;">nick:</label>
       <input type="text" id="nick">
       <br />
       <input type="submit" value="Reset password" id="submit">
-    </div>
+    </div></div></div></div>
   </body>
 </html>
diff --git a/template/reset.st b/template/reset.st
index f166d88..5fbfe65 100644
--- a/template/reset.st
+++ b/template/reset.st
@@ -3,15 +3,7 @@
     <title>dump.fm Password Reset</title>
     <script type="text/javascript" src="/static/js/sha1.js"></script>
     $head()$
-    <style>
-      #main {      
-      padding: 100px 2em 0px 2em;
-      }
-      label {
-          float: left;
-          width: 150px;
-      }
-    </style>
+
     <script>
         jQuery(function() {
         jQuery("#submit").click(function() {
@@ -34,17 +26,26 @@
         });
     </script>
   </head>
+        <link rel="stylesheet" type="text/css" href="static/css/index.css">  
   <body>
-    $banner()$
-    <div id="main">
-      $if(valid_request)$
+
+<div id="rapper"></div>
+<div id="content" style="z-index:77;">
+
+<div id="main" align="center">
+
+  <div id="passwordreset">
+    <div id="logo-and-text">
+      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
+        <div align="center">
+ $if(valid_request)$
       <div id="feedback" style="display: none; color: red; margin-bottom: 2em;"></div>
       <h1>Reset Your Password</h1>
       <br>
-      <label>New Password:</label>
+      <label style="text-align:left;margin-bottom:-8px;">New Password:</label>
       <input type="password" id="p1">
       <br>
-      <label>Repeat Password:</label>
+      <label style="text-align:left;margin-bottom:-8px;">Repeat Password:</label>
       <input type="password" id="p2">
       <br>
       <form action="$link$" method="POST">
@@ -56,6 +57,6 @@
       <span>Your password reset link is invalid or has expired. Please try
         resetting again.</span>
       $endif$
-    </div>
+    </div></div></div></div>
   </body>
 </html>
diff --git a/template/terms.st b/template/terms.st
index 286593c..dd133ee 100644
--- a/template/terms.st
+++ b/template/terms.st
@@ -17,10 +17,9 @@ jQuery(function()
     $head()$
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
-	background-color:#ffffee;
-	background-image:url(/static/img/chanbg.png);
+	background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
-	background-position:1 10;
+	background-position:top;
 background-attachment:fixed;" onload="    
              javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 20, 115);
                 javascript:CreateDropdownWindow('terms of service', '560px', true, 'archive', 420, 60);