Merge branch 'master' of git://factorcode.org/git/factor
Doug Coleman
commit
ea3a2024d6
|
|
@ -83,7 +83,7 @@ TUPLE: choice size multiple choices ;
|
|||
choice new ;
|
||||
|
||||
: render-option ( text selected? -- )
|
||||
<option [ "true" =selected ] when option>
|
||||
<option [ "selected" =selected ] when option>
|
||||
present escape-string write
|
||||
</option> ;
|
||||
|
||||
|
|
|
|||
|
|
@ -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?
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE html
|
||||
PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
|
||||
|
|
|
|||
|
|
@ -18,6 +18,6 @@
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<input type="SUBMIT" value="Submit" />
|
||||
<p> <button>Submit</button> </p>
|
||||
</t:form>
|
||||
</t:chloe>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<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>
|
||||
<tr><th class="field-label">Author: </th><td><t:label t:name="author" /></td></tr>
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</tr>
|
||||
</table>
|
||||
|
||||
<input type="SUBMIT" value="Done" />
|
||||
<p> <button>Done</button> </p>
|
||||
|
||||
</t:form>
|
||||
|
||||
|
|
|
|||
|
|
@ -166,14 +166,14 @@ posting "POSTINGS"
|
|||
[
|
||||
f <blog>
|
||||
[ deposit-blog-slots ]
|
||||
[ "id" value >>id ]
|
||||
[ update-tuple ]
|
||||
[
|
||||
<url>
|
||||
"$planet/admin" >>path
|
||||
swap id>> "id" set-query-param
|
||||
<redirect>
|
||||
]
|
||||
tri
|
||||
|
||||
<url>
|
||||
"$planet/admin" >>path
|
||||
"id" value "id" set-query-param
|
||||
<redirect>
|
||||
] >>submit ;
|
||||
|
||||
: <planet-admin> ( -- responder )
|
||||
|
|
|
|||
|
|
@ -45,14 +45,13 @@ TUPLE: factor-website < dispatcher ;
|
|||
<boilerplate>
|
||||
{ factor-website "page" } >>template ;
|
||||
|
||||
: <configuration> ( responder -- responder' )
|
||||
: <login-config> ( responder -- responder' )
|
||||
"Factor website" <login-realm>
|
||||
"Factor website" >>name
|
||||
allow-registration
|
||||
allow-password-recovery
|
||||
allow-edit-profile
|
||||
allow-deactivation
|
||||
test-db <alloy> ;
|
||||
allow-deactivation ;
|
||||
|
||||
: <factor-website> ( -- responder )
|
||||
factor-website new-dispatcher
|
||||
|
|
@ -77,10 +76,10 @@ SYMBOL: dh-file
|
|||
"password" key-password set-global
|
||||
common-configuration
|
||||
<factor-website>
|
||||
<pastebin> <factor-boilerplate> "pastebin" add-responder
|
||||
<planet> <factor-boilerplate> "planet" add-responder
|
||||
<pastebin> <factor-boilerplate> <login-config> "pastebin" add-responder
|
||||
<planet> <factor-boilerplate> <login-config> "planet" add-responder
|
||||
"/tmp/docs/" <help-webapp> "docs" add-responder
|
||||
<configuration>
|
||||
test-db <alloy>
|
||||
main-responder set-global ;
|
||||
|
||||
: <gitweb> ( path -- responder )
|
||||
|
|
@ -91,10 +90,10 @@ SYMBOL: dh-file
|
|||
: init-production ( -- )
|
||||
common-configuration
|
||||
<vhost-dispatcher>
|
||||
<factor-website> <factor-boilerplate> <configuration> "concatenative.org" add-responder
|
||||
<pastebin> <factor-boilerplate> <configuration> "paste.factorcode.org" add-responder
|
||||
<planet> <factor-boilerplate> <configuration> "planet.factorcode.org" add-responder
|
||||
home "docs" append-path <help-webapp> <configuration> "docs.factorcode.org" add-responder
|
||||
<factor-website> <login-config> <factor-boilerplate> test-db <alloy> "concatenative.org" add-responder
|
||||
<pastebin> <login-config> <factor-boilerplate> test-db <alloy> "paste.factorcode.org" add-responder
|
||||
<planet> <login-config> <factor-boilerplate> test-db <alloy> "planet.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
|
||||
main-responder set-global ;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue