sostler prod commit

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-05-24 19:26:07 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-05-24 19:26:07 -0400
commit: 6fa2b731d3d8c5fd892e3debc3e3594259c74adf (patch)
tree: 8e5edd967177cfb2841afa6853685d4a67c02aa1 /template
parent: 7a22e6b6470d058c3eb7f12c2cb6db9d2de3bde7 (diff)
10 files changed, 202 insertions, 200 deletions
diff --git a/template/banner.st b/template/banner.st
index ef40476..000dfd9 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -2,7 +2,7 @@
   <div id="header7">
   <div id="logoicons">
     <div id="logo7">
-  <div align="center"><a href="http://dump.fm">dump.fm</a></div>
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/calm.gif">dump.fm</a></div>
     </div>
     <div class="white">
       
@@ -20,7 +20,7 @@
 	    $else$
   
 
-<a href="/register"><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" /> Join the Conversation!</a>
    
 	    $endif$     
 
@@ -32,15 +32,17 @@
 
     
     <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>
 
-      $if(isadmin)$
-      <div id="vippp">
-        <a href="http://vip.dump.fm/"> &#x2605; VIP &#x2605; </a>
+
+        -<a href="http://vip.dump.fm/">  VIP </a>
+              $endif$
       </div>
-      $endif$
+$if(user_nick)$
           <div id="logout7" class="white">   
-      <div align="center">$if(user_nick)$ <a href="/logout"> Logout</a> $else$ $form_login()$ $endif$
-      </div>
+      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="logout7" class="white">   $form_login()$</div> $endif$
+
       
     </div>
     <div align="center"><br /></div>
diff --git a/template/butt.st b/template/butt.st
index b3f118f..93c22b4 100644
--- a/template/butt.st
+++ b/template/butt.st
@@ -2,183 +2,149 @@
   <head>
     <title>$nick$'s dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/profiletest.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
-    <script src="/static/js/ajaxupload.js"></script>
-    <script>
-      jQuery(document).ready(initProfile);
-    </script> 
-    
-  </head>
-  <body>
-    $banner()$
-    <div id="chatrap">  
-      <div id="headerbar"></div>
+    <link rel="stylesheet" href="/static/css/nivo-slider.css" type="text/css" media="screen" />
+    <link rel="stylesheet" href="/static/css/indexxx.css" type="text/css" media="screen" />
+    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <script type="text/javascript" src="/static/js/jquery.simplyscroll-1.0.4.min.js"></script>
+<link rel="stylesheet" href="/static/css/jquery.simplyscroll-1.0.4.css" media="all" 
+type="text/css">
 
-      <div id="log">
-        <div id="loghead">
-        </div>
-        <br>
-        <div id="posts">
-          
-          <div id="cats">
-            $if(dumps)$
-            <div id="lolbanner">
-              <img src="/static/img/welcomebanner.gif">
-            </div>
-            
-            $dumps:{ d | $profile_dump(dump=d)$ }$
-            <div id="profile">
+<script type="text/javascript">
+(function() {
+	jQuery(function() { //on DOM ready
+		jQuery("#scroller").simplyScroll({
+		autoMode: 'loop',
+		pauseOnHover: false,
+			speed: 1
+		});
+	});
+})(jQuery);
 
