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

5 files changed, 11 insertions, 8 deletions

diff --git a/src/site.clj b/src/site.clj
index 5b20361..c63a6cb 100644
--- a/src/site.clj
+++ b/src/site.clj
@@ -1186,7 +1186,8 @@ WHERE  user_id IN
   (GET "/irlhell"  (redirect-to "/irhell/"))
   (GET "/irhell"   (redirect-to "/irhell/"))
   (GET "/irhell/"  (serve-static "static/319"  "irhell.html"))
-  (GET "/irhell/*" (serve-static "static/319"  (params :*))))
+  (GET "/irhell/*" (serve-static "static/319"  (params :*)))
+  (ANY "*" (unknown-page)))
 
 
 
@@ -1331,7 +1332,8 @@ WHERE  user_id IN
 (defroutes multipart
   (POST "/upload/message" (upload session params request))
   (POST "/upload/photo" (upload-photo session params))
-  (POST "/upload/avatar" (upload-avatar session params)))
+  (POST "/upload/avatar" (upload-avatar session params))
+  (ANY "*" (unknown-page)))
 
 ;; Add jpeg to list
 (def mimetypes
diff --git a/src/utils.clj b/src/utils.clj
index 760ae63..ee64789 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -146,8 +146,8 @@
 (defn today []
   (format-yyyymmdd (new Date)))
 
-(def timestamp-formatter (new SimpleDateFormat "h:mm a EEE M/d"))
-(def date-first-timestamp-formatter (new SimpleDateFormat "M/d h:mm a"))
+(def timestamp-formatter (new SimpleDateFormat "hh:mm a EEE M/d"))
+(def date-first-timestamp-formatter (new SimpleDateFormat "yy/MM/dd HH:mm"))
 
 (defn format-timestamp [d]
   (.format timestamp-formatter d))
diff --git a/template/mini_profile.st b/template/mini_profile.st
index a991f6b..90b1689 100644
--- a/template/mini_profile.st
+++ b/template/mini_profile.st
@@ -20,6 +20,7 @@
 
   <div><a href="http://dump.fm/$nick$/log">dumps</a></div>
   <div><a href="http://dump.fm/$nick$/favorites">dumps faved</a></div>
+  <div><a href="http://dump.fm/$nick$/popular">top dumps</a></div>
   
   <br> <h3>contact info</h3>
   $if(contact)$
diff --git a/template/popular.st b/template/popular.st
index c900dd9..162c63b 100644
--- a/template/popular.st
+++ b/template/popular.st
@@ -4,7 +4,7 @@
     $head()$
     <script>
       jQuery(function() {
-          initLog([])
+          initLog($recips$);
       });
     </script> 
 
diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st
index fa38eb5..9ade34c 100644
--- a/template/rooms/VIP.st
+++ b/template/rooms/VIP.st
@@ -10,7 +10,7 @@
    \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
    \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
    \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
-   \__\/         \__\/         \__\/       \__\/       \__\/    
+   \__\/         \__\/         \__\/        \__\/       \__\/      
 
    (c)2010 dump.fm -->
 
@@ -140,8 +140,8 @@
     <div id="vipinfo" style="position: absolute; z-index: 100000; right: 50; bottom: 125; background: white; padding: 10px; opacity: .75;">
       <h1>Welcome to the cool club</h1>
       <ul>
-        <li><a href="/roomlist">Rooms</a></li>
-        <li><a href="/mutes">Mutes</a></li>
+        <li><a href="http://dump.fm/roomlist">Rooms</a></li>
+        <li><a href="http://dump.fm/mutes">Mutes</a></li>
       </ul>
     </div>
   </body>