fixing merge conflicts

author: tim b <timb@camcompu.home> 2010-04-07 18:59:50 -0700
committer: tim b <timb@camcompu.home> 2010-04-07 18:59:50 -0700
commit: 6440348618ade4fbcb541c40473074833a47d198 (patch)
tree: 537ab7e4f0af7deba51bbfb360fe490968d651f8 /template
parent: 4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff)
parent: 42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff)
17 files changed, 360 insertions, 61 deletions
diff --git a/template/about_us.st b/template/about_us.st
index 6cd04dc..7431eac 100644
--- a/template/about_us.st
+++ b/template/about_us.st
@@ -3,23 +3,19 @@
   <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" />
   <link href="/static/css/win.css" rel="stylesheet" type="text/css" media="screen" /> 
   <script type="text/javascript" src="/static/js/win.js"></script> 
-
-            <script type="text/javascript">
+  <script type="text/javascript">
 			
 jQuery(function()
 {
 	jQuery('.scroll-pane').jScrollPane();
 });	
-			
-			
  </script>
-
-    <title>dump.fm</title>
+ <title>dump.fm: about us</title>
     $head()$
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
 	background-color:#ffffee;
-	background-image:url(/static/chanbg.png);
+	background-image:url(/static/img/chanbg.png);
 	background-repeat:repeat-x;
 	background-position:1 10;
 background-attachment:fixed;" onload="    
@@ -36,33 +32,33 @@ background-attachment:fixed;" onload="
         
     <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
     	<div style="padding:0px" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/dumpclouds.png"><br><br>
+<img src="/static/img/dumpclouds.png"><br><br>
 <h5 style="padding:2px;">
-DUMP.FM is a <img src="/static/newanim.gif"> exciting tool for the internets; allowing pictures to be used for realtime communication and collaboration. Users can send image URLs (which display instantly in the chat), upload locally from their hard drive or post a pics right from their webcam. Every image gets stored in your DUMP.FM log, similarly, a log is kept of the entire collaboration. 
+DUMP.FM is a <img src="/static/img/newanim.gif"> exciting tool for the internets; allowing pictures to be used for realtime communication and collaboration. Users can send image URLs (which display instantly in the chat), upload locally from their hard drive or post a pics right from their webcam. Every image gets stored in your DUMP.FM log, similarly, a log is kept of the entire collaboration. 
 </center><br></div></h5>
     </div></div>
     
  
     
     <div style="display:none;"id="link">
-	<div id="content" name="content"style="background-image:url(/static/hearts.gif);background-repeat:repeat;"> 
-<img src="/static/dumpteam.gif"><br><br>
+	<div id="content" name="content"style="background-image:url(/static/img/hearts.gif);background-repeat:repeat;"> 
+<img src="/static/img/dumpteam.gif"><br><br>
 <h1><br>
 <a href="/u/ryder">Ryder Ripps</a> - screams, rapping<br></h1>
-    <h2>  <img src="/static/dot.gif"> Ryder is also the founder of <a href="http://www.internetarchaeology.org" target="_blank">Internet Archaeology</a></h2>
+    <h2>  <img src="/static/img/dot.gif"> Ryder is also the founder of <a href="http://www.internetarchaeology.org" target="_blank">Internet Archaeology</a></h2>
   <h1><a href="/u/scottbot">Scott Ostler</a> - clean vocals <br></h1>
-        <h2>  <img src="/static/dot.gif"> Scott also worked on the development of <a href="http://www.simile-widgets.org/exhibit/"target="_blank">MIT Exhibit</a></h2>
+        <h2>  <img src="/static/img/dot.gif"> Scott also worked on the development of <a href="http://www.simile-widgets.org/exhibit/"target="_blank">MIT Exhibit</a></h2>
  <h1><a href="/u/timb">Tim Baker</a> - synths, guitars, beats, backing vocals <br></h1>
-        <h2>  <img src="/static/dot.gif"> Tim also helped make <a href="http://www.delicious.com" target="_blank">delicious</a></h2>
+        <h2>  <img src="/static/img/dot.gif"> Tim also helped make <a href="http://www.delicious.com" target="_blank">delicious</a></h2>
 <h1><a href="/u/stefan">Stefan Moore</a> - beats, fog machine, lights <br></h1>