-              <h2>$nick$</h2>
+</script>
 
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
-              </div>
-              $endif$
-
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-              
-              $if(is_home)$
-              <div id="avatar-editing" style="display: none">
-                <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/img/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/img/noinfo.png"></div>
-	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
-              $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
-	      $endif$
+    <script type="text/javascript">
+    
+jQuery(window).load(function() {
+	jQuery('#slider').nivoSlider({
+		effect:'random',
+		slices:15,
+		animSpeed:500,
+		pauseTime:5000,
+		startSlide:0, //Set starting Slide (0 index)
+		directionNav:false, //Next & Prev
+		directionNavHide:false, //Only show on hover
+		controlNav:false, //1,2,3...
+		controlNavThumbs:false, //Use thumbnails for Control Nav
+		controlNavThumbsSearch: '.jpg', //Replace this with...
+		controlNavThumbsReplace: '_thumb.jpg', //...this in thumb Image src
+		keyboardNav:false, //Use left & right arrows
+		pauseOnHover:false, //Stop animation while hovering
+		manualAdvance:false, //Force manual transitions
+		captionOpacity:0.8, //Universal caption opacity
+		beforeChange: function(){},
+		afterChange: function(){},
+		slideshowEnd: function(){} //Triggers after all slides have been shown
+	});
+});
+</script>
+  </head>
+  <body class="profile">
+<div id="rapper7">
+  <div id="header7">
+  <div id="logoicons">
+    <div id="logo7">
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/calm.gif">dump.fm</a></div>
+    </div>
+    <div class="white">
+      
+      <div id="bar7">    
+        <div style="float: left;">
+              	    
+	  </div>
+        </div>
+      </div>
+    </div>
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
+    
+    <div id="topic"></div>
+       <div id="dumplist"> 
+    <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>
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
 
-	    $else$
+        -<a href="http://vip.dump.fm/">  VIP </a>
 
+      </div>
+$if(user_nick)$
+          <div id="logout7" class="white">   
+      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="logout7" class="white">   $form_login()$</div> $endif$
 
-           <div id="newfavs"><img src="http://dump.fm/static/img/thumbs/heartover.gif"> You have 27 new favs!</div>
-            <div id="newdogs"><img src="http://dump.fm/static/img/directory.gif"> You have 27 new favs!</div>
-	    <div id="activestuff">blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>
-	    </div>
-	    <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <div>
-   $nick$'s first dump.fm post!  
+      
+    </div>
+    <div align="center"><br /></div>
+    
   </div>
-  <a href="/u/$nick$">  
-  <div id="logavatar">
-$if(dump.avatar)$
-  <img height="50" width="50" src="$dump.avatar$" /> 
-$else$  
-  <img height="50" width="50" src="/static/img/noinfo.png">  
-$endif$
-  </div></a>
-$if(dump.favorited)$
-  <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
-$else$
-  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
-$endif$
-  <div class="content2"><img src="/static/img/furieprofile.png"></div>
-<hr/>
-$share_buttons()$
 </div>
+<div id="clouds">
+        <div id="page">  
+    <div id="wrapper">  
+        <div id="container">  
+       
+<div id="leftstuff"><div id="signinrapper"><div id="signin"><p class="memebertxt">Already a member?</p></div>
+  <input type="text" id="nickInput" size="17" /><br>
+    <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+    <input type="password" id="passwordInput" size="17" /><br />
 
-	               <div id="profile">
-
-              <h2>$nick$</h2>
-
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
-              </div>
-              $endif$
-
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-              
-              $if(is_home)$
-              <div id="avatar-editing" style="display: none">
-                <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/img/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/img/noinfo.png"></div>
-	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
-              $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
-	      $endif$
+    <input id="signin-submit" value="Sign In!" />
+    <div id="remember"><label>
+        <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+        Remember Me
+    </label>
+  <br>
+  <a href="/reset-request">Lost password?</a><br>
+</div>
+</div></div>
+<div id="rightstuff"><p class="heading1"><i>The internet is more fun with dump.fm!</p></i><br>
+    <input id="register-submit" value="Sign Up!" />
+</div>
+</div>
+<div id="divide"></div>
+<div id="aboutdump"><div id="aboutl">
+<div class="heading1">What's dump.fm?</div> 
+<p class="body1">
+dump.fm is a social network of images. Post pix from anywhere on the net, your computer or right from your webcam in real-time with other people. 
+</p>
+ <div id="talkaboutus">
+<div id="slider">
+ <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
+ <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
+  <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/cnetquote.png"alt="" /></a>
+ </div></div>
+</div>
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
+<div id="cloud"></div>
+<div id="aboutr" class="right">
+<div class="heading1">What's being dumped now...</div>
+<p class="body1">
+Here are some rad images being posted</p>
+ <div id="talkaboutus">
+<ul id="scroller">
+	<li><img src="http://www.gossipboulevard.com/wp-content/uploads/2009/06/paris_cristiano_breakup-150x150.jpg"height="100px"width="100px"></li>
+	<li><img src="http://hollywooddame.com/wp-content/uploads/2009/02/hayden-panettiere-dumps-milo-ventimiglia-3-150x150.jpg"height="100px"width="100px"></li>
+	<li><img src="http://th00.deviantart.net/fs5/150/i/2004/293/b/e/Ode_to_Junkyards_and_dumps__by_nove.png"height="100px"width="100px"></li>
+	<li><img src="http://th06.deviantart.net/fs38/150/i/2008/331/4/4/AA__AJ_PW_Oekaki_Dumps_by_Kai_dono.png" height="100px"width="100px"></li>
+		<li><img src="http://www.redhorsetruck.com/prodimages/thumbs/multipurposebody%20tn.jpg"height="100px"width="100px"></li>
+		
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
-	    $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>
+</ul>  
+</div>
 
