resolved merge

3 files changed, 8 insertions, 8 deletions

diff --git a/template/log.st b/template/log.st
index 425a0fb..7281e11 100755
--- a/template/log.st
+++ b/template/log.st
@@ -16,12 +16,9 @@
 
 
       <div id="log">   
-	<div id="loghead">
-
-	</div>
+	<div id="loghead"></div>
         <br>
 
-
         <div id="posts">  
     $if(dumps)$
     $dumps: { d | $logged_dump(dump=d)$ }$
@@ -31,7 +28,7 @@
       <div id="pnav">
 
           $if(next)$
-        	  <div id="pnavn"><a href="/$roomkey$/log/$next$">next &#9758;</a></div> 
+          <div id="pnavn"><a href="/$roomkey$/log/$next$">next &#9758;</a></div> 
           $endif$
 
           &nbsp;
diff --git a/template/logged_dump.st b/template/logged_dump.st
index dcda175..c7cbbd2 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -32,6 +32,7 @@ img{
     </style>
 <div class="logged-dump">
   <div>$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div>
+  <a href="/u/$dump.nick$"><img height="50" width="50" src="$dump.avatar$" /></a>
   <div class="content">$dump.content$</div>
   <hr />
 </div>
diff --git a/template/profile.st b/template/profile.st
index 04a28fb..b5d3f38 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -5,8 +5,8 @@
     <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>
+            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>
     <link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
@@ -15,7 +15,7 @@
     <script>
         jQuery(document).ready(function(){
             initProfile();
-        });  
+        });
   </script> 
 		
   </head>
@@ -46,6 +46,8 @@
 
           $if(is_home)$
           <div id="avatar" class="editable">$avatar$</div>
+          <input id="upload" value="Upload" type="submit">
+          <img id="spinner" src="/static/spinner.gif" style="display: none" />
           $endif$