-            <h2>  <img src="/static/dot.gif"> Stefan is also one half of <a href="http://www.that-go.net" target="_blank">That-Go</a></h2>
+            <h2>  <img src="/static/img/dot.gif"> Stefan is also one half of <a href="http://www.that-go.net" target="_blank">That-Go</a></h2>
 </h1>
     </div>
     </div>
     <div style="display:none;background-color:#fff;"id="contact">
 	<div id="content" name="content"> 
 
-    	<center><div style="background-color:#fff"><br><br><img src="/static/tvfun.gif"><img src="/static/tvfun.gif"><img src="/static/tvfun.gif"><br><br>
+    	<center><div style="background-color:#fff"><br><br><img src="/static/img/tvfun.gif"><img src="/static/img/tvfun.gif"><img src="/static/img/tvfun.gif"><br><br>
 
 
 <h5><br>
@@ -72,7 +68,7 @@ You can shoot us an email at
     </div>
     </div>
     </div>
-<div id="hugescreen"><img src="/static/hugescreen.png"></div>
+<div id="hugescreen"><img src="/static/img/hugescreen.png"></div>
   
           <div id="footer">
 	  $footer()$
diff --git a/template/banner.st b/template/banner.st
index 9c6198c..02613c6 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -4,7 +4,6 @@
   <div id="logoicons">
     <div id="logo7">
   <div align="center"><a href="/">dump.fm</a></div>
-      <div id="strapline"><img src="/static/talkwith.png" width="179" height="53" /></div>
     </div>
     <div class="white">
       
@@ -14,16 +13,16 @@
             $if(user_nick)$
 
 
-      <a href="/log" ><img src="/static/text.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/home4.gif"width="22px" height="22px" />$endif$ Profile</a>
-                  <a href="/directory"><img src="/static/directory.gif"width="20px" height="20px" /> Directory</a>
-             <a href="/browser"><img src="/static/image_draw.gif"/> Image Search</a>
+      <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/ako.gif"width="21px" height="21px" /> Register</a>
+<a href="/register"><img src="/static/img/ako.gif"width="21px" height="21px" /> Register</a>
 </div>
 
    
@@ -43,7 +42,7 @@
       </div>
       $endif$
           <div id="logout7" class="white">   
-      <div align="center">$if(user_nick)$ <a href="/logout"><img src="/static/door2.gif" width="16" height="16" /> Logout</a> $else$ $form_login()$ $endif$
+      <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>
       
     </div>
diff --git a/template/browser.st b/template/browser.st
index 28a514d..8cb6403 100644
--- a/template/browser.st
+++ b/template/browser.st
@@ -49,9 +49,7 @@
 	  </div>          
           <div id="messagePane">
             <div id="messageList">
-              <iframe src="/static/search/browser.html" 
-                      allowtransparency="true" 
-                      scrolling="auto" ></iframe>
+              <iframe src="/static/search/browser.html"  allowtransparency="true" scrolling="auto" ></iframe>
             </div>
 
           </div>
diff --git a/template/butt.st b/template/butt.st
new file mode 100644
index 0000000..b14df64
--- /dev/null
+++ b/template/butt.st
@@ -0,0 +1 @@
+Hi
diff --git a/template/debug.st b/template/debug.st
new file mode 100644
index 0000000..c9bbcdb
--- /dev/null
+++ b/template/debug.st
@@ -0,0 +1,56 @@
+<html>
+  <head>
+    <title>dump.fm DEBUG</title>
+    $head()$
+    <style>
+      #main {      
+      padding: 100px 2em 0px 2em;
+      }
+      #flash {
+          border: 2px solid red;
+          margin: 0 auto;
+          padding: 1em;
+          width: 75%
+      }
+      label {
+          float: left;
+          width: 100px;
+      }
+    </style>
+  </head>
+  <body>
+    $banner()$
+    <div id="main">
+
+      $if(flash)$
+      <div id="flash">$flash$</div>
+      <br><br><br>
+      $endif$
+
+      <form action="/debug" method="POST">
+      <h1>Registration Email</h1>
+      <br>
+      <label>To:</label>
+      <input name="to" value="$user_email$">
+      <br>
+      <label>Nick:</label>
+      <input name="nick" value="$user_nick$">
+      <br>
+      <label>Template:</label>
+      <div>
+      $mailtemps: { t |
+      <input type="radio" name="template" value="$t.template$" 
+             $if(t.selected)$checked="checked"$endif$> $t.template$
+      }$
+      </div>
+      <br>
+      <input type="submit" value="Send Email">
+      <input type="hidden" name="action" value="regemail">
+      <br>
+      <form/>
+    </div>
+  </body>
+</html>
+  
+  
+ 
diff --git a/template/directory.st b/template/directory.st
index 9135947..05d13e2 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -25,7 +25,7 @@
           <center>
             <h2>&#x272D; &#x272D; DUMP STARS  &#x272D; &#x272D;</h2>
             <div id="lolbanner">
