From e6fc8fe57e0ad75313f839fe60a5bb442f7954fb Mon Sep 17 00:00:00 2001
From: Scott Ostler <scottbot9000@gmail.com>
Date: Tue, 22 Jun 2010 04:53:56 -0400
Subject: Added infobar to favs page, added mini-profile template

---
 template/log_dump.st     |   2 +-
 template/logged_dump.st  |  20 ---------
 template/mini_profile.st |  37 +++++++++++++++
 template/tagged_dumps.st |  81 ++++++++++++++-------------------
 template/userlog.st      | 114 +++++++++++++----------------------------------
 5 files changed, 103 insertions(+), 151 deletions(-)
 delete mode 100755 template/logged_dump.st
 create mode 100644 template/mini_profile.st

(limited to 'template')

diff --git a/template/log_dump.st b/template/log_dump.st
index 9173ffc..fca3b82 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="/$dump.nick$">$dump.nick$</b>
+$dump.created_on$  -- by <a href="/$dump.nick$"><b>$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
deleted file mode 100755
index fd3403b..0000000
--- a/template/logged_dump.st
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<div class="logged-dump" id="message-$dump.message_id$">
-  <div>$dump.created_on$  -- by <b><a href="/$dump.nick$">$dump.nick$</a></b></div>
-
-  <a href="/u/$dump.nick$">
-  
-  <div id="logavatar">
-  
-  $if(dump.avatar)$<img height="50" width="50" src="$dump.avatar$" />
-  
-  $else$
-  
-  <img height="50" width="50" src="/static/noinfo.png">
-  
-  $endif$
-  </div></a>
-  <div class="content">$dump.content$</div>
-  <hr />
-  $share_buttons()$
-</div>
diff --git a/template/mini_profile.st b/template/mini_profile.st
new file mode 100644
index 0000000..bdb58ec
--- /dev/null
+++ b/template/mini_profile.st
@@ -0,0 +1,37 @@
+<div id="userListp"><br>
+  <h2>     
+    $if(avatar)$
+    <img id="avatarPic" src="$avatar$"/>
+    $else$<br><br>
+    <img id="avatarPic" src="/static/img/noinfo.png">
+    $endif$
+    
+    <a href="http://dump.fm/$nick$">$nick$</a></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$
+
+  <div><a href="http://dump.fm/$nick$/log">dumps posted: $dump_cnt$</a></div>
+  <div><a href="http://dump.fm/$nick$/favorites">dumps $nick$ faved: $dumps_user_faved_cnt$</a></div>
+  
+  <br> <h3>contact info</h3>
+  $if(contact)$
+  <br><div id="contact" class="linkify">$contact$</div>
+  $else$
+  <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
+  $endif$            
+  
+  <br><br><h3>bio</h3>
+  $if(bio)$
+  <br> <div id="bio" class="linkify">$bio$</div>
+  $else$
+  <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
+  $endif$
+</div>
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
index 26437d7..a5bef9c 100644
--- a/template/tagged_dumps.st
+++ b/template/tagged_dumps.st
@@ -11,57 +11,44 @@
     $banner()$
     <div id="dcontent">
       <div id="messagetabs"></div>
-      <div id="rapper">
-      </div>
+      <div id="rapper"></div>
       <div id="messagePanep">
-        <div id="userListp">
-          $if(avatar)$
-          <div style="border-image:url($avatar$)">
-            <div id="avatarPic">
-              <img style="padding-top: 5px;" height="50" width="50" src="$avatar$"></img>
-            </div>
-	  </div>
-          $endif$
-          <h8>$page_title$<br></h8><br>
-	  </div>
-	  <div id="messageList">
-
-	    $if(dumps)$ <span class="content">
-	      $dumps: { d |  $log_dump(dump=d)$ }$
-
-            </span>
-	    $if(json_tags)$
-	    <script>
-	      $json_tags: { j | $j$; }$
-	    </script>
-	    $endif$
+	$infobar$
+	<div id="messageList">
+	  
+	  $if(dumps)$ <span class="content">
+	    $dumps: { d |  $log_dump(dump=d)$ }$
+          </span>
+	  $if(json_tags)$
+	  <script>
+	    $json_tags: { j | $j$; }$
+	  </script>
+	  $endif$
+	  $else$
+          <span>favless</span>
+	  $endif$
+	</div>
+	
+        <div id="msgInputDiv">
+	  <div id="msginputrapper"> 
+            
+            $if(prev)$
+            <a href="/$page_url$/$prev$"><input id="prevbutton" value="<- Prev"></a>
 	    $else$