-            <div id="footer">
+</div></div></div></div></div>
+<div id="footerspace">
+            <div id="footeri">
               $footer()$
-            </div>
-          </div>
-    </div></div></div>
+            </div></div>
   </body>
 </html>
diff --git a/template/chat.st b/template/chat.st
index c54936b..a45ba4f 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -16,9 +16,10 @@
 
 <html>
 <head>
-  <title>dump.fm</title>
 $head()$
+  <title>dump.fm</title>
 
+<META name="keywords" content="credit, mortgage, dating, hot girls, hot guys, debt solutions, get rich quick"> 
   <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
   <script type="text/javascript" src="/static/js/invalid_domains.js"></script>
   <script type="text/javascript" src="/static/webcam/webcam.js"></script>
@@ -61,16 +62,20 @@ $endif$
 </head>
 <body>
 $banner()$
+
 $if(isadmin)$
 $tinychat()$
 $endif$
+
   <div id="chatrap">
 
       <div id="content">
         <div id="messagetabs"></div>
         <div id="rapper">
         </div>
-        <div id="userList">
+  
+        <div id="messagePane">
+              <div id="userList">
           $users: { u |
           <div class="username"><a href="/$u.nick$" target="_blank">
           $u.score_ent$
@@ -83,7 +88,6 @@ $endif$
             </div>
           }$
 	</div>
