markup.ss @@ -3,12 +3,14 @@ (require (planet "leftparen.scm" ("vegashacker" "leftparen.plt" 4 (= 1))) (planet "util.scm" ("vegashacker" "leftparen.plt" 4 (= 1))) "social.ss" + "markup.ss" ) (provide get-feature-requests-popular get-feature-requests-newest get-feature-requests-completed feature-request-expl + any-body-markup feature-request-validator) (define (get-feature-requests-completed) @@ -37,9 +39,12 @@ ;; record. But, in reality, if you do see "missing" on the site, it means that ;; something got screwed up, or we aren't validating correctly or something. (define (feature-request-expl fr-rec) - (or (aand (rec-prop fr-rec 'explanation) (string-trim it)) + (or (aand (rec-prop fr-rec 'explanation) (any-body-markup it)) "missing")) +(define (any-body-markup str) + (markup-body (string-trim str))) + (define (feature-request-validator fr-rec) (let ((lookup (rec-prop fr-rec 'explanation))) (and (or (not lookup) (string=? "" (string-trim lookup))) data.ss @@ -6,6 +6,7 @@ (require (planet "leftparen.scm" ("vegashacker" "leftparen.plt" 4 (= 1))) (planet "util.scm" ("vegashacker" "leftparen.plt" 4 (= 1))) "templates.ss" ;;XXX shouldn't be here - need to abstract out at some point + "data.ss" ) (provide comment-on-item-link @@ -71,7 +72,7 @@ #:redirect-to (redirect #f)) (define (show-indiv-comment c) `(div ((class "comment")) - ,(rec-prop c 'body) + ,(any-body-markup (rec-prop c 'body)) ,@(splice-if reply-link `(div ((class "reply-link")) ,(comment-on-item-link c #:link-prose "reply" discuss.ss @@ -29,10 +29,6 @@ } catch(err) {}</script> ") -(define (apply-markup str) - (regexp-replace* #px"http://[[:graph:]]*" str - (lambda (x) (raw-str (format "<a href=\"~A\">~A</a>" x x))))) - (define (li-a link name) `(li (a ((href ,link)) ,name))) @@ -84,9 +80,10 @@ #:validate feature-request-validator)) (define (feature-detail-page-view feat) - (let ((exp (rec-prop feat 'explanation))) + (let ((exp-raw (string-trim (rec-prop feat 'explanation))) + (exp (feature-request-expl feat))) (page - #:design (base-design #:title (format "lawnelephant | ~A" (string-ellide exp 10))) + #:design (base-design #:title (format "lawnelephant | ~A" (string-ellide exp-raw 10))) `(div ((id "doc")) (div ((id "hd")) (span ((id "header")) view.ss b9610bf525b5d0454c801591f627505e5cb4f605 Rob Hunter rob.hunter@gmail.com http://github.com/vegashacker/lawnelephant/commit/db06b2215d327efa8dc2365a85f36eefdcc596a7 db06b2215d327efa8dc2365a85f36eefdcc596a7 2009-03-12T23:31:09-07:00 2009-03-12T23:31:09-07:00 added url-ificiation to feature request bodies and to comments; also added newline recognition 8d9bf8e71c37d410fe3cfb34035baf0df3789a0f Rob Hunter rob.hunter@gmail.com