From cb4ce6c4dfca9f6f6a26198a11353895f15f443b Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 8 Jul 2008 14:26:37 -0500
Subject: [PATCH] Fix naming
---
extra/webapps/planet/admin.xml | 8 +++---
extra/webapps/planet/edit-blog.xml | 4 +--
extra/webapps/planet/new-blog.xml | 2 +-
extra/webapps/planet/planet-common.xml | 6 ++--
extra/webapps/planet/planet.factor | 40 +++++++++++++-------------
extra/webapps/planet/planet.xml | 2 +-
6 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/extra/webapps/planet/admin.xml b/extra/webapps/planet/admin.xml
index 192592489e..531332eada 100644
--- a/extra/webapps/planet/admin.xml
+++ b/extra/webapps/planet/admin.xml
@@ -2,12 +2,12 @@
<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>
<t:bind-each t:name="blogroll">
<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:a>
</li>
@@ -15,8 +15,8 @@
</ul>
<div>
- <t:a t:href="$planet-factor/admin/new-blog">Add Blog</t:a>
- | <t:button t:action="$planet-factor/admin/update" class="link-button link">Update</t:button>
+ <t:a t:href="$planet/admin/new-blog">Add Blog</t:a>
+ | <t:button t:action="$planet/admin/update" class="link-button link">Update</t:button>
</div>
</t:chloe>
diff --git a/extra/webapps/planet/edit-blog.xml b/extra/webapps/planet/edit-blog.xml
index fd9c659f59..d1c7013c68 100644
--- a/extra/webapps/planet/edit-blog.xml
+++ b/extra/webapps/planet/edit-blog.xml
@@ -4,7 +4,7 @@
<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>
@@ -29,6 +29,6 @@
</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>
diff --git a/extra/webapps/planet/new-blog.xml b/extra/webapps/planet/new-blog.xml
index 4a9638da03..6f75addda5 100644
--- a/extra/webapps/planet/new-blog.xml
+++ b/extra/webapps/planet/new-blog.xml
@@ -4,7 +4,7 @@
<t:title>Edit Blog</t:title>
- <t:form t:action="$planet-factor/admin/new-blog">
+ <t:form t:action="$planet/admin/new-blog">
<table>
diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml
index 6c0affd17f..f4e390056a 100644
--- a/extra/webapps/planet/planet-common.xml
+++ b/extra/webapps/planet/planet-common.xml
@@ -5,9 +5,9 @@
<t:style t:include="resource:extra/webapps/planet/planet.css" />
<div class="navbar">
- <t:a t:href="$planet-factor/list">Front Page</t:a>
- | <t:a t:href="$planet-factor/feed.xml">Atom Feed</t:a>
- | <t:a t:href="$planet-factor/admin">Admin</t:a>
+ <t:a t:href="$planet/list">Front Page</t:a>
+ | <t:a t:href="$planet/feed.xml">Atom Feed</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.features.edit-profile:allow-edit-profile?">
diff --git a/extra/webapps/planet/planet.factor b/extra/webapps/planet/planet.factor
index ca74b7e642..10e706598e 100755
--- a/extra/webapps/planet/planet.factor
+++ b/extra/webapps/planet/planet.factor
@@ -17,13 +17,13 @@ furnace.auth
furnace.syndication ;
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 ;
@@ -65,7 +65,7 @@ posting "POSTINGS"
: <edit-blogroll-action> ( -- action )
<page-action>
[ blogroll "blogroll" set-value ] >>init
- { planet-factor "admin" } >>template ;
+ { planet "admin" } >>template ;
: <planet-action> ( -- action )
<page-action>
@@ -74,12 +74,12 @@ posting "POSTINGS"
postings "postings" set-value
] >>init
- { planet-factor "planet" } >>template ;
+ { planet "planet" } >>template ;
: <planet-feed-action> ( -- action )
<feed-action>
[ "Planet Factor" ] >>title
- [ URL" $planet-factor" ] >>url
+ [ URL" $planet" ] >>url
[ postings ] >>entries ;
:: <posting> ( entry name -- entry' )
@@ -111,7 +111,7 @@ posting "POSTINGS"
<action>
[
update-cached-postings
- URL" $planet-factor/admin" <redirect>
+ URL" $planet/admin" <redirect>
] >>submit ;
: <delete-blog-action> ( -- action )
@@ -120,7 +120,7 @@ posting "POSTINGS"
[
"id" value <blog> delete-tuples
- URL" $planet-factor/admin" <redirect>
+ URL" $planet/admin" <redirect>
] >>submit ;
: validate-blog ( -- )
@@ -136,7 +136,7 @@ posting "POSTINGS"
: <new-blog-action> ( -- action )
<page-action>
- { planet-factor "new-blog" } >>template
+ { planet "new-blog" } >>template
[ validate-blog ] >>validate
@@ -146,7 +146,7 @@ posting "POSTINGS"
[ insert-tuple ]
[
<url>
- "$planet-factor/admin/edit-blog" >>path
+ "$planet/admin/edit-blog" >>path
swap id>> "id" set-query-param
<redirect>
]
@@ -161,7 +161,7 @@ posting "POSTINGS"
"id" value <blog> select-tuple from-object
] >>init
- { planet-factor "edit-blog" } >>template
+ { planet "edit-blog" } >>template
[
validate-integer-id
@@ -174,15 +174,15 @@ posting "POSTINGS"
[ update-tuple ]
[
<url>
- "$planet-factor/admin" >>path
+ "$planet/admin" >>path
swap id>> "id" set-query-param
<redirect>
]
tri
] >>submit ;
-: <planet-factor-admin> ( -- responder )
- planet-factor-admin new-dispatcher
+: <planet-admin> ( -- responder )
+ planet-admin new-dispatcher
<edit-blogroll-action> "blogroll" add-main-responder
<update-action> "update" add-responder
<new-blog-action> "new-blog" add-responder
@@ -190,15 +190,15 @@ posting "POSTINGS"
<delete-blog-action> "delete-blog" add-responder
<protected>
"administer Planet Factor" >>description
- { can-administer-planet-factor? } >>capabilities ;
+ { can-administer-planet? } >>capabilities ;
-: <planet-factor> ( -- responder )
- planet-factor new-dispatcher
+: <planet> ( -- responder )
+ planet new-dispatcher
<planet-action> "list" add-main-responder
<planet-feed-action> "feed.xml" add-responder
- <planet-factor-admin> "admin" add-responder
+ <planet-admin> "admin" add-responder
<boilerplate>
- { planet-factor "planet-common" } >>template ;
+ { planet "planet-common" } >>template ;
: start-update-task ( db params -- )
'[ , , [ update-cached-postings ] with-db ] 10 minutes every drop ;
diff --git a/extra/webapps/planet/planet.xml b/extra/webapps/planet/planet.xml
index fe4d23bd3b..340e6c4bee 100644
--- a/extra/webapps/planet/planet.xml
+++ b/extra/webapps/planet/planet.xml
@@ -2,7 +2,7 @@
<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">
<tr>