sostler prod commit

6 files changed, 28 insertions, 21 deletions

diff --git a/template/banner.st b/template/banner.st
index 000dfd9..f541393 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -20,7 +20,7 @@
 	    $else$
   
 
-<a href="/register" id="registerlink"><img src="/static/img/ako.gif"width="21px" height="21px" /> Join the Conversation!</a>
+<a href="/register" id="registerlink"><img src="/static/img/ako.gif"width="21px" height="21px" /> dump.fm lets you share pictures in real-time. Click here to get started!</a>
    
 	    $endif$     
 
@@ -32,8 +32,8 @@
 
     
     <div id="topic"></div>
-       <div id="dumplist"> dump.fm:let pictures do the talking$if(isadmin)$ 
-    <a href="http://news.dump.fm">news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
+       <div id="dumplist"> dump.fm - let pictures do the talking -  <a href="http://dump.fm/$user_nick$/favorites">my favorite pics</a> -<a href="http://bieber.dump.fm"> - justin bieber </a>$if(isadmin)$ 
+    <a href="http://news.dump.fm">- news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
 
 
         -<a href="http://vip.dump.fm/">  VIP </a>
diff --git a/template/chat.st b/template/chat.st
index a45ba4f..fe0abc0 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -48,6 +48,8 @@ $endif$
       if (window.focus) {newwindow.focus()}
     }
     jQuery(document).ready(startTitleUpdater);
+
+
   </script>
   <style>
     #chat-wrapper {
@@ -64,7 +66,8 @@ $endif$
 $banner()$
 
 $if(isadmin)$
-$tinychat()$
+<div id="tinychattab" style="display:none;">tinychat
+$tinychat()$</div>
 $endif$
 
   <div id="chatrap">
diff --git a/template/directory.st b/template/directory.st
index d9129ff..6d16942 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -19,7 +19,11 @@
       <div id="log">   
         <br>
                          <div id="dprofile">
-            <h2> DUMP STARS </h2><br><h3>Ordered by fav count</h3>
+            <h2> Directory </h2><br><h3>Ordered by fav count<br>
+            
+            
+            
+            </h3>
             
             
             </div>
@@ -29,22 +33,22 @@
           $if(users)$
           $users:{ dump | 
           <div class="dlogged-dump" id="message-$dump.message_id$">
-            <a href="/$dump.nick$">
+                <div id="usernicks"> <a href="/$dump.nick$"> <b>$dump.nick$'s</b>
               $if(dump.score_ent)$
-              <h8>
+           
                 fav score: $dump.score$ 
                 <h9>$dump.score_ent$</h9>
-              </h8>
+              </a></div>
 	      $endif$
-            <div id="usernicks">  <b>$dump.nick$</b></div>
+          
               $if(dump.avatar)$
-              <div id="dlogavatar">
+             <a href="/$dump.nick$">  <div id="dlogavatar">
                 <img height="50" width="50" src="$dump.avatar$" />
               </div>
               $else$
               <div id="dlogavatar">
                 <img height="50" width="50" src="/static/img/noinfo.png" />
-              </div>
+              </div></a>
               $endif$
             </a>
             <div id="infotxt"><b>last post</b></div>
@@ -60,7 +64,7 @@
   <div id="pnav">
    $if(users)$
               $if(next)$
-              <div id="pnavn"><a href="/directory$prev$">next &#9758;</a></div> 
+              <div id="pnavn"><a href="/directory$next$">next &#9758;</a></div> 
               $endif$
   $endif$  
               &nbsp;
diff --git a/template/form_login.st b/template/form_login.st
index 4f07d0f..33d240d 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -16,16 +16,16 @@
         <input id="passwordInput" name="passwordInput" title="password" tabindex="5" type="password">
       </p>
 
-      <p>
+
+
+      <p class="remember"><br>
+<input id="signin-submitform" value="Sign in" tabindex="6" type="submit">
+<br><br>
         <label>
           <input type="checkbox" name="rememberme" id="remembermeInput" checked="checked"/>
           Remember Me
         </label>
       </p>
-
-      <p class="remember"><br>
-<input id="signin-submit" value="Sign in" tabindex="6" type="submit">
-      </p>
     </form>
   </fieldset>
 </div>
diff --git a/template/mail/welcome.st b/template/mail/welcome.st
index c708ef4..7cd47fc 100644
--- a/template/mail/welcome.st
+++ b/template/mail/welcome.st
@@ -1,4 +1,4 @@
-SUBJECT: Welcome to dump.fm, $nick$!
+SUBJECT: welcome to dump.fm, $nick$!
 <html>
 <body style="background-color:#EEF2FF;padding-left:60px;padding-right:60px;padding-top:35px;padding-bottom:35px;-moz-border-radius:15px;border-radius:15px;-webkit-border-radius:15px;">
 <div style="padding:15px;
@@ -16,7 +16,7 @@ border:1px dashed #cccccc;width:460px;background-color:white;">
 </pre></strong>
 <hr width="70%"align="left">
 <p style="width:380px;"><b>
- DUMP.FM IS A REAL TIME IMAGE BASED MESSAGE BOARD! Post pics from your webcam, your computer or anywhere on the web instantly with other awesome people! Get started by setting up your profile <a href="http://dump.fm/u/$nick$">here</a>! 
+ dump.fm lets you share images in real-time. Post pics from your webcam, computer or anywhere on the web instantly with other rad folks. Get started by setting up your profile <a href="http://dump.fm/u/$nick$">here</a>! 
 <br><br>
 Happy dumping!
 <br><br>
diff --git a/template/tinychat.st b/template/tinychat.st
index 818d60a..f182470 100644
--- a/template/tinychat.st
+++ b/template/tinychat.st
@@ -6,11 +6,11 @@ $if(user_nick)$
   , oper: "none"
   , urlsuper: "http://dump.fm"
   , join: "auto"
-  , nick: "dumpuser"
+  , nick: "dumpfm"
   };
   
 </script>
 
 <script src="http://tinychat.com/js/embed.js"></script>
-<div id="tinychat-wrapper"><h3>Tinychat Friends<h3><div id="client"></div></div>
+<div id="tinychat-wrapper"><div id="client"></div></div>
 $endif$