Merge Share indent

11 files changed, 77 insertions, 26 deletions

diff --git a/template/about_us.st b/template/about_us.st
index 1ea4df9..61c0a4a 100644
--- a/template/about_us.st
+++ b/template/about_us.st
@@ -73,7 +73,7 @@ You can shoot us an email at
     </div>
     </div>
     </div>
-
+<div id="hugescreen"><img src="/static/hugescreen.png"></div>
   
           <div id="footer">
 	  $footer()$
diff --git a/template/banner.st b/template/banner.st
index b58a2b5..5f396bc 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -12,22 +12,20 @@
         <div style="float: left;">
           <div align="center">
             $if(user_nick)$
-            <ul id="banner-menu">
-            <li><div id="lastli"><a href="/">.</a></div></li>
-              <li><a href="/log"><img src="/static/text.gif" > Log</a></li>
-               <li><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></li>
-                  <li><a href="/directory"><img src="/static/directory.gif"width="20px" height="20px" /> Directory</a></li>
-              <li><a href="/browser"><img src="/static/image_draw.gif"/> Image Search</a></li>
-            </ul>
+
+
+      <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>
+            
 	    $else$
   
 
-    <ul id="banner-menu">
-	                   <li><div id="lastli"><a href="/">.</a></div></li>
 
-            <li><a href="/register"><img src="/static/answer_good.gif" />Register</a></li>
+<a href="/register"><img src="/static/answer_good.gif"width="20px" height="20px" />Register</a>
+
 
- </ul>
    
 	    $endif$            
           </div>            	    
diff --git a/template/chat.st b/template/chat.st
index 6bdefc8..d8ff954 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -108,8 +108,10 @@ $else$
     <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) }, 10000 ) })
+    jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide(1000) }, 100000 ) })
     </script>
     </div>       $endif$
     <div id="footerc">
diff --git a/template/directory.st b/template/directory.st
index 1296edf..aec8363 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -32,7 +32,7 @@
           $users:{ u | 
           <div class="logged-dump" id="message-$u.message_id$">
             <a href="/u/$u.nick$">
-              <b>$u.nick$</b>
+            <div id="usernicks">  <b>$u.nick$</b></div>
               $if(u.avatar)$
               <div id="logavatar">
                 <img height="50" width="50" src="$u.avatar$" />
diff --git a/template/footer.st b/template/footer.st
index f791f2b..838d4bf 100755
--- a/template/footer.st
+++ b/template/footer.st
@@ -1,8 +1,8 @@
 <div id="footer" style="text-align: center">
 @2010 <a href="/">dump.fm</a>
-<a href="/about_us">About Us</a> 
+<a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
 
-<a href="/help">Help FAQ</a> 
+<a href="/help"><span style="word-spacing:normal;">Help FAQ</span></a> 
 <a href="/terms">Terms</a>
 <a href="/privacy">Privacy</a></div>
 
diff --git a/template/head.st b/template/head.st
index fdf5fea..7ba802d 100755
--- a/template/head.st
+++ b/template/head.st
@@ -42,4 +42,54 @@ jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif');
 
     jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })});
 
-</script>
\ No newline at end of file
+</script>
+
+
+<p><!--[if IE]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV>
+<![endif]-->
+<!--[if IE 5]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if IE 5.0]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if IE 5.5]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if IE 7]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if gte IE 5]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if lt IE 6]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if lte IE 5.5]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><br />
+<![endif]-->
+<!--[if gt IE 7]>
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
+</DIV><![endif]-->
+<!--[if gt IE 8]>
+According to the conditional comment this is Internet Explorer greater than 6<br />
+<![endif]-->
+</p>
diff --git a/template/help.st b/template/help.st
index f8510b2..9d8628e 100644
--- a/template/help.st
+++ b/template/help.st
@@ -61,7 +61,8 @@ background-attachment:fixed;" onload="
     </div>
     </div>
     </div>
-
+<div id="hugescreen"><img src="/static/hugescreen.png"></div>
+  
   
           <div id="footer">
 	  $footer()$
diff --git a/template/log_dump.st b/template/log_dump.st
index 49aab4b..d48baf1 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -1,8 +1,8 @@
-<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 class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$">
+
+    $dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</b>
+
+
   <div id="logavatar">
   
   $if(dump.avatar)$
diff --git a/template/privacy.st b/template/privacy.st
index 501664d..a133ac2 100644
--- a/template/privacy.st
+++ b/template/privacy.st
@@ -61,7 +61,7 @@ background-attachment:fixed;" onload="
     </div>
     </div>
     </div>
-
+<div id="hugescreen"><img src="/static/hugescreen.png"></div>
   
           <div id="footer">
 	  $footer()$
diff --git a/template/profile_dump.st b/template/profile_dump.st
index 52001d6..b93c2fc 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -1,4 +1,4 @@
-<div class="logged-dump" id="message-$dump.message_id$">
+<div class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$">
   <div>
     $dump.created_on$  -- in <b><a href="/$dump.key$/chat">$dump.key$</a></b>
   </div>
diff --git a/template/terms.st b/template/terms.st
index b041848..2f23cee 100644
--- a/template/terms.st
+++ b/template/terms.st
@@ -61,7 +61,7 @@ background-attachment:fixed;" onload="
     </div>
     </div>
     </div>
-
+<div id="hugescreen"><img src="/static/hugescreen.png"></div>
   
           <div id="footer">
 	  $footer()$