-            <span>favless</span>
+	    <input id="prevbutton">
 	    $endif$
-	  </div>
-
-
-          <div id="msgInputDiv">
-	    <div id="msginputrapper"> 
-              
-              $if(prev)$
-              <a href="/$page_url$/$prev$"><input id="prevbutton" value="<- Prev"></a>
-	      $else$
-	      <input id="prevbutton">
-	      $endif$
 
-              $if(next)$
-              <a href="/$page_url$/$next$">  <input id="nextbutton" value="Next ->"></a>
-	      $else$
-	      <input id="nextbutton" value="nomodumps">
-	      $endif$
-	      
-
-            </div>
-	    <div id="footerc">
-              $footer()$
-            </div>
+            $if(next)$
+            <a href="/$page_url$/$next$">  <input id="nextbutton" value="Next ->"></a>
+	    $else$
+	    <input id="nextbutton" value="nomodumps">
+	    $endif$
           </div>
-    </div></div></div>
+	  <div id="footerc">
+            $footer()$
+          </div>
+        </div>
+      </div>
+    </div>
   </body>
 </html>
diff --git a/template/userlog.st b/template/userlog.st
index 850e55b..e393e03 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -12,94 +12,42 @@
   </head>
   <body>
     $banner()$
-      <div id="dcontent">
-        <div id="messagetabs"></div>
-        <div id="rapper">
-        </div>
-  
-        <div id="messagePanep">
-          <div id="userListp"><br>  
-               <h2>     
-                    $if(avatar)$
-               <img id="avatarPic" src="$avatar$"/>
-                $else$<br><br>
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-                 
-          <a href="http://dump.fm/$nick$">  $nick$               </a></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$
-
-               <div><a href="http://dump.fm/$nick$/log">dumps posted: $dump_cnt$</a></div>
-               <div><a href="http://dump.fm/$nick$/favorites">dumps $nick$ faved: $dumps_user_faved_cnt$</a></div>
-        
-              
-	     <br> <h3>contact info</h3>
-              $if(contact)$
-	      <br><div id="contact" class="linkify">$contact$</div>
-	      $else$
-	    <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
-	      $endif$            
-	  
-	      <br><br><h3>bio</h3>
-              $if(bio)$
-	    <br> <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	     <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
-	      $endif$
-
- 
-
-	    </div>
-	    
-
-          <div id="messageList">
-          
-            $if(dumps)$ <span class="content">
+    <div id="dcontent">
+      <div id="messagetabs"></div>
+      <div id="rapper">
+      </div>
+      
+      <div id="messagePanep">
+	$mini_profile$
+        <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"> 
+            $mini_profile()$
+            $if(prev)$
+            <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
 	    $else$
-	    no dumps
+	    <input id="prevbutton">
 	    $endif$
-	    </div>
-	    
 
-
-         <div id="msgInputDiv">
-    <div id="msginputrapper"> 
-                 
-             $if(prev)$
-              <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
-  $else$
-<input id="prevbutton">
- $endif$
-
-          $if(next)$
-                       <a href="/$nick$/$next$">  <input id="nextbutton" value="Next ->"></a>
-     $else$
-     <input id="nextbutton" value="nomodumps">
-     $endif$
-     
-
-              </div>
-  <div id="footerc">
-              $footer()$
-            </div>
+            $if(next)$
+            <a href="/$nick$/$next$">  <input id="nextbutton" value="Next ->"></a>
+	    $else$
+	    <input id="nextbutton" value="nomodumps">
+	    $endif$
+          </div>
+	  <div id="footerc">
+            $footer()$
           </div>
-    </div></div></div>
+        </div>
+      </div>
+    </div>
   </body>
 </html>
-- 
cgit v1.2.3-70-g09d2