steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2008-09-30 09:45:41 -05:00
parent 34ce3e13e4 e438fe2a80
commit ea3a2024d6
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basis/html/components/components.factor
View File

@ -83,7 +83,7 @@ TUPLE: choice size multiple choices ;
choice new ; choice new ;
: render-option ( text selected? -- ) : render-option ( text selected? -- )
<option [ "true" =selected ] when option> <option [ "selected" =selected ] when option>
present escape-string write present escape-string write
</option> ; </option> ;

6
basis/syndication/syndication.factor
View File

@ -69,11 +69,15 @@ TUPLE: entry title url description date ;
[ "item" tags-named [ rss2.0-entry ] map set-entries ] [ "item" tags-named [ rss2.0-entry ] map set-entries ]
tri ; 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 ) : atom1.0-entry ( tag -- entry )
entry new entry new
swap { swap {
[ "title" tag-named children>string >>title ] [ "title" tag-named children>string >>title ]
[ "link" tag-named "href" swap at >url >>url ] [ atom-entry-link >>url ]
[ [
{ "content" "summary" } any-tag-named { "content" "summary" } any-tag-named
dup children>> [ string? not ] contains? dup children>> [ string? not ] contains?

2
extra/webapps/help/help.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0"?>
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

2
extra/webapps/pastebin/new-paste.xml
View File

@ -18,6 +18,6 @@
</tr> </tr>
</table> </table>
<input type="SUBMIT" value="Submit" /> <p> <button>Submit</button> </p>
</t:form> </t:form>
</t:chloe> </t:chloe>

4
extra/webapps/pastebin/paste.xml
View File

@ -20,7 +20,7 @@
<t:bind-each t:name="annotations"> <t:bind-each t:name="annotations">
<a name="@id"><h2>Annotation: <t:label t:name="summary" /></h2></a> <h2><a name="@id">Annotation: <t:label t:name="summary" /></a></h2>
<table> <table>
<tr><th class="field-label">Author: </th><td><t:label t:name="author" /></td></tr> <tr><th class="field-label">Author: </th><td><t:label t:name="author" /></td></tr>
@ -52,7 +52,7 @@
</tr> </tr>
</table> </table>
<input type="SUBMIT" value="Done" /> <p> <button>Done</button> </p>
</t:form> </t:form>

8
extra/webapps/planet/planet.factor
View File

@ -166,14 +166,14 @@ posting "POSTINGS"
[ [
f <blog> f <blog>
[ deposit-blog-slots ] [ deposit-blog-slots ]
[ "id" value >>id ]
[ update-tuple ] [ update-tuple ]
[ tri
<url> <url>
"$planet/admin" >>path "$planet/admin" >>path
swap id>> "id" set-query-param "id" value "id" set-query-param
<redirect> <redirect>
]
tri
] >>submit ; ] >>submit ;
: <planet-admin> ( -- responder ) : <planet-admin> ( -- responder )

19
extra/websites/concatenative/concatenative.factor
View File

@ -45,14 +45,13 @@ TUPLE: factor-website < dispatcher ;
<boilerplate> <boilerplate>
{ factor-website "page" } >>template ; { factor-website "page" } >>template ;
: <configuration> ( responder -- responder' ) : <login-config> ( responder -- responder' )
"Factor website" <login-realm> "Factor website" <login-realm>
"Factor website" >>name "Factor website" >>name
allow-registration allow-registration
allow-password-recovery allow-password-recovery
allow-edit-profile allow-edit-profile
allow-deactivation allow-deactivation ;
test-db <alloy> ;
: <factor-website> ( -- responder ) : <factor-website> ( -- responder )
factor-website new-dispatcher factor-website new-dispatcher
@ -77,10 +76,10 @@ SYMBOL: dh-file
"password" key-password set-global "password" key-password set-global
common-configuration common-configuration
<factor-website> <factor-website>
<pastebin> <factor-boilerplate> "pastebin" add-responder <pastebin> <factor-boilerplate> <login-config> "pastebin" add-responder
<planet> <factor-boilerplate> "planet" add-responder <planet> <factor-boilerplate> <login-config> "planet" add-responder
"/tmp/docs/" <help-webapp> "docs" add-responder "/tmp/docs/" <help-webapp> "docs" add-responder
<configuration> test-db <alloy>
main-responder set-global ; main-responder set-global ;
: <gitweb> ( path -- responder ) : <gitweb> ( path -- responder )
@ -91,10 +90,10 @@ SYMBOL: dh-file
: init-production ( -- ) : init-production ( -- )
common-configuration common-configuration
<vhost-dispatcher> <vhost-dispatcher>
<factor-website> <factor-boilerplate> <configuration> "concatenative.org" add-responder <factor-website> <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
<pastebin> <factor-boilerplate> <configuration> "paste.factorcode.org" add-responder <pastebin> <login-config> <factor-boilerplate> test-db <alloy> "paste.factorcode.org" add-responder
<planet> <factor-boilerplate> <configuration> "planet.factorcode.org" add-responder <planet> <login-config> <factor-boilerplate> test-db <alloy> "planet.factorcode.org" add-responder
home "docs" append-path <help-webapp> <configuration> "docs.factorcode.org" add-responder home "docs" append-path <help-webapp> test-db <alloy> "docs.factorcode.org" add-responder
home "cgi" append-path <gitweb> "gitweb.factorcode.org" add-responder home "cgi" append-path <gitweb> "gitweb.factorcode.org" add-responder
main-responder set-global ; main-responder set-global ;