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

Fix naming

db4
Slava Pestov 2008-07-08 14:26:37 -05:00
parent ed788fa49c
commit cb4ce6c4df
6 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extra/webapps/planet/admin.xml
View File

@ -2,12 +2,12 @@
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0"> <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<t:title>Planet Factor Administration</t:title> <t:title>Concatenative Planet: Administration</t:title>
<ul> <ul>
<t:bind-each t:name="blogroll"> <t:bind-each t:name="blogroll">
<li> <li>
<t:a t:href="$planet-factor/admin/edit-blog" t:query="id"> <t:a t:href="$planet/admin/edit-blog" t:query="id">
<t:label t:name="name" /> <t:label t:name="name" />
</t:a> </t:a>
</li> </li>
@ -15,8 +15,8 @@
</ul> </ul>
<div> <div>
<t:a t:href="$planet-factor/admin/new-blog">Add Blog</t:a> <t:a t:href="$planet/admin/new-blog">Add Blog</t:a>
| <t:button t:action="$planet-factor/admin/update" class="link-button link">Update</t:button> | <t:button t:action="$planet/admin/update" class="link-button link">Update</t:button>
</div> </div>
</t:chloe> </t:chloe>

4
extra/webapps/planet/edit-blog.xml
View File

@ -4,7 +4,7 @@
<t:title>Edit Blog</t:title> <t:title>Edit Blog</t:title>
<t:form t:action="$planet-factor/admin/edit-blog" t:for="id"> <t:form t:action="$planet/admin/edit-blog" t:for="id">
<table> <table>
@ -29,6 +29,6 @@
</t:form> </t:form>
<t:button t:action="$planet-factor/admin/delete-blog" t:for="id" class="link-button link">Delete</t:button> <t:button t:action="$planet/admin/delete-blog" t:for="id" class="link-button link">Delete</t:button>
</t:chloe> </t:chloe>

2
extra/webapps/planet/new-blog.xml
View File

@ -4,7 +4,7 @@
<t:title>Edit Blog</t:title> <t:title>Edit Blog</t:title>
<t:form t:action="$planet-factor/admin/new-blog"> <t:form t:action="$planet/admin/new-blog">
<table> <table>

6
extra/webapps/planet/planet-common.xml
View File

@ -5,9 +5,9 @@
<t:style t:include="resource:extra/webapps/planet/planet.css" /> <t:style t:include="resource:extra/webapps/planet/planet.css" />
<div class="navbar"> <div class="navbar">
<t:a t:href="$planet-factor/list">Front Page</t:a> <t:a t:href="$planet/list">Front Page</t:a>
| <t:a t:href="$planet-factor/feed.xml">Atom Feed</t:a> | <t:a t:href="$planet/feed.xml">Atom Feed</t:a>
| <t:a t:href="$planet-factor/admin">Admin</t:a> | <t:a t:href="$planet/admin">Admin</t:a>
<t:if t:code="furnace.auth:logged-in?"> <t:if t:code="furnace.auth:logged-in?">
<t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?"> <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">

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

@ -17,13 +17,13 @@ furnace.auth
furnace.syndication ; furnace.syndication ;
IN: webapps.planet IN: webapps.planet
TUPLE: planet-factor < dispatcher ; TUPLE: planet < dispatcher ;
SYMBOL: can-administer-planet-factor? SYMBOL: can-administer-planet?
can-administer-planet-factor? define-capability can-administer-planet? define-capability
TUPLE: planet-factor-admin < dispatcher ; TUPLE: planet-admin < dispatcher ;
TUPLE: blog id name www-url feed-url ; TUPLE: blog id name www-url feed-url ;
@ -65,7 +65,7 @@ posting "POSTINGS"
: <edit-blogroll-action> ( -- action ) : <edit-blogroll-action> ( -- action )
<page-action> <page-action>
[ blogroll "blogroll" set-value ] >>init [ blogroll "blogroll" set-value ] >>init
{ planet-factor "admin" } >>template ; { planet "admin" } >>template ;
: <planet-action> ( -- action ) : <planet-action> ( -- action )
<page-action> <page-action>
@ -74,12 +74,12 @@ posting "POSTINGS"
postings "postings" set-value postings "postings" set-value
] >>init ] >>init
{ planet-factor "planet" } >>template ; { planet "planet" } >>template ;
: <planet-feed-action> ( -- action ) : <planet-feed-action> ( -- action )
<feed-action> <feed-action>
[ "Planet Factor" ] >>title [ "Planet Factor" ] >>title
[ URL" $planet-factor" ] >>url [ URL" $planet" ] >>url
[ postings ] >>entries ; [ postings ] >>entries ;
:: <posting> ( entry name -- entry' ) :: <posting> ( entry name -- entry' )
@ -111,7 +111,7 @@ posting "POSTINGS"
<action> <action>
[ [
update-cached-postings update-cached-postings
URL" $planet-factor/admin" <redirect> URL" $planet/admin" <redirect>
] >>submit ; ] >>submit ;
: <delete-blog-action> ( -- action ) : <delete-blog-action> ( -- action )
@ -120,7 +120,7 @@ posting "POSTINGS"
[ [
"id" value <blog> delete-tuples "id" value <blog> delete-tuples
URL" $planet-factor/admin" <redirect> URL" $planet/admin" <redirect>
] >>submit ; ] >>submit ;
: validate-blog ( -- ) : validate-blog ( -- )
@ -136,7 +136,7 @@ posting "POSTINGS"
: <new-blog-action> ( -- action ) : <new-blog-action> ( -- action )
<page-action> <page-action>
{ planet-factor "new-blog" } >>template { planet "new-blog" } >>template
[ validate-blog ] >>validate [ validate-blog ] >>validate
@ -146,7 +146,7 @@ posting "POSTINGS"
[ insert-tuple ] [ insert-tuple ]
[ [
<url> <url>
"$planet-factor/admin/edit-blog" >>path "$planet/admin/edit-blog" >>path
swap id>> "id" set-query-param swap id>> "id" set-query-param
<redirect> <redirect>
] ]
@ -161,7 +161,7 @@ posting "POSTINGS"
"id" value <blog> select-tuple from-object "id" value <blog> select-tuple from-object
] >>init ] >>init
{ planet-factor "edit-blog" } >>template { planet "edit-blog" } >>template
[ [
validate-integer-id validate-integer-id
@ -174,15 +174,15 @@ posting "POSTINGS"
[ update-tuple ] [ update-tuple ]
[ [
<url> <url>
"$planet-factor/admin" >>path "$planet/admin" >>path
swap id>> "id" set-query-param swap id>> "id" set-query-param
<redirect> <redirect>
] ]
tri tri
] >>submit ; ] >>submit ;
: <planet-factor-admin> ( -- responder ) : <planet-admin> ( -- responder )
planet-factor-admin new-dispatcher planet-admin new-dispatcher
<edit-blogroll-action> "blogroll" add-main-responder <edit-blogroll-action> "blogroll" add-main-responder
<update-action> "update" add-responder <update-action> "update" add-responder
<new-blog-action> "new-blog" add-responder <new-blog-action> "new-blog" add-responder
@ -190,15 +190,15 @@ posting "POSTINGS"
<delete-blog-action> "delete-blog" add-responder <delete-blog-action> "delete-blog" add-responder
<protected> <protected>
"administer Planet Factor" >>description "administer Planet Factor" >>description
{ can-administer-planet-factor? } >>capabilities ; { can-administer-planet? } >>capabilities ;
: <planet-factor> ( -- responder ) : <planet> ( -- responder )
planet-factor new-dispatcher planet new-dispatcher
<planet-action> "list" add-main-responder <planet-action> "list" add-main-responder
<planet-feed-action> "feed.xml" add-responder <planet-feed-action> "feed.xml" add-responder
<planet-factor-admin> "admin" add-responder <planet-admin> "admin" add-responder
<boilerplate> <boilerplate>
{ planet-factor "planet-common" } >>template ; { planet "planet-common" } >>template ;
: start-update-task ( db params -- ) : start-update-task ( db params -- )
'[ , , [ update-cached-postings ] with-db ] 10 minutes every drop ; '[ , , [ update-cached-postings ] with-db ] 10 minutes every drop ;

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

@ -2,7 +2,7 @@
<t:chloe xmlns:t="http://factorcode.org/chloe/1.0"> <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
<t:title>Planet Factor</t:title> <t:title>Concatenative Planet</t:title>
<table width="100%" cellpadding="10"> <table width="100%" cellpadding="10">
<tr> <tr>