Resolved PROD merge

author: Scott Ostler <sostler@deathmachine.local> 2010-04-02 17:06:57 -0400
committer: Scott Ostler <sostler@deathmachine.local> 2010-04-02 17:06:57 -0400
commit: 0447dc0cbea30537eeb55604cad19e265d305585 (patch)
tree: 9b9f78666824b0daa102d26be4c93e24195e79ad /template
parent: bd3925a4a19dd3b2c65abad579887b108d8f8546 (diff)
parent: aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff)
6 files changed, 26 insertions, 38 deletions
diff --git a/template/banner.st b/template/banner.st
index 5f396bc..9c6198c 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -22,9 +22,9 @@
 	    $else$
   
 
-
-<a href="/register"><img src="/static/answer_good.gif"width="20px" height="20px" />Register</a>
-
+<div id="registerlink">
+<a href="/register"><img src="/static/ako.gif"width="21px" height="21px" /> Register</a>
+</div>
 
    
 	    $endif$            
diff --git a/template/chat.st b/template/chat.st
index d8ff954..3bf86ed 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -1,9 +1,11 @@
 <html>
   <head>
     <title>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!">
     $head()$
-                $if(user_nick)$
-    <link rel="stylesheet" type="text/css" href="/static/dump.css">
+                $if(user_avatar)$
+
     $else$
         <link rel="stylesheet" type="text/css" href="/static/dumpnewuser.css">
         $endif$
@@ -14,6 +16,9 @@
       var Nick = $json_user_nick$;
       var Room = $json_room_key$;
       var Timestamp = $timestamp$;
+      function showAlert() {
+	alert('MUST LOGIN');
+}
       $if(isadmin)$
       var IsAdmin = true;
       $else$
@@ -71,7 +76,7 @@ function pop(url)
               }$
               <hr />
             </div>
-            $if(user_nick)$
+            $if(user_avatar)$
                 <link rel="stylesheet" type="text/css" href="/static/dump.css">
         <div id="msgInputDiv">
                 <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
@@ -81,18 +86,18 @@ function pop(url)
                             <input id="webcam-button-upload" value="Webcam" type="submit">
                             <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">  
                             <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/trophyicon.gif"></a></div>
-            </div>
+            </div><div id="effects-msg"class="invisible">click on your face for effects!</div>
 $else$
 
-                  <link rel="stylesheet" type="text/css" href="/static/dump.css">
+          <link rel="stylesheet" type="text/css" href="/static/dump.css">
         <div id="msgInputDiv">
                 <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
-              <input id="msgSubmit" type="submit" value="Send"
+              <input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"
                      />
-              <input id="upload" value="Upload" type="submit">
-                            <input id="webcam-button-upload" value="Webcam" type="submit">
-                            <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">  
-                            <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/trophyicon.gif"></a></div>
+              <input id="upload" value="Upload" type="submit"onClick="showAlert();">
+                            <input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();">
+                            <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink"onClick="showAlert();">  
+                            <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/trophyicon.gif"></a></div>
             </div>          
      
           </div>
@@ -107,13 +112,14 @@ $else$
     <div id="imageboard"><img src="/static/imageboard.png"></div>
     <div id="uploadstuff"><img src="/static/uploadstuff.png"></div>
     <div id="signinblurb"><img src="/static/signinblurb.png"></div>
-    <div id="readyjoin"><img src="/static/readyjoin.png"></div>
-        <div id="dumppreview"><img src="/static/dumppreview.png"></div>
+
         <div id="beingpostednow"><img src="/static/beingpostednow.png"></div>
     <script>
-    jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide(1000) }, 100000 ) })
+    jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide(1000) }, 10000 ) })
     </script>
+   
     </div>       $endif$
+
     <div id="footerc">
       <p>
         $footer()$
diff --git a/template/head.st b/template/head.st
index 7ba802d..9f30ac0 100755
--- a/template/head.st
+++ b/template/head.st
@@ -1,5 +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!">
 <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/logged_dump.st b/template/logged_dump.st
deleted file mode 100755
index 3b8336a..0000000
--- a/template/logged_dump.st
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<div class="logged-dump" id="message-$dump.message_id$">
-  <div>$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div>
-
-  <a href="/u/$dump.nick$">
-  
-  <div id="logavatar">
-  
-  $if(dump.avatar)$<img height="50" width="50" src="$dump.avatar$" />
-  
-  $else$
-  
-  <img height="50" width="50" src="/static/noinfo.png">
-  
-  $endif$
-  </div></a>
-  <div class="content">$dump.content$</div>
-  <hr />
-  $share_buttons()$
-</div>
diff --git a/template/profile.st b/template/profile.st
index 7a3944f..855f8e2 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -2,6 +2,8 @@
 <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!">
     $head()$
     <link rel="stylesheet" type="text/css" media="screen"
           href="/static/profile.css">
diff --git a/template/xd_receiver.htm b/template/xd_receiver.htm
deleted file mode 100644
index 3c63739..0000000
--- a/template/xd_receiver.htm
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>xd</title></head><body><script src="http://static.ak.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script></body></html>
-\ No newline at end of file
author	Scott Ostler <sostler@deathmachine.local>	2010-04-02 17:06:57 -0400
committer	Scott Ostler <sostler@deathmachine.local>	2010-04-02 17:06:57 -0400
commit	0447dc0cbea30537eeb55604cad19e265d305585 (patch)
tree	9b9f78666824b0daa102d26be4c93e24195e79ad /template
parent	bd3925a4a19dd3b2c65abad579887b108d8f8546 (diff)
parent	aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff)