diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor index dafc9dd06b..6f35ba5d97 100644 --- a/basis/html/components/components.factor +++ b/basis/html/components/components.factor @@ -83,7 +83,7 @@ TUPLE: choice size multiple choices ; choice new ; : render-option ( text selected? -- ) - ; diff --git a/basis/syndication/syndication.factor b/basis/syndication/syndication.factor index ca7511f1af..aca09b939c 100644 --- a/basis/syndication/syndication.factor +++ b/basis/syndication/syndication.factor @@ -69,11 +69,15 @@ TUPLE: entry title url description date ; [ "item" tags-named [ rss2.0-entry ] map set-entries ] tri ; +: atom-entry-link ( tag -- url/f ) + "link" tags-named [ "rel" swap at "alternate" = ] find nip + dup [ "href" swap at >url ] when ; + : atom1.0-entry ( tag -- entry ) entry new swap { [ "title" tag-named children>string >>title ] - [ "link" tag-named "href" swap at >url >>url ] + [ atom-entry-link >>url ] [ { "content" "summary" } any-tag-named dup children>> [ string? not ] contains? diff --git a/extra/webapps/help/help.xml b/extra/webapps/help/help.xml index f4262a6f6a..7718b10a22 100644 --- a/extra/webapps/help/help.xml +++ b/extra/webapps/help/help.xml @@ -1,4 +1,4 @@ - + diff --git a/extra/webapps/pastebin/new-paste.xml b/extra/webapps/pastebin/new-paste.xml index 6abae4895b..96339b6cf8 100644 --- a/extra/webapps/pastebin/new-paste.xml +++ b/extra/webapps/pastebin/new-paste.xml @@ -18,6 +18,6 @@ - +

diff --git a/extra/webapps/pastebin/paste.xml b/extra/webapps/pastebin/paste.xml index 1c138fc8c0..8fe672049f 100644 --- a/extra/webapps/pastebin/paste.xml +++ b/extra/webapps/pastebin/paste.xml @@ -20,7 +20,7 @@ -

Annotation:

+

Annotation:

@@ -52,7 +52,7 @@
Author:
- +

diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor index cd6e183d14..00d843573c 100755 --- a/extra/webapps/planet/planet.factor +++ b/extra/webapps/planet/planet.factor @@ -166,14 +166,14 @@ posting "POSTINGS" [ f [ deposit-blog-slots ] + [ "id" value >>id ] [ update-tuple ] - [ - - "$planet/admin" >>path - swap id>> "id" set-query-param - - ] tri + + + "$planet/admin" >>path + "id" value "id" set-query-param + ] >>submit ; : ( -- responder ) diff --git a/extra/websites/concatenative/concatenative.factor b/extra/websites/concatenative/concatenative.factor index 0af8eb31d7..5553fda740 100644 --- a/extra/websites/concatenative/concatenative.factor +++ b/extra/websites/concatenative/concatenative.factor @@ -45,14 +45,13 @@ TUPLE: factor-website < dispatcher ; { factor-website "page" } >>template ; -: ( responder -- responder' ) +: ( responder -- responder' ) "Factor website" "Factor website" >>name allow-registration allow-password-recovery allow-edit-profile - allow-deactivation - test-db ; + allow-deactivation ; : ( -- responder ) factor-website new-dispatcher @@ -77,10 +76,10 @@ SYMBOL: dh-file "password" key-password set-global common-configuration - "pastebin" add-responder - "planet" add-responder + "pastebin" add-responder + "planet" add-responder "/tmp/docs/" "docs" add-responder - + test-db main-responder set-global ; : ( path -- responder ) @@ -91,10 +90,10 @@ SYMBOL: dh-file : init-production ( -- ) common-configuration - "concatenative.org" add-responder - "paste.factorcode.org" add-responder - "planet.factorcode.org" add-responder - home "docs" append-path "docs.factorcode.org" add-responder + test-db "concatenative.org" add-responder + test-db "paste.factorcode.org" add-responder + test-db "planet.factorcode.org" add-responder + home "docs" append-path test-db "docs.factorcode.org" add-responder home "cgi" append-path "gitweb.factorcode.org" add-responder main-responder set-global ;