merging

12 files changed, 97 insertions, 52 deletions

diff --git a/static/css/browser.css b/static/css/browser.css
index ce5600a..12c7c55 100755
--- a/static/css/browser.css
+++ b/static/css/browser.css
@@ -14,7 +14,7 @@
 	#container {
 				text-align: left;
 				font-family: sans-serif;
-				color: #4E4848;
+				color: #000000;
 				margin-left: auto;
 				margin-right: auto;
 				width: 1200px;
@@ -139,6 +139,7 @@ left:0.1%;
 	z-index:100;
 left:1px;
 bottom:10px;
+color:#00000;
 	width: 100%;
 }
 
@@ -199,7 +200,7 @@ top:15px;
 .msgDiv {padding:2px;   
 }
 .oldmsg {
-    color: #666;
+    color: #000;
 }
 
 #userList {
diff --git a/static/css/dump.css b/static/css/dump.css
index 5c912e7..6c655f5 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -308,7 +308,13 @@ background-image:url(/static/img/upbutton.png);
     max-width:400px;
 margin:-2;
  z-index: 1;
+opacity:1;
+-webkit-transition: opacity;
+-webkit-transition-timing-function: ease-out;
+-webkit-transition-duration: 500ms;
+
 }
+
 .msgDiv {padding:2px;   
 }
 .oldmsg {
@@ -456,7 +462,6 @@ background-color:#f3f3f3;
 	-moz-border-radius-bottomleft:3px;
 	-moz-border-radius-bottomright:3px;
 }
-
 #userListicon {
     overflow: auto;
     height: 70%;
diff --git a/static/css/header.css b/static/css/header.css
index 1aef0fe..fdfd932 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -33,7 +33,6 @@ margin-right:80%;
 	
 	color: #fff;
 }
-
 #wherestim{
 position:absolute;
 top:-10;
diff --git a/static/css/register.css b/static/css/register.css
index c6ed8ff..e00771a 100644
--- a/static/css/register.css
+++ b/static/css/register.css
@@ -4,6 +4,13 @@
 
 
 <!--
+#termz{
+font-size:10;
+margin-right:12;
+margin-top:-5;
+margin-bottom:-5;
+
+}
 .white a:link {
 	text-decoration: none;
 	text-shadow: -1px 1px 1px #ccc;
diff --git a/static/gritter/css/jquery.gritter.css b/static/gritter/css/jquery.gritter.css
index 177765a..bbd8f47 100755
--- a/static/gritter/css/jquery.gritter.css
+++ b/static/gritter/css/jquery.gritter.css
@@ -1,6 +1,7 @@
 /* ie6 trash */
 * html #gritter-notice-wrapper {
 	position:absolute; 
+color:fff;
 }
 * html .gritter-top {
 	margin-bottom:-10px;
@@ -12,7 +13,6 @@
 	margin-bottom:0;
 }
 * html .gritter-close {
-	background:url(../images/gritter-close-ie6.gif);
 	width:22px;
 	height:22px;
 	top:7px;
@@ -25,7 +25,8 @@
 	position:fixed;
 	top:70px;
 	right:40px;
-	width:301px;
+	width:30%;
+min-width:300px;
 
 
 	z-index:9999;
@@ -62,11 +63,11 @@ color:#000;
 }
 .gritter-item {
 	display:block;
-background-color:#eee;
-	color:#000;
+background-color:#fff;
+	color:#fff;
 	height:auto;
 	padding:7px 15px 11px 11px;
-	font-size: 11px;
+	font-size: 19px;
 height:auto;
 	font-family:verdana;
 	border-top-left-radius:5px;
@@ -85,16 +86,15 @@ height:auto;
 -webkit-box-shadow: 5px 7px 10px #c8cbce;
 -moz-box-shadow: 5px 7px 10px #c8cbce;
 border:0px solid #999;
-	background:url(/static/gritter/gritterbg.png)
 }
-.gritter-item a{color:#000;
+.gritter-item a:link{color:#fff;font-size:13;
 }
 .hover .gritter-item {
 	background-position:right -40px;
-	color:#000;
+	color:#fff;
 }
 .gritter-item p {
-color:#000;
+color:#000;font-size:13;
 	margin:0;
 right:0;
 
@@ -130,3 +130,4 @@ right:0px;
 	width:250px;
 	float:right;
 }
+a:link{color:#000}
diff --git a/static/img/dumpcats2.png b/static/img/dumpcats2.png
index 34768f4..d46d3bb 100644
--- a/static/img/dumpcats2.png
+++ b/static/img/dumpcats2.png
diff --git a/static/js/register.js b/static/js/register.js
index 30e221f..af7e23a 100755
--- a/static/js/register.js
+++ b/static/js/register.js
@@ -1,6 +1,7 @@
 function submitRegistration() {
     var nick = $('#nickInput').val();
     var email = $('#emailInput').val();
+    var terms = $('#terms').val();
     var password = $('#passwordInput').val() || "";
     var password2 = $('#passwordInput2').val() || "";    
 
diff --git a/static/register.html b/static/register.html
index 45fcde7..fe7f17e 100644
--- a/static/register.html
+++ b/static/register.html
@@ -41,14 +41,16 @@
           <span>password</span>
           <input type="password" class="field" id="passwordInput" />
           <br />
-          <span>repeat password</span>
+          <span>password 2x</span>
           <input type="password" class="field" id="passwordInput2" />
-
+      
         </h1>
         <h1><span>email</span>
           <input type="text" class="field"id="emailInput" />
         </h1>
-
+ <div id="termz">   <input type="checkbox" name="terms" id="terms">
+                               I Agree to the <a href="http://dump.fm/terms">Terms of Service</a></label></div>
+                           </form>
          
          <h1><br />
            
diff --git a/template/banner.st b/template/banner.st
index 6d99d8b..1656ff1 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -1,34 +1,36 @@
+    <meta content="dump.fm - Talk with pictures!" name="description" />
+    <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!">
 <div id="rapper7">
   <div id="header7">
-    <div id="logoicons">
-      <div id="logo7">
-        <div align="center"><a href="/">dump.fm</a></div>
-      </div>
-      <div class="white">
-        
-        <div id="bar7">    
-          <div style="float: left;">
-            <div align="center">
-              $if(user_nick)$
+  <div id="logoicons">
+    <div id="logo7">
+  <div align="center"><a href="/">dump.fm</a></div>
+    </div>
+    <div class="white">
+      
+      <div id="bar7">    
+        <div style="float: left;">
+          <div align="center">
+            $if(user_nick)$
 
 
-              <a href="/log" ><img src="/static/img/log.gif"width="20px" height="20px"> Log</a>
-              <a href="/u/$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="/directory"><img src="/static/img/directory.gif"width="20px" height="20px" /> Directory</a>
-              <a href="/browser"><img src="/static/img/image_draw.gif"/> Image Search</a>
-              
-	      $else$
-              
+      <a href="/log" ><img src="/static/img/log.gif"width="20px" height="20px"> Log</a>
+        <a href="/u/$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="/directory"><img src="/static/img/directory.gif"width="20px" height="20px" /> Directory</a>
+             <a href="/browser"><img src="/static/img/image_draw.gif"/> Image Search</a>
+            
+	    $else$
+  
 
-              <div id="registerlink">
-                <a href="/register"><img src="/static/img/ako.gif"width="21px" height="21px" /> Register</a>
-              </div>
-              
-	      $endif$            
-    <div id="wherestim">
-        <img src="/static/img/wherestim.gif">
-    </div>
-            </div>            	    
+<div id="registerlink">
+<a href="/register"><img src="/static/img/ako.gif"width="21px" height="21px" /> Register</a>
+</div>
+
+   
+	    $endif$     
+
+          </div>            	    
 	  </div>
         </div>
       </div>
@@ -37,14 +39,12 @@
     
     <div id="topic"></div>
 
-
-
-    $if(isadmin)$
-    <div id="vippp">
-      <a href="/VIP/chat"> &#x2605; VIP &#x2605; </a>
-    </div>
-    $endif$
-    <div id="logout7" class="white">   
+      $if(isadmin)$
+      <div id="vippp">
+        <a href="/VIP/chat"> &#x2605; VIP &#x2605; </a>
+      </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>
       
diff --git a/template/head.st b/template/head.st
index 18b5d16..e77e454 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,6 +1,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <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!">
+<meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="/static/js/pichat.js"></script>
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
diff --git a/template/mail/html.st b/template/mail/html.st
new file mode 100644
index 0000000..33d4c1e
--- /dev/null
+++ b/template/mail/html.st
@@ -0,0 +1,27 @@
+SUBJECT: Hey $nick$, Welcome to dump.fm!
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+
+<body style="font-family: Helvetica,Arial,Sans-Serif; font-size: 
+36px;" leftmargin="0" topmargin="0" link="#6996b2" vlink="#6996b2" 
+alink="#6996b2" bgcolor="#eef2ff" marginheight="0" marginwidth="0" 
+text="#ffffff">
+<center>
+  <p>&nbsp;</p>
+  <table width="625" height="359" border="50" bordercolor="#0072f9">
+    <tr>
+      <td width="517" height="53" background="http://dump.fm/static/img/dblue2.png" bgcolor="#0072f9"><font size="+7"><center><strong>dump.fm</strong></center></font></td>
+    </tr>
+    <tr>
+      <td><img src="http://dump.fm/static/mail/welcome.gif" /><img src="http://dump.fm/static/mail/welcome3.gif" /><img src="http://dump.fm/static/mail/welcome.gif" />&nbsp;</td>
+    </tr>
+    <tr>
+      <td><font color="#666666"><center>Welcome to dump.fm $nick$!</center></font></td>
+    </tr>
+  </table>
+</center>
+
+</body>
+</html>
diff --git a/template/mail/welcome.st b/template/mail/welcome.st
index 42a0b38..7e8e9ef 100644
--- a/template/mail/welcome.st
+++ b/template/mail/welcome.st
@@ -1,5 +1,7 @@
 SUBJECT: Welcome to dump.fm, $nick$!
-
+<html>
+<img src="http://dump.fm/static/mail/welcome.gif">
 Welcome to the dump.fm posting experience.
 Get started at <http://dump.fm/chat>, or setup your
 profile at <http://dump.fm/u/$nick$>!
+</html>
\ No newline at end of file