Merge branch 'master' of ssh://dump.fm/pichat/repo

1 files changed, 21 insertions, 3 deletions

diff --git a/template/profile.st b/template/profile.st
index 8d8a019..3aae2c2 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -50,14 +50,14 @@
           
 	  <br> <h3>contact info</h3>
           $if(contact)$
-	  <div id="contact" class="linkify">$contact$</div>
+	  <div id="contact" class="linkify-text">$contact$</div>
 	  $else$
           <img id="contact" src="/static/img/noinfo.png">
 	  $endif$            
 	  <br>
 	  <h3>bio</h3>
           $if(bio)$
-	  <div id="bio" class="linkify">$bio$</div>
+	  <div id="bio" class="linkify-text">$bio$</div>
 	  $else$
 	  <img id="bio" src="/static/img/noinfo.png">
 	  $endif$
@@ -74,8 +74,10 @@
   	<h2><a href="http://dump.fm/$nick$/log">$if(is_home)$ your $else$ $nick$'s$endif$ posts &#10145;</a></h2>
 	<hr>
 	<h2><a href="http://dump.fm/$nick$/favorites"> $if(is_home)$ your $else$ $nick$'s $endif$ favs &#10145;</a></h2>
-	<hr>
+	
+  <hr>
 	<a href="http://dump.fm/$nick$/popular"><h3> $if(is_home)$ your $else$ $nick$'s$endif$ most popular &#10145;</h3></a>
+  
       </div>
     <div id="dashpix">
 	<a href="http://dump.fm/$nick$/log"><div id="favstxt">$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps</div></a>
@@ -88,7 +90,23 @@
         style="border:none; width:500px; height:30px"></iframe>
               </div>
 
+    </div>
+    $if(isadmin)$
+    <br />
+    <div id="directmsgs">
+      <h2>Messages</h2>
+        $dms: { dm |
+        <div class="directmsg">
+        <b><a href="/$dm.nick$">$dm.nick$</a></b>
+        <img src="$dm.avatar$" height="20" width="20" />
+        <span class="linkify-full">$dm.content$</span>
       </div>
+      }$
+    </div>
+    <script>
+      var Recips = $recips$;
+    </script>
+    $endif$
     
     </div>
 <div id="footerc">