sostler prod commit

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-05-04 13:00:32 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-05-04 13:00:32 -0400
commit: 9fd7bb2df6ea4ec14ab4b53f403738a7fc83f570 (patch)
tree: d992deab93e9d1c3b4e509d632709b1d9a082e58 /template
parent: a4e5f1dfa6bb0a710dcb987a56445deeccc048ce (diff)
7 files changed, 181 insertions, 299 deletions
diff --git a/template/banner.st b/template/banner.st
index c954584..d67e36d 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -13,7 +13,7 @@
 
 
       <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="/$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>
             
diff --git a/template/butt.st b/template/butt.st
index e97390e..b3f118f 100644
--- a/template/butt.st
+++ b/template/butt.st
@@ -1,302 +1,184 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
-<html> 
-<head> 
-<title>dump.fm image vortex</title>
-<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="/static/js/pichat.butt.js"></script>
-<script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
-<script type="text/javascript" src="/static/js/sha1.js"></script>
-<link rel="stylesheet" type="text/css" href="/static/css/reset.css">
-<link rel="stylesheet" type="text/css" href="/static/css/header.css">
-$if(!user_nick)$
-<link href="/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
-$endif$
+<html>
+  <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>
 
-$if(isadmin)$
-<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css"
-      type="text/css" media="all" />
-<link rel="stylesheet" href="/static/css/admin.css"
-      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>
-$endif$
-$if(!user_avatar)$
-  <link rel="stylesheet" type="text/css" href="/static/css/dumpnewuser.css">
-$endif$
-  <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
-  <script type="text/javascript" src="/static/webcam/webcam.js"></script>
-  <script type="text/javascript" src="/static/js/tooltip.js"></script>
-  <script type="text/javascript" src="/static/js/away.js"></script>
-  <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
-$if(user_nick)$
-  <script type="text/javascript" src="/json/$user_nick$/favorites"></script>
+      <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">
+
+              <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$
+
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
+
+              <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$
+
+
+           <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>
+  <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$
-  <script>
-    jQuery(document).ready(initChat);
-    var Nick = $json_user_nick$;
-    var Room = $json_room_key$;
-    var Timestamp = $timestamp$;
-$if(isadmin)$
-    var IsAdmin = true;
+  </div></a>
+$if(dump.favorited)$
+  <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
-    var IsAdmin = false;
+  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
-    if (Nick) {
-      jQuery(document).ready(function() { setupUpload('upload', Room); });
-    }
-    function showAlert() { alert('MUST LOGIN'); }
-    var newwindow;
-    function pop(url) {
-      newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
-      if (window.focus) {newwindow.focus()}
-    } 
-  </script>
+  <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>
+              $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$
 