-              <img src="/static/welcomebanner.gif">
+              <img src="/static/img/welcomebanner.gif">
             </div>
           </center>          
           $if(users)$
@@ -39,7 +39,7 @@
               </div>
               $else$
               <div id="logavatar">
-                <img height="50" width="50" src="/static/noinfo.png" />
+                <img height="50" width="50" src="/static/img/noinfo.png" />
               </div>
               $endif$
             </a>
diff --git a/template/form_login.st b/template/form_login.st
index ad61bbb..7d7adf5 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -24,7 +24,7 @@
       </p>
 
       <p class="remember"><br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="/static/signin.gif" id="signin-submit">
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="/static/img/signin.gif" id="signin-submit">
         
         <!-- <input id="signin-submit" value="Sign in" tabindex="6" type="submit"> -->
       </p>
diff --git a/template/head.st b/template/head.st
index cb2d0fb..8634534 100644
--- a/template/head.st
+++ b/template/head.st
@@ -12,7 +12,6 @@ $if(!user_nick)$
 $endif$
 <link rel="shortcut icon" href="/static/favicon.ico">
 <script type="text/javascript">
-jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); });
 </script>
 <!--[if IE]>
 <script>
diff --git a/template/help.st b/template/help.st
index 24285d6..d1a999c 100644
--- a/template/help.st
+++ b/template/help.st
@@ -3,7 +3,7 @@
       <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen"/>
            <link href="/static/css/win.css" rel="stylesheet" type="text/css" media="screen"/> 
            <script type="text/javascript" src="/static/js/win.js"></script> 