-        <div id="messagePane">
           <div id="messageList">
 $messages: { m |
             <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$">
@@ -100,6 +104,7 @@ $messages: { m |
 }$
             <hr />
           </div>
+          
           <div id="msgInputDiv">
               <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
                 <input id="msgSubmit" type="submit" value="Send"/>
@@ -119,7 +124,17 @@ $messages: { m |
   <div id="palette"><div id="palette-thumbs"></div></div>
   <div id="footerc">
     <p>
-$footer()$
+<script type="text/javascript"><!--
+google_ad_client = "pub-9863902168532765";
+/* 728x15, created 5/22/10 */
+google_ad_slot = "3981015107";
+google_ad_width = 728;
+google_ad_height = 15;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
     <p>
   </div>
 $preload()$
diff --git a/template/directory.st b/template/directory.st
index 02e47ad..d49dfea 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -50,14 +50,21 @@
           $else$
           <span>No more users!</span>
           $endif$
-          <div id="pnav">
-            $if(prev)$
-            <div id="pnavn"><a href="/directory$prev$">BACK</a></div>
-            $endif$
-            $if(users)$
-            <div id="pnavo"> <a href="/directory$next$">MOAR!</a></div>
-            $endif$            
-          </div>                
+
+  <div id="pnav">
+   $if(users)$
+              $if(next)$
+              <div id="pnavn"><a href="/directory$prev$">next &#9758;</a></div> 
+              $endif$
+  $endif$  
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/directory$prev$">&#9756; prev</a></div>
+              $endif$
+              
+              <br><br>
+            </div>
+
           <div id="footer">
             $footer()$
           </div>
diff --git a/template/form_login.st b/template/form_login.st
index 2f87e5a..4f07d0f 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -1,5 +1,5 @@
 <div id="login-container">
-  <div class="topnav"> Have an account?  <a href="login" class="signin"><span>Sign in</span></a> </div>
+  <div class="topnav"><a href="login" class="signin"><span>Sign in</span></a> </div>
   <fieldset id="signin_menu">
     <form onsubmit="return false">
       </p>
diff --git a/template/head.st b/template/head.st
index ec45d19..918dbc3 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,5 +1,5 @@
 <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="keywords" content="dump.fm,mortgage, dating, hot girls, hot guys, debt solutions, get rich quick,buy gold,free stuff, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board,credit,">
 <meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
@@ -18,8 +18,7 @@ $if(isadmin)$
       type="text/css" media="all" />
 <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js"
         type="text/javascript"></script>
-<script src="/static/js/admin.js"
-        type="text/javascript"></script>
+<script src="/static/js/admin.js" type="text/javascript"></script>
 $endif$
 
 <link rel="shortcut icon" href="/static/favicon.ico">
diff --git a/template/log.st b/template/log.st
index de118ec..a6f3a07 100644
--- a/template/log.st
+++ b/template/log.st
@@ -2,21 +2,23 @@
   <head>
     <title>dump.fm log</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/log.css">
+    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
     <script>
       jQuery(document).ready(initLog);
     </script>
   </head>
-  <body>
+ <body class="profile">
     $banner()$
     <div id="chatrap">
       <div id="log">   
-	<div id="loghead"></div>
         <br>
-        <div id="posts">  
-          <div id="lolbanner">
-            <img src="/static/img/welcomebanner.gif">
-          </div>
+                         <div id="lprofile">
+            <h2> $roomkey$ log </h2><br><h3></h3>      
+            </div>
+            
+             <div id="dposts">
+          <br>
+     
           $if(dumps)$
           $dumps: { d | $log_dump(dump=d)$ }$
           $if(json_tags)$
diff --git a/template/preload.st b/template/preload.st
index 3339e4e..b14f8b9 100644
--- a/template/preload.st
+++ b/template/preload.st
@@ -2,12 +2,6 @@
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big" />
    <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" />
+   <img src="/static/img/fade-blue.png" class="invisible" />
+   <img src="/static/img/calm.gif" class="invisible" />
 </div>
 \ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index 61be826..0634b05 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -78,6 +78,19 @@
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
 	    </div>
+ <div id="adsenseprofile" style="display:none;">
+	    <script type="text/javascript"><!--
+google_ad_client = "pub-9863902168532765";
+/* 200x200, created 5/23/10 */
+google_ad_slot = "0464631788";
+google_ad_width = 200;
+google_ad_height = 200;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+</div> 
 
 	    $else$
 	    <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
diff --git a/template/tinychat.st b/template/tinychat.st
index 58ecba3..818d60a 100644
--- a/template/tinychat.st
+++ b/template/tinychat.st
@@ -5,8 +5,12 @@ $if(user_nick)$
   , nick: "$user_nick$"
   , oper: "none"
   , urlsuper: "http://dump.fm"
+  , join: "auto"
+  , nick: "dumpuser"
   };
+  
 </script>
+
 <script src="http://tinychat.com/js/embed.js"></script>
-<div id="chat-wrapper"><h3>Tinychat Friends<h3><div id="client"></div></div>
+<div id="tinychat-wrapper"><h3>Tinychat Friends<h3><div id="client"></div></div>
 $endif$
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-05-24 19:26:07 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-05-24 19:26:07 -0400
commit	6fa2b731d3d8c5fd892e3debc3e3594259c74adf (patch)
tree	8e5edd967177cfb2841afa6853685d4a67c02aa1 /template
parent	7a22e6b6470d058c3eb7f12c2cb6db9d2de3bde7 (diff)