diff options
| author | Scott Ostler <sbsotler@gmail.com> | 2011-01-28 10:34:28 -0500 |
|---|---|---|
| committer | Scott Ostler <sbsotler@gmail.com> | 2011-01-28 10:34:28 -0500 |
| commit | 870195aa045fe36b354ada921e490d3a950bb677 (patch) | |
| tree | c1324ca84856c5d1718fb77d197c30e40560463c /src | |
| parent | c6f4043891f53692893650f5ac9c9b4875de26de (diff) | |
| parent | 3a0c47ed55e96a79c5a40aeef628ec3f03d59ac8 (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'src')
| -rw-r--r-- | src/site.clj | 6 | ||||
| -rwxr-xr-x | src/utils.clj | 4 |
2 files changed, 6 insertions, 4 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)) |