- <script type="text/javascript" src="/static/jquery.em.js"></script> 
+ 
             <script type="text/javascript">
 			
 jQuery(function()
@@ -19,11 +19,12 @@ jQuery(function()
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
 	background-color:#ffffee;
-	background-image:url(/static/chanbg.png);
+	background-image:url(/static/img/chanbg.png);
 	background-repeat:repeat-x;
 	background-position:1 10;
 background-attachment:fixed;" onload="    
              javascript:CreateDropdownWindow('dump.fm', '360px', true, 'news', 30, 115);
+ 
                 javascript:CreateDropdownWindow('frequently asked questions', '520px', true, 'archive', 440, 60); 
          
               
@@ -36,18 +37,18 @@ background-attachment:fixed;" onload="
         
     <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
     	<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/dumpclouds.png"><br><br>
+<img src="/static/img/dumpclouds.png"><br><br>
 <h5>
 &#169;2010 All Rights Reserved<br><br>
 <a href="mailto:info@dump.fm"> info@dump.fm</a>
 </center><br></div></h5>
     </div></div>
-    
+     
     <div style="display:none;"id="archive">
 	<div style="padding:0px" id="content" name="content"> 
 
 
-    <iframe src="/static/help.html" style="overflow-x:hidden; padding:5;background-image:url(/static/hearts.gif);background-repeat:repeat;" width="510px" height="500px"></iframe>
+    <iframe src="/static/html/help.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="510px" height="500px"name="iframe"></iframe>
     </div>
         </div> 
     <div style="display:none;"id="link">
@@ -60,7 +61,7 @@ background-attachment:fixed;" onload="
     </div>
     </div>
     </div>
-<div id="hugescreen"><img src="/static/hugescreen.png"></div>
+<div id="hugescreen"><img src="/static/img/hugescreen.png"></div>
   
   
           <div id="footer">
diff --git a/template/logged_dump.st b/template/logged_dump.st
new file mode 100755
index 0000000..3b8336a
--- /dev/null
+++ b/template/logged_dump.st
@@ -0,0 +1,20 @@
+
+<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/preload.st b/template/preload.st
index 8963e70..3339e4e 100644
--- a/template/preload.st
+++ b/template/preload.st
@@ -1,13 +1,13 @@
 <!-- todo: just put this lot in javascript? -->
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big" />
-   <img src="/static/upload.png" class="invisible" />
-   <img src="/static/dblue2.png" class="invisible" />
-<img src="/static/text.gif" class="invisible" />
-<img src="/static/directory.gif" class="invisible" />
-<img src="/static/image_draw.gif" class="invisible" />
-<img src="/static/door2.gif" class="invisible" />
-<img src="/static/cambutton.png" class="invisible" />
-<img src="/static/urlbutton.png" class="invisible" />
-<img src="/static/upbutton.png" class="invisible" />
+   <img src="/static/img/upload.png" class="invisible" />
+   <img src="/static/img/dblue2.png" class="invisible" />
+<img src="/static/img/log.gif" class="invisible" />
+<img src="/static/img/directory.gif" class="invisible" />
+<img src="/static/img/image_draw.gif" class="invisible" />
+<img src="/static/img/door.gif" class="invisible" />
+<img src="/static/img/cambutton.png" class="invisible" />
+<img src="/static/img/urlbutton.png" class="invisible" />
+<img src="/static/img/upbutton.png" class="invisible" />
 </div>
 \ No newline at end of file
diff --git a/template/privacy.st b/template/privacy.st
index 9c0c90e..d904951 100644
--- a/template/privacy.st
+++ b/template/privacy.st
@@ -4,6 +4,7 @@
            <link href="/static/css/win.css" rel="stylesheet" type="text/css" media="screen"/> 
            <script type="text/javascript" src="/static/js/win.js"></script> 
  <script type="text/javascript" src="/static/jquery.em.js"></script> 
+
             <script type="text/javascript">
 			
 jQuery(function()
@@ -19,7 +20,7 @@ jQuery(function()
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
 	background-color:#ffffee;
-	background-image:url(/static/chanbg.png);
+	background-image:url(/static/img/chanbg.png);
 	background-repeat:repeat-x;
 	background-position:1 10;
 background-attachment:fixed;" onload="    
@@ -36,7 +37,7 @@ background-attachment:fixed;" onload="
         
     <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
     	<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/dumpclouds.png"><br><br>
+<img src="/static/img/dumpclouds.png"><br><br>
 <h5>
 &#169;2010 All Rights Reserved<br><br>
 <a href="mailto:info@dump.fm"> info@dump.fm</a>
@@ -47,7 +48,7 @@ background-attachment:fixed;" onload="
 	<div style="padding:0px" id="content" name="content"> 
 
 
-    <iframe src="/static/privacy.html" style="overflow-x:hidden; padding:5;background-image:url(/static/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
+    <iframe src="/static/html/privacy.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
     </div>
         </div> 
     <div style="display:none;"id="link">
diff --git a/template/profile.st b/template/profile.st
index e4dd467..e89a285 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -24,7 +24,7 @@
           <div id="cats">
             $if(dumps)$
             <div id="lolbanner">
-              <img src="/static/welcomebanner.gif">
+              <img src="/static/img/welcomebanner.gif">
             </div>
             
             $dumps:{ d | $profile_dump(dump=d)$ }$
@@ -34,14 +34,14 @@
               $if(avatar)$
               <img id="avatarPic" src="$avatar$" width="150px"/>
               $else$
-              <img id="avatarPic"><img src="/static/noinfo.png">
+              <img id="avatarPic"><img src="/static/img/noinfo.png">
               $endif$
               
               $if(is_home)$
               <div id="avatar-editing" style="display: none">
                 <div id="avatar" class="editable">$avatar$</div>
                 <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/spinner.gif" style="display: none" />
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
               </div>
               $endif$
               
@@ -49,7 +49,7 @@
               $if(contact)$
 	      <div id="contact" class="linkify">$contact$</div>
 	      $else$
-	      <div><img id="contact" src="/static/noinfo.png"></div>
+	      <div><img id="contact" src="/static/img/noinfo.png"></div>
 	      $endif$            
 	      <br>
               
@@ -57,7 +57,7 @@
               $if(bio)$
 	      <div id="bio" class="linkify">$bio$</div>
 	      $else$
-	      <div><img id="bio" src="/static/noinfo.png"></div>
+	      <div><img id="bio" src="/static/img/noinfo.png"></div>
 	      $endif$
 
               $if(is_home)$
@@ -93,7 +93,7 @@
               <div id="avatar-editing">
                 <div id="avatar" class="editable">$avatar$</div>
                 <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/spinner.gif" style="display: none" />
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
               </div>
               $endif$
               
diff --git a/template/profile.st.save b/template/profile.st.save
new file mode 100644
index 0000000..7a3944f
--- /dev/null
+++ b/template/profile.st.save
@@ -0,0 +1,145 @@
+
+<html>
+  <head>
+    <title>$nick$'s dump.fm</title>
+    $head()$
+    <link rel="stylesheet" type="text/css" media="screen"
+          href="/static/profile.css">
+    <script src="/static/jquery.editinplace.1.0.1.packed.js"
+            type="text/javascript"></script>
+    <script src="/static/js/ajaxupload.js"></script>
+    <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>     
+    <script>
+      jQuery(document).ready(initProfile);
+    </script> 
+    
+  </head>
+  <body>
+    $banner()$
+    <div id="chatrap">  
+      <div id="headerbar"></div>
+
+      <div id="log">
+        <div id="loghead">
+        </div>
+        <br>
+        <div id="posts">
+          
+          <div id="cats">
+            $if(dumps)$
+            <div id="lolbanner">
+              <img src="/static/welcomebanner.gif">
+            </div>
+            
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            <div id="profile">
+
+              <h2>$nick$</h2>
+              $if(avatar)$
+              <img id="avatarPic" src="$avatar$" width="150px"/>
+              $else$
+              <img id="avatarPic"><img src="/static/noinfo.png">
+              $endif$
+              
+              $if(is_home)$
+              <div id="avatar-editing" style="display: none">
+                <div id="avatar" class="editable">$avatar$</div>
+                <input id="upload" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+	      <h3>contact info</h3>
+              $if(contact)$
+	      <div id="contact" class="linkify">$contact$</div>
+	      $else$
+	      <div><img id="contact" src="/static/noinfo.png"></div>
+	      $endif$            
+	      <br>
+              
+	      <h3>bio</h3>
+              $if(bio)$
+	      <div id="bio" class="linkify">$bio$</div>
+	      $else$
+	      <div><img id="bio" src="/static/noinfo.png"></div>
+	      $endif$
+
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
+
+              <br>
+              <div id="date">
+                <div type="text" id="datepicker"></div></div>
+	    </div>
+
+	    $else$
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+            <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+            <div id="newuser">
+              <h2>Welcome to dump.fm</h2>
+              <br><br>
+              
+              <h1>Step &#x2776;</h1>
+              <h3>&#x261F; Find a sweet image for your avatar, paste the URL below &#x261F;</h3>
+	      $if(avatar)$
+              <img id="avatarPic" src="$avatar$" width="150px"/>
+              $else$
+              <b id="avatarPic"></b>
+              $endif$
+              
+              $if(is_home)$
+              <div id="avatar-editing">
+                <div id="avatar" class="editable">$avatar$</div>
+                <input id="upload" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+              <h1>Step &#x2777;</h1>
+              <h3>&#x261F; Enter some contact info below &#x261F;</h3>
+              <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div>
+              <br>
+              
+              <h1>Step &#x2778;</h1>
+              <h3>&#x261F; Enter some personal info below &#x261F;</h3>
+              <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div>
+              <br>
+              <h1>Step &#x2779;</h1>
+              
+              <h3> <a href="/chat">Join the &#x2663; and start posting pictures!</a></h3>
+	      <h3>&nbsp;</h3></div>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>	  
+            <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    $endif$
+            
+	    <p>&nbsp;</p>
+	    <div id="pnav">
+
+              $if(next)$
+              <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div> 
+              $endif$
+
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
+              $endif$
+              
+              <br><br>
+            </div>
+
+            <div id="footer">
+              $footer()$
+            </div>
+          </div>
+    </div></div></div>
+  </body>
+</html>
diff --git a/template/profile_dump.st b/template/profile_dump.st
index 0020c70..ff5ff8c 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -8,7 +8,7 @@
   $if(dump.avatar)$
   <img height="50" width="50" src="$dump.avatar$" /> 
   $else$  
-  <img height="50" width="50" src="/static/noinfo.png">  
+  <img height="50" width="50" src="/static/img/noinfo.png">  
   $endif$
 
   </div></a>
diff --git a/template/terms.st b/template/terms.st
index 5297503..286593c 100644
--- a/template/terms.st
+++ b/template/terms.st
@@ -3,7 +3,6 @@
       <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen"/>
            <link href="/static/css/win.css" rel="stylesheet" type="text/css" media="screen"/> 
            <script type="text/javascript" src="/static/js/win.js"></script> 
- <script type="text/javascript" src="/static/jquery.em.js"></script> 
             <script type="text/javascript">
 			
 jQuery(function()
@@ -19,7 +18,7 @@ jQuery(function()
   </head>
   <body style="font-family: Arial, Helvetica, sans-serif;
 	background-color:#ffffee;
-	background-image:url(/static/chanbg.png);
+	background-image:url(/static/img/chanbg.png);
 	background-repeat:repeat-x;
 	background-position:1 10;
 background-attachment:fixed;" onload="    
@@ -36,7 +35,7 @@ background-attachment:fixed;" onload="
         
     <div style="overflow:hidden; height:600px; position:absolute;display:none;" id="news">
     	<div style="padding:0px;" id="content" name="content"> <div style="background-color:#fff"><center>
-<img src="/static/dumpclouds.png"><br><br>
+<img src="/static/img/dumpclouds.png"><br><br>
 <h5>
 &#169;2010 All Rights Reserved<br><br>
 <a href="mailto:info@dump.fm"> info@dump.fm</a>
@@ -47,7 +46,7 @@ background-attachment:fixed;" onload="
 	<div style="padding:0px" id="content" name="content"> 
 
 
-    <iframe src="/static/terms.html" style="overflow-x:hidden; padding:5;background-image:url(/static/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
+    <iframe src="/static/html/terms.html" style="overflow-x:hidden; padding:5;background-image:url(/static/img/hearts.gif);background-repeat:repeat;" width="550px" height="500px"></iframe>
     </div>
         </div> 
     <div style="display:none;"id="link">
@@ -60,7 +59,7 @@ background-attachment:fixed;" onload="
     </div>
     </div>
     </div>
-<div id="hugescreen"><img src="/static/hugescreen.png"></div>
+<div id="hugescreen"><img src="/static/img/hugescreen.png"></div>
   
           <div id="footer">
 	  $footer()$
diff --git a/template/test.st b/template/test.st
new file mode 100644
index 0000000..ee6a4c6
--- /dev/null
+++ b/template/test.st
@@ -0,0 +1,84 @@
+
+  <head>
+    <title>dump.fm</title>
+    <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!">
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+<script type="text/javascript" src="/static/js/sha1.js"></script>
+<script type="text/javascript" src="/static/js/home.js"></script>
+
+<script>
+$(document).ready(initLoginForm);
+
+</script>         
+<link rel="stylesheet" type="text/css" href="static/css/reset.css">  
+<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"><title>dump.fm</title></head>
+
+</head>
+<body>
+
+<div id="main" align="center">
+  
+  <img src="/static/img/flyhorse.gif" id="horse" />
+  <img src="/static/img/guaranteed_customer_satisfaction.gif" id="customer" />
+  
+  <div id="registerbox">
+    <div id="logo-and-text">
+      <a href="/"><img src="/static/img/dumpclearlogo.png"></a>
+      <p align="center" class="line">Talk with pictures!</p>
+      <div align="right" class="txt">
+        <br>
+        <div align="center">dump.fm lets you talk with pictures<br>
+        <a href="/register" style="text-decoration:none;">Click here to Register!</a> <br>
+        </div>
+      </div>
+    </div>
+    <input type="text" id="nickInput" size="17" />
+    <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+    <input type="password" id="passwordInput" size="17" /><br />
+
+
+    <!-- <br /><a id="signin-submit">Sign In</a> -->
+    <input id="signin-submit" value="Sign In" />
+        <div id="remember"><label>
+      <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+      Remember Me
+    </label></div>
+  </div>
+</div>
+<div id="info" align="right">
+  <img src="/static/img/vxhtml.gif">
+  <img src="/static/img/aol_suck.gif">
+    <img src="/static/img/html_3_2.gif">
+      <img src="/static/img/geocities.gif">
+  <img src="/static/img/valid_html.gif">
+ 
+</div>
+<div id="dumpednow">
+
+            
+</div>
+<div id="preload">
+  <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+</div>
+
+
+      <div id="preload">
+        <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+      </div>
+
+      <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+        try {
+        var pageTracker = _gat._getTracker("UA-12364576-1");
+        pageTracker._trackPageview();
+        } catch(err) {}
+      </script>
+  </body>
+
author	tim b <timb@camcompu.home>	2010-04-07 18:59:50 -0700
committer	tim b <timb@camcompu.home>	2010-04-07 18:59:50 -0700
commit	6440348618ade4fbcb541c40473074833a47d198 (patch)
tree	537ab7e4f0af7deba51bbfb360fe490968d651f8 /template
parent	4f09c8a882e8ae2ad1c7944a8c2a5939c9c9f7ad (diff)
parent	42df4633bb7588e8632e45013880ee4fc2bc3d6c (diff)