-<style type="text/css"> 
-	html { 
-		overflow: hidden; 
-	} 
-	body { 
-		margin: 0px; 
-		padding: 0px; 
-		background: #111; 
-		position: absolute; 
-		width: 100%; 
-		height: 100%; 
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
 
-		cursor: crosshair; 
-	} 
-	#canvas { 
-		position:absolute; 
-		left: 0%; 
-		top: 0%; 
-		width: 100%; 
-		height: 100%; 
-		background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
-		overflow: hidden; 
-	} 
-	#canvas img { 
-		position: absolute; 
-		background: #666; 
-		overflow: hidden; 
-		cursor: pointer; 
-		left: 100%; 
-		border-color: #000; 
-		border-style: solid; 
-		border-width: 1px; 
-		-ms-interpolation-mode:nearest-neighbor; 
-	} 
-	#canvas span { 
-		position: absolute; 
-		color: #9C9; 
-		font-family: 'courier new', typewriter, matrix, monospace; 
-		font-size: 0px; 
-		white-space: nowrap; 
-		left: -1000px; 
-		background: #010; 
-		filter: alpha(opacity=90); 
-		opacity: 0.9; 
-	} 
-</style> 
-<script type="text/javascript"> 
-// ================================================== 
-// script realized by G�rard Ferrandez - June 2006 
-// http://www.dhteumeuleu.com 
-// ================================================== 
- 
-id = function(o) { return document.getElementById(o); } 
-px = function (x) {	return ''.concat(Math.round(x), 'px'); } 
- 
-////////////////////////////////////////////////////////////////////////////// 
-function resize() {	gf.resize(); } 
-onresize = resize; 
- 
-document.onmousemove = function(e) 
-{ 
-	if(window.event) e=window.event; 
-	gf.xm = (e.x || e.clientX) - gf.nx - gf.nw * .5; 
-	gf.ym = (e.y || e.clientY) - gf.ny - gf.nh * .5; 
-} 
- 
-////////////////////////////////////////////////////////////////////////////// 
-var gf = { 
-	O    : [], 
-	cont : 0, 
-	N    : 0, 
-	S    : 0, 
-	img  : 0, 
-	spa  : 0, 
-	xm   : 0, 
-	ym   : 0, 
-	nx   : 0, 
-	ny   : 0, 
-	nw   : 0, 
-	nh   : 0, 
-	cx   : 0, 
-	cy   : 0, 
-	zoom : 1, 
-	x    : 0, 
-	y    : 0, 
-	z    : -40000, 
-	xt   : 0, 
-	yt   : 0, 
-	zt   : 0, 
-////////////////////////////////////////////////////////////////////////////// 
-	resize : function () 
-	{ 
-		var o   = id('canvas'); 
-		gf.nx   = o.offsetLeft; 
-		gf.ny   = o.offsetTop; 
-		gf.nw   = o.offsetWidth; 
-		gf.nh   = o.offsetHeight; 
-		gf.zoom = gf.nh / 700; 
-	}, 
- 
-	CObj : function (n) 
-	{ 
-		this.n                = n; 
-		this.x                = gf.zoom * Math.random() * gf.nw * 2 - gf.nw; 
-		this.y                = gf.zoom * Math.random() * gf.nh * 2 - gf.nh; 
-		this.z                = Math.round(n * (10000 / gf.N)); 
-		this.w                = gf.img[n].width; 
-		this.h                = gf.img[n].height; 
-		this.oxt              = gf.spa[n]; 
-		this.oxs              = this.oxt.style; 
-		this.txt              = gf.spa[n].innerHTML; 
-		this.oxt.innerHTML    = ""; 
-		this.obj              = gf.img[n]; 
-		this.obs              = this.obj.style; 
-		this.obj.parent       = this; 
-		this.obj.onclick      = function() { this.parent.click(); } 
-		this.obj.ondrag       = function() { return false; } 
-		this.oxt.style.zIndex = this.obj.style.zIndex = Math.round(1000000 - this.z); 
-		this.F                = false; 
-		this.CF               = 100; 
-		this.sto              = []; 
- 
-		this.anim = function() 
-		{ 
-			var f = 700 + this.z - gf.z; 
-			if (f > 0) 
-			{ 
-				var d               = 1000 / f; 
-				var X               = gf.nw * .5 + ((this.x - gf.x - gf.cx) * d); 
-				var Y               = gf.nh * .5 + ((this.y - gf.y - gf.cy) * d); 
-				var W               = d * this.w * gf.zoom; 
-				var H               = d * this.h * gf.zoom; 
-				this.obs.left       = px(X - W * .5); 
-				this.obs.top        = px(Y - H * .5); 
-				this.obs.width      = px(W); 
-				this.obs.height     = px(H); 
-				this.oxs.visibility = (this.CF-- > 0 && Math.random() > .9) ? "hidden" : "visible"; 
-				this.oxs.left       = px(X - W * .5); 
-				this.oxs.top        = px(Y + H * .5); 
-				if((gf.zt - gf.z) < 20) 
-				{ 
-					if(!this.F) 
-					{ 
-						this.F            = true; 
-						this.CF           = Math.random() * 200; 
-						this.oxs.fontSize = px(1 + d * 20 * gf.zoom); 
-						var T             = ""; 
-						var tn            = this.txt.length; 
-						for(var i = 0; i < tn; i++) 
-						{ 
-							T = T.concat(this.txt.charAt(i)); 
-							this.sto[i] = setTimeout('gf.O['.concat(n, '].oxt.innerHTML = "', T.concat("_"), '";'), Math.round(f / 4) + 32 * i); 
-						} 
-					} 
-				} 
-				else 
-				{ 
-					this.F = false; 
-					this.oxt.innerHTML = ""; 
-				} 
-			} 
-			else 
-			{ 
-				this.x  = gf.zoom * Math.random() * gf.nw * 2 - gf.nw; 
-				this.y  = gf.zoom * Math.random() * gf.nh * 2 - gf.nh; 
-				this.z += 10000; 
-				this.oxs.zIndex = this.obs.zIndex = Math.round(1000000 - this.z); 
-			} 
-		} 
- 
-		this.cto = function() 
-		{ 
-			var i = this.txt.length; 
-			while (i--) clearTimeout(this.sto[i]); 
-		} 
- 
-		this.click = function() 
-		{ 
-			var i = gf.N; 
-			while (i--) gf.O[i].cto(); 
-			if(gf.S != this) 
-			{ 
-				gf.xt = this.x; 
-				gf.yt = this.y; 
-				gf.zt = this.z; 
-				gf.S  = this; 
-			} 
-			else 
-			{ 
-				gf.S   = 0; 
-				gf.zt += 1600; 
-			} 
-		} 
-	}, 
- 
-	init : function () 
-	{ 
-		gf.cx   = gf.nw / 2; 
-		gf.cy   = gf.nh / 2; 
-		gf.cont = id("canvas"); 
-		gf.img  = id("canvas").getElementsByTagName("img"); 
-		gf.spa  = id("canvas").getElementsByTagName("span"); 
-		gf.N    = gf.img.length; 
-		for (var i = 0; i < gf.N; i++) gf.O[i] = new gf.CObj(i); 
-		gf.run(); 
-		gf.O[0].click(); 
-	}, 
- 
-	run : function () 
-	{ 
-		gf.cx += (gf.xm - gf.cx) * .1; 
-		gf.cy += (gf.ym - gf.cy) * .1; 
-		gf.x  += (gf.xt - gf.x)  * .05; 
-		gf.y  += (gf.yt - gf.y)  * .05; 
-		gf.z  += (gf.zt - gf.z)  * .05; 
-		var i = gf.N; 
-		while (i--) gf.O[i].anim(); 
-		setTimeout(gf.run, 16); 
-	} 
-} 
- 
-onload = function() { 
-	resize(); 
-	gf.init(); 
-} 
- 
-</script> 
-</head> 
- 
-<body> 
- 
-<div id="canvas"> 
-$messages: { m |
-<img src="$m.content$"><span>$m.nick$</span> 
- }$
+              <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$
 
