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

db4
Doug Coleman 2008-09-28 21:31:23 -05:00
commit 71f8c68a41
14 changed files with 43 additions and 25 deletions
basis/furnace/auth
features
edit-profile
registration

View File

@ -4,7 +4,7 @@
<t:title>Edit Profile</t:title>
<t:form t:action="$realm/edit-profile">
<t:form t:action="$realm/edit-profile" autocomplete="off">
<table>
@ -61,7 +61,7 @@
</table>
<p>
<input type="submit" value="Update" />
<button>Update</button>
<t:validation-messages />
</p>

View File

@ -32,7 +32,7 @@
</table>
<input type="submit" value="Recover password" />
<button>Recover password</button>
</t:form>

View File

@ -31,7 +31,7 @@
</table>
<p>
<input type="submit" value="Set password" />
<button>Set password</button>
<t:validation-messages />
</p>

View File

@ -4,7 +4,7 @@
<t:title>New User Registration</t:title>
<t:form t:action="register">
<t:form t:action="register" autocomplete="off">
<table>
@ -62,7 +62,7 @@
<p>
<input type="submit" value="Register" />
<button>Register</button>
<t:validation-messages />
</p>

View File

@ -35,7 +35,7 @@
<p>
<input type="submit" value="Log in" />
<button>Log in</button>
<t:validation-messages />
</p>

View File

@ -15,12 +15,12 @@
<tr>
<th class="field-label">Home page:</th>
<td><t:field t:name="www-url" /></td>
<td><t:field t:name="www-url" t:size="40" /></td>
</tr>
<tr>
<th class="field-label">Feed:</th>
<td><t:field t:name="feed-url" /></td>
<td><t:field t:name="feed-url" t:size="40" /></td>
</tr>
</table>

View File

@ -15,12 +15,12 @@
<tr>
<th class="field-label">Home page:</th>
<td><t:field t:name="www-url" /></td>
<td><t:field t:name="www-url" t:size="40" /></td>
</tr>
<tr>
<th class="field-label">Feed:</th>
<td><t:field t:name="feed-url" /></td>
<td><t:field t:name="feed-url" t:size="40" /></td>
</tr>
</table>

View File

@ -2,7 +2,7 @@
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<t:title>Concatenative Planet</t:title>
<t:title>[ planet-factor ]</t:title>
<table width="100%" cellpadding="10">
<tr>
@ -38,6 +38,17 @@
</t:each>
</ul>
<hr/>
<p>
<strong>planet-factor</strong> is an Atom/RSS aggregator that collects the
contents of <a href="http://factorcode.org/">Factor</a>-related blogs. It is inspired by
<a href="http://planet.lisp.org">Planet Lisp</a>.
</p>
<p>
<img src="http://factorcode.org/feed-icon-14x14.png" />
<t:a t:href="$planet/feed.xml">Syndicate</t:a>
</p>
</td>
</tr>
</table>

View File

@ -4,7 +4,7 @@
<t:title>Edit User</t:title>
<t:form t:action="$user-admin/edit" t:for="username">
<t:form t:action="$user-admin/edit" t:for="username" autocomplete="off">
<table>

View File

@ -4,7 +4,7 @@
<t:title>New User</t:title>
<t:form t:action="$user-admin/new">
<t:form t:action="$user-admin/new" autocomplete="off">
<table>

View File

@ -4,7 +4,7 @@
<t:form t:action="$wee-url">
<p>Shorten URL: <t:field t:name="url" t:size="40" /></p>
<input type="submit" value="Shorten" />
<button>Shorten</button>
</t:form>
</t:chloe>

View File

@ -16,7 +16,7 @@
</p>
<p>
<input type="submit" value="Save" />
<button>Save</button>
</p>
</t:form>

View File

@ -32,7 +32,7 @@
</tr>
</table>
<input type="submit" value="View" />
<button>View</button>
</t:form>
</t:chloe>

View File

@ -38,13 +38,7 @@ IN: websites.concatenative
TUPLE: factor-website < dispatcher ;
: <factor-website> ( -- responder )
factor-website new-dispatcher
<pastebin> "pastebin" add-responder
<planet> "planet" add-responder
<wiki> "wiki" add-responder
<user-admin> "user-admin" add-responder
URL" /wiki/view/Front Page" <redirect-responder> "" add-responder
: <configuration> ( responder -- responder' )
"Factor website" <login-realm>
"Factor website" >>name
allow-registration
@ -55,6 +49,12 @@ TUPLE: factor-website < dispatcher ;
{ factor-website "page" } >>template
test-db <alloy> ;
: <factor-website> ( -- responder )
factor-website new-dispatcher
<wiki> "wiki" add-responder
<user-admin> "user-admin" add-responder
URL" /wiki/view/Front Page" <redirect-responder> "" add-responder ;
SYMBOL: key-password
SYMBOL: key-file
SYMBOL: dh-file
@ -71,12 +71,19 @@ SYMBOL: dh-file
"resource:basis/openssl/test/server.pem" key-file set-global
"password" key-password set-global
common-configuration
<factor-website> main-responder set-global ;
<factor-website>
<pastebin> "pastebin" add-responder
<planet> "planet" add-responder
<configuration>
main-responder set-global ;
: init-production ( -- )
common-configuration
<vhost-dispatcher>
<factor-website> "concatenative.org" add-responder
<pastebin> "paste.factorcode.org" add-responder
<planet> "planet.factorcode.org" add-responder
<configuration>
main-responder set-global ;
: <factor-secure-config> ( -- config )