sostler prod commit

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-06-05 04:05:57 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-06-05 04:05:57 -0400
commit: adaf759270d7222a4879a7e3adba2713dc86d8ad (patch)
tree: 0cd651184af919785e9000fe9a4f3c4f905fd14c /template
parent: 758c6d3e56ad4bb4e91a3be1b907c1511d7d677b (diff)
7 files changed, 240 insertions, 134 deletions
diff --git a/template/banner.st b/template/banner.st
index 9ee037a..3339fc2 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -2,7 +2,25 @@
   <div id="header7">
   <div id="logoicons">
     <div id="logo7">
-  <div align="center"><a href="http://dump.fm"><img src="/static/img/dumppixel.png"></a></div>
+  <div align="center">
+  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 /><style type='text/css'>
+a.img_roll:link, .img_roll{
+	width:130px;
+	height:46px;
+	display:block;
+	background-image:url(http://dump.fm/static/img/dumppixel.png);
+}
+a.img_roll:hover{
+	width:130px;
+	height:46px;
+	display:block;
+	background-image:url(http://dump.fm/static/img/dumppixelhover.png);
+}
+</style>
+<a class="img_roll" href="http://dump.fm/"></a>
+
+  
+  </div>
     </div>
     <div class="white">
       
@@ -20,7 +38,7 @@
 	    $else$
   
 
-<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>
+<a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a>
    
 	    $endif$     
 
@@ -32,7 +50,7 @@
 
     
     <div id="topic"></div>
-       <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)$ 
+       <div id="dumplist"> dump.fm - let pictures do the talking $if(user_nick)$-  <a href="http://dump.fm/$user_nick$/favorites">my favorite pics</a> -<a href="http://bieber.dump.fm"> - justin bieber </a>$endif$ $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>
 
 
@@ -41,7 +59,7 @@
       </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 align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="toplogin" class="white">   $form_login()$</div> $endif$
 
       
     </div>
diff --git a/template/nigga.st b/template/nigga.st
new file mode 100644
index 0000000..4a8ff02
--- /dev/null
+++ b/template/nigga.st
@@ -0,0 +1,135 @@
+<html>
+  <head>
+    <title>$nick$'s dump.fm</title>
+    $head()$
+    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.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> 
+      <style>
+    #chat-wrapper {
+        position: absolute;
+        z-index: 1000000;
+        right: 100px;
+        bottom: 100px;
+       height: 40px;
+       width: 300px;
+    };
+  </style>
+  </head>
+  <body class="profile">
+    $banner()$
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
+        </div>
+  
+        <div id="messagePane">
+          <div id="userList"><br>
+               <h2>   <br><br>
+                    $if(avatar)$
+               <img id="avatarPic" src="$avatar$"/>
+                $else$<br><br>
+              <img id="avatarPic" src="/static/img/noinfo.png">
+              $endif$
+               
+               $nick$               </h2><br>
+              $if(score_ent)$
+              <h8>
+              fav score: $score$ 
+              <h9>$score_ent$</h9>
+			  $endif$</h8>
+              $if(isadmin)$<br><br>
+               <div id="adminmute">
+              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+              </div>
+              $endif$
+
+         
+        
+             
+              
+              $if(is_home)$
+              <div id="avatar-editing" style="display: none">
+                <input id="uploadp" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+	     <br> <h3>contact info</h3>
+              $if(contact)$
+	      <br><br><div id="contact" class="linkify">$contact$</div>
+	      $else$
+	      <br><br><div><img id="contact" src="/static/img/noinfo.png"></div>
+	      $endif$            
+	      <br>
+              
+	      <br><br><h3>bio</h3>
+              $if(bio)$
+	     <br><br> <div id="bio" class="linkify">$bio$</div>
+	      $else$
+	      <br><br><div><img id="bio" src="/static/img/noinfo.png"></div>
+	      $endif$
+
+       
+    
+
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
+
+              <br>
+              
+         <a href="http://dump.fm/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
+              
+              <div id="date">
+                <div type="text" id="datepicker"></div></div>
+	    </div>
+	    
+	          <div id="favbox" style="display: hidden"></div>
+          <div id="messageList">
+          
+            $if(dumps)$ <span class="content">
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            
+            
+
+          </span>
+         
+
+
+	    $else$
+	    no dumps
+	    $endif$
+	    </div>
+	    
+
+         <div id="msgInputDiv">
+    <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" /> 
+                  <a href="#" onClick="alert('Coming soon!');return false"> <input id="msgSubmit"value="private message"/></a>
+             $if(prev)$
+              <a href="/$nick$/$prev$"><input id="upload" value="Prev"></a>
+  $else$
+<input id="upload">
+ $endif$
+
+          $if(next)$
+                       <a href="/$nick$/$next$">  <input id="webcam-button-upload" value="Next"></a>
+     $else$
+     <input id="webcam-button-upload" value="nomodumps">
+     $endif$
+     
+              
+             <a href="http://dump.fm/u/$nick$/favorites">  <button id="palette-button"><img src="/static/img/palette.gif"></button></a> 
+              
+              </div>
+  <div id="footerc">
+              $footer()$
+            </div>
+          </div>
+    </div></div></div>
+  </body>
+</html>
diff --git a/template/profile.st b/template/profile.st
index e530e4a..f648e43 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -8,38 +8,39 @@
     <script>
       jQuery(document).ready(initProfile);
     </script> 
+
   </head>
-  <body class="profile">
+  <body>
     $banner()$
-    <div id="chatrap">  
-      <div id="headerbar"></div>
-      <div id="log">
-        <div id="loghead">
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
         </div>
-        <br>
-        <div id="posts">
-          <div id="cats">
-            $if(dumps)$
-            $dumps:{ d | $profile_dump(dump=d)$ }$
-            <div id="profile">
-
-              <h2>$nick$               </h2><br>
+  
+        <div id="messagePanep">
+          <div id="userListp"><br>    $if(is_home)$<br>$endif$  
+               <h2>  
+                    $if(avatar)$
+               <img id="avatarPic" src="$avatar$"/>
+                $else$<br><br>
+              <img id="avatarPic" src="/static/img/noinfo.png">
+              $endif$
+                 
+               $nick$               </h2><br>
               $if(score_ent)$
               <h8>
               fav score: $score$ 
               <h9>$score_ent$</h9>
 			  $endif$</h8>
-              $if(isadmin)$
+              $if(isadmin)$<br><br>
                <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">
@@ -48,19 +49,18 @@
               </div>
               $endif$
               
-	      <h3>contact info</h3>
+	     <br> <h3>contact info</h3>
               $if(contact)$
-	      <div id="contact" class="linkify">$contact$</div>
+	      <br><div id="contact" class="linkify">$contact$</div>
 	      $else$
-	      <div><img id="contact" src="/static/img/noinfo.png"></div>
+	    <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
 	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
+	  
+	      <br><br><h3>bio</h3>
               $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
+	    <br> <div id="bio" class="linkify">$bio$</div>
 	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
+	     <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
 	      $endif$
 
        
@@ -68,7 +68,7 @@
 
               $if(is_home)$
               <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              <div id="edit-toggle"><a href="#">edit profile</a></div><br><br>
               $endif$
 
               <br>
@@ -78,98 +78,45 @@
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
 	    </div>
-
-
-	    $else$
-	    <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>
-  <a href="/$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="profile">
-              <h2>$nick$</h2>
-
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+	    
+	          <div id="favbox" style="display: hidden"></div>
+          <div id="messageList">
           
-              </div>
-              $endif$
+            $if(dumps)$ <span class="content">
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            
+            
 
-              $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="uploadp" 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$
+          </span>
+         
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
+	    $else$
+	    no dumps
 	    $endif$
-            
-	    <p>&nbsp;</p>
-	    <div id="pnav">
+	    </div>
+	    
 
-              $if(next)$
-              <div id="pnavn"><a href="/$nick$/$next$">next &#9758;</a></div> 
-              $endif$
+         <div id="msgInputDiv">
+    <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" /> 
+                  <a href="#" onClick="alert('Coming soon!');return false"> <input id="msgSubmit"value="private message"/></a>
+             $if(prev)$
+              <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
+  $else$
+<input id="prevbutton">
+ $endif$
 
-              &nbsp;
-              $if(prev)$
-              <div id="pnavo">  <a href="/$nick$/$prev$">&#9756; prev</a></div>
-              $endif$
+          $if(next)$
+                       <a href="/$nick$/$next$">  <input id="nextbutton" value="Next ->"></a>
+     $else$
+     <input id="nextbutton" value="nomodumps">
+     $endif$
+     
               
-              <br><br>
-            </div>
-
-            <div id="footer">
+             <a href="http://dump.fm/u/$nick$/favorites">  <button id="palette-button"><img src="/static/img/palette.gif"></button></a> 
+              
+              </div>
+  <div id="footerc">
               $footer()$
             </div>
           </div>
diff --git a/template/profile_dump.st b/template/profile_dump.st
index 43d995e..8866ae4 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -1,6 +1,6 @@
 <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <div>
-    $dump.created_on$  -- in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
+  <div id="profiletxt">
+     $dump.created_on$  -- in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
   </div>
   <a href="/u/$dump.nick$">  
   <div id="logavatar">
diff --git a/template/share_buttons.st b/template/share_buttons.st
index 02736dc..a251cff 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,8 +1,11 @@
 <div class="buttons">
   <span class="other-sites">
+  <div id="profiletxt"> 
     <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
     <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
     <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
     <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+    <a href="http://dump.fm/p/$dump.nick$/$dump.message_id$"><img src="http://dump.fm/static/img/link.gif"></a>
+    </div>
   </span>
 </div>
 \ No newline at end of file
diff --git a/template/single_message.st b/template/single_message.st
index df43eed..ab84668 100644
--- a/template/single_message.st
+++ b/template/single_message.st
@@ -3,7 +3,7 @@
     
     <title>dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/directory.css">
+    <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css">
     <script>
       jQuery(document).ready(initDirectory);
     </script>
@@ -12,30 +12,33 @@
   </head>
   <body>
     $banner()$
-    <div id="chatrap">
-      <div id="log">   
-	<div id="loghead"></div>
-        <br>
-        <div id="posts">            
-          <br>        
-          <div class="logged-dump" id="message-$message.message_id$">
-            <a href="/u/$message.nick$">
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
+        </div>
+  
+        <div id="messagePanep"> 
+            <a href="/u/$message.nick$"><br><br>
               <b>$message.nick$</b>
               $if(message.avatar)$
               <div style="border-image:url($message.avatar$)">  
-                <div id="logavatar">
+                <div id="avatarPic">
                   <img height="50" width="50" src="$message.avatar$"></img>
                 </div>
+                <hr>
               $endif$
             </a>
+                  <div id="messageList">
+          <div class="content" id="message-$message.message_id$">
+        
             <span class="linkify">$message.content$</span>
             <hr />
             </div>
             $share_buttons()$
           </div>
-          <!--<div id="footer">
+        <div id="footerc">
             $footer()$
-          </div>-->
+          </div>
         </div>
   </body>
 </html>
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
index cbc2f59..ced1ba4 100644
--- a/template/tagged_dumps.st
+++ b/template/tagged_dumps.st
@@ -12,7 +12,7 @@ $head()$
     <div id="chatrap">
       <div id="log">   
         <br>
-                         <div id="dprofile">
+                         <div id="profile">
             <h2>$page_title$ </h2><br><h3><br>
             
             
@@ -21,14 +21,14 @@ $head()$
             
             
             </div>
-        <div id="dposts">
+
           <br>
 
 $if(dumps)$
-  $dumps: { d |  <div class="dlogged-dump">$log_dump(dump=d)$
+  $dumps: { d |  $log_dump(dump=d)$
 
   
-  </div> }$
+}$
   $if(json_tags)$
 <script>
   $json_tags: { j | $j$;
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-06-05 04:05:57 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-06-05 04:05:57 -0400
commit	adaf759270d7222a4879a7e3adba2713dc86d8ad (patch)
tree	0cd651184af919785e9000fe9a4f3c4f905fd14c /template
parent	758c6d3e56ad4bb4e91a3be1b907c1511d7d677b (diff)