-</div> 
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
+              $endif$
+              
+              <br><br>
+            </div>
 
-<!-- crossbrowser images_loading_bar - Gerard Ferrandez - www.dhteumeuleu.com - Feb 2005 --> 
-<span id="LB0" style="position:absolute;left:50%;top:50%;"><span style="position:absolute;font-family:arial;font-size:10px;color:#ccc;background:#000;left:-50px;top:-18px">Loading...</span><span style="position:absolute;left:-50px;top:-5px;font-size:1px;width:100px;height:10px;background:#333"><span id="LB1" style="position:absolute;font-size:1px;width:0px;height:10px;background:#ccc"></span></span></span> 
-<script type="text/javascript">m00=document.getElementById("canvas").getElementsByTagName("img");m01=m00.length;function images_loading_bar(){m02=0;for(i=0;i<m01;i++)m02+=(m00[i].complete)?1:0;document.getElementById("LB1").style.width=Math.round(m02/m01*100)+'px';if(m02==m01)setTimeout("document.getElementById('LB0').style.display='none'",128); else setTimeout("images_loading_bar()", 64);};images_loading_bar();</script> 
-<!-- end of images_loading_bar code --> 
- 
-</body> 
+            <div id="footer">
+              $footer()$
+            </div>
+          </div>
+    </div></div></div>
+  </body>
 </html>
diff --git a/template/chat.st b/template/chat.st
index 8c290b7..0b4ad10 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -46,7 +46,7 @@ $banner()$
         </div>
         <div id="userList">
           $users: { u |
-          <div class="username"><a href="/u/$u.nick$" target="_blank">
+          <div class="username"><a href="/$u.nick$" target="_blank">
               $if(u.avatar)$
               <img src="$u.avatar$" width="50" height="50">
               $else$
@@ -61,7 +61,7 @@ $banner()$
 $messages: { m |
             <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$">
               <span class="nick">
-                <b><a href="/u/$m.nick$">$m.nick$</a></b>
+                <b><a href="/$m.nick$">$m.nick$</a></b>
   $if(m.favorited)$
     <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)">
   $else$
diff --git a/template/directory.st b/template/directory.st
index bea2f58..fd5449a 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -31,7 +31,7 @@
           $if(users)$
           $users:{ dump | 
           <div class="logged-dump" id="message-$dump.message_id$">
-            <a href="/u/$dump.nick$">
+            <a href="/$dump.nick$">
             <div id="usernicks">  <b>$dump.nick$</b></div>
               $if(dump.avatar)$
               <div id="logavatar">
diff --git a/template/log_dump.st b/template/log_dump.st
index 633338f..9173ffc 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -4,7 +4,7 @@ $else$
   <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
 $endif$
 
-$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</b>
+$dump.created_on$  -- by <b><a href="/$dump.nick$">$dump.nick$</b>
     <div id="logavatar">
 $if(dump.avatar)$
       <img height="50" width="50" src="$dump.avatar$" /> 
diff --git a/template/logged_dump.st b/template/logged_dump.st
index 3b8336a..fd3403b 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -1,6 +1,6 @@
 
 <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>
+  <div>$dump.created_on$  -- by <b><a href="/$dump.nick$">$dump.nick$</a></b></div>
 
   <a href="/u/$dump.nick$">
   
diff --git a/template/profile.st b/template/profile.st
index 46f0bb6..431e51b 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -91,7 +91,7 @@
   <div>
    $nick$'s first dump.fm post!  
   </div>
-  <a href="/u/$nick$">  
+  <a href="/$nick$">  
   <div id="logavatar">
 $if(dump.avatar)$
   <img height="50" width="50" src="$dump.avatar$" />
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-05-04 13:00:32 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-05-04 13:00:32 -0400
commit	9fd7bb2df6ea4ec14ab4b53f403738a7fc83f570 (patch)
tree	d992deab93e9d1c3b4e509d632709b1d9a082e58 /template
parent	a4e5f1dfa6bb0a710dcb987a56445deeccc048ce (diff)