diff options
| author | Scott Ostler <sostler@Scott-Ostlers-MacBook-Pro.local> | 2010-06-10 01:17:21 -0400 |
|---|---|---|
| committer | Scott Ostler <sostler@Scott-Ostlers-MacBook-Pro.local> | 2010-06-10 01:17:21 -0400 |
| commit | 0ff4dd1bbd2c917c28727346947a95f9c31e7b53 (patch) | |
| tree | 575da643c24aca57b7601e6dcf2274e9d49a4c76 | |
| parent | 50322cc12ba7c4d3b690d1844c1a7b865b0a038a (diff) | |
Added avatar to favorite page
| -rw-r--r-- | src/site.clj | 18 | ||||
| -rw-r--r-- | template/tagged_dumps.st | 111 |
2 files changed, 65 insertions, 64 deletions
diff --git a/src/site.clj b/src/site.clj index 47226f9..9a5cda3 100644 --- a/src/site.clj +++ b/src/site.clj @@ -730,8 +730,9 @@ FROM users u ;; message-user-id: get messages posted by this user ;; tag-user-id: get messages tagged by this user (defnk tagged-dumps-template [session params tags url page-title :message-user-id false - :tag-user-id false - :logger (make-time-logger)] + :tag-user-id false + :avatar nil + :logger (make-time-logger)] (let [st (fetch-template "tagged_dumps" session) offset (maybe-parse-int (params :offset) 0) dump-offset (* offset *dumps-per-page*) @@ -750,6 +751,8 @@ FROM users u (.setAttribute st "prev" (max (dec offset) 0))) (.setAttribute st "dumps" dumps) (.setAttribute st "page_title" page-title) + (if avatar + (.setAttribute st "avatar" avatar)) (.setAttribute st "page_url" url) (.setAttribute st "debug_log_items" (logger)) (.toString st))) @@ -758,8 +761,8 @@ FROM users u ;; there's probably a less hacky way to do this (defn tagged-dumps-by-nick [session params url] (let [nick (params :nick) + user-id (user-id-from-nick nick) tags (map url-decode (re-split #"\+" (undecoded-url-piece url 3))) - user-id (user-id-from-nick nick) url (str nick "/tag/" (str-join "+" (map url-encode tags))) page-title (str "dumps " nick " tagged as '" (escape-html (str-join "' and '" tags)) "'")] (tagged-dumps-template session params tags url page-title :tag-user-id user-id))) @@ -772,10 +775,13 @@ FROM users u (defn favorites [session params] (let [nick (params :nick) - user-id (user-id-from-nick nick) + user-info (lookup-user-info nick) + user-id (:user_id user-info) + avatar (:avatar user-info) url (str nick "/favorites") page-title (str nick "'s favorites")] - (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id))) + (println user-info) + (tagged-dumps-template session params "favorite" url page-title :tag-user-id user-id :avatar avatar))) (defn json-favorites [session params] (let [nick (params :nick) @@ -1083,5 +1089,5 @@ FROM users u (Thread/sleep 3000) ; Delay these to reduce start-load (start-user-flusher!) (start-session-pruner!) -(start! feed-downloader) +;(start! feed-downloader) (start! feed-inserter) diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st index 1409d6a..4bc271d 100644 --- a/template/tagged_dumps.st +++ b/template/tagged_dumps.st @@ -1,73 +1,68 @@ <html> -<head> - <title>dump.fm - $page_title$</title> -$head()$ - <link rel="stylesheet" media="screen" type="text/css" href="http://dump.fm/static/css/dump.css"> - <script> - jQuery(document).ready(initLog); - </script> -</head> + <head> + <title>dump.fm - $page_title$</title> + $head()$ + <link rel="stylesheet" media="screen" type="text/css" href="http://dump.fm/static/css/dump.css"> + <script> + jQuery(document).ready(initLog); + </script> + </head> <body> $banner()$ - <div id="content"> - <div id="messagetabs"></div> - <div id="rapper"> - </div> - - <div id="messagePanep"> - - <div id="userListp"> - $if(log.avatar)$ - <div style="border-image:url($log.avatar$)"> - <div id="avatarPic"> - <img height="50" width="50" src="$log.avatar$"></img> - </div> - <hr> - $endif$ - <h8>$page_title$ <br></h8><br> -</div> -<div id="messageList"> -$if(dumps)$ <span class="content"> - $dumps: { d | $log_dump(dump=d)$ + <div id="content"> + <div id="messagetabs"></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> + <hr> + $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$ -$else$ - <span>favless</span> -$endif$ -</div> + </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)$ + <div id="msgInputDiv"> + <div id="msginputrapper"> + + $if(prev)$ <a href="/$page_url$/$prev$"><input id="prevbutton" value="<- Prev"></a> - $else$ -<input id="prevbutton"> - $endif$ + $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$ - + $if(next)$ + <a href="/$page_url$/$next$"> <input id="nextbutton" value="Next ->"></a> + $else$ + <input id="nextbutton" value="nomodumps"> + $endif$ + - </div> - <div id="footerc"> + </div> + <div id="footerc"> $footer()$ </div> </div> </div></div></div> </body> -</html>
\ No newline at end of file +</html> |