From 219b28bbb3ce87ffe55e5ba58ed39f073c040c3c Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Thu, 8 Apr 2010 15:45:06 -0400
Subject: Add PROD

---
 template/banner.st       | 68 ++++++++++++++++++++++++------------------------
 template/head.st         |  5 ++--
 template/mail/welcome.st |  4 ++-
 template/profile.st      |  5 ++--
 4 files changed, 43 insertions(+), 39 deletions(-)

(limited to 'template')

diff --git a/template/banner.st b/template/banner.st
index 6d99d8b..3ec65a1 100755
--- 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 id="wherestim"><img src="/static/img/wherestim.gif"></div>
+          </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 2431e49..84a0ec4 100755
--- a/template/head.st
+++ b/template/head.st
@@ -1,6 +1,7 @@
 <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 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!">
 <script type="text/javascript" src="/static/jquery-1.3.2.min.js"></script>
 <!-- <script type="text/javascript" src="/static/jquery.min.js"></script> -->
 <!--<script type="text/javascript" src="/static/js/underscore-min.js"></script> -->
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
diff --git a/template/profile.st b/template/profile.st
index a50a4d5..dba7aca 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -2,8 +2,9 @@
 <html>
   <head>
     <title>$nick$'s dump.fm</title>
-        <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 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!">
     $head()$
     <link rel="stylesheet" type="text/css" media="screen" href="/static/css/profile.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
-- 
cgit v1.2.3-70-g09d2


From 167efea3b97a3414f5608d9bfff55aebb29b0727 Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Fri, 9 Apr 2010 22:23:28 -0400
Subject: timb commiting ryder's changes

---
 static/css/browser.css      |   5 +++--
 static/css/dump.css         |   7 ++++++-
 static/css/register.css     |   7 +++++++
 static/img/dumpcats2.png    | Bin 908489 -> 438093 bytes
 static/img/thumbs_up_sm.gif | Bin 91 -> 0 bytes
 static/js/register.js       |   1 +
 static/register.html        |   8 +++++---
 template/banner.st          |   2 +-
 template/chat.st            |   2 +-
 template/mail/html.st       |  27 +++++++++++++++++++++++++++
 10 files changed, 51 insertions(+), 8 deletions(-)
 delete mode 100644 static/img/thumbs_up_sm.gif
 create mode 100644 template/mail/html.st

(limited to 'template')

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 6adbc77..bd962a0 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -307,7 +307,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 {
@@ -409,7 +415,6 @@ background-color:#f3f3f3;
 	-moz-border-radius-bottomleft:3px;
 	-moz-border-radius-bottomright:3px;
 }
-
 #userListicon {
     overflow: auto;
     height: 70%;
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/img/dumpcats2.png b/static/img/dumpcats2.png
index 34768f4..d46d3bb 100644
Binary files a/static/img/dumpcats2.png and b/static/img/dumpcats2.png differ
diff --git a/static/img/thumbs_up_sm.gif b/static/img/thumbs_up_sm.gif
deleted file mode 100644
index b039245..0000000
Binary files a/static/img/thumbs_up_sm.gif and /dev/null differ
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 f7c7163..083fec5 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 3ec65a1..1656ff1 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -29,7 +29,7 @@
 
    
 	    $endif$     
-	    <div id="wherestim"><img src="/static/img/wherestim.gif"></div>
+
           </div>            	    
 	  </div>
         </div>
diff --git a/template/chat.st b/template/chat.st
index f0b5259..9b5d706 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -68,7 +68,7 @@ function pop(url)
 
 <div id="faving" style="display:none;">
 
-<a href="#" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('like','','/static/img/thumbs_up_sm.gif',1)"><img src="/static/thumbup.gif" alt="like it!" name="like" width="14" height="15" border="0" id="like" /></a>
+<img src="/static/img/thumbup.gif">
 </div>
 </div>
 
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>
-- 
cgit v1.2.3-70-g09d2