From 13578a780d9c506ead09e3f6fa52d7ff84ab1c96 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Mon, 2 Jun 2008 15:33:33 -0500
Subject: [PATCH] Clean up wiki a bit
---
extra/webapps/wiki/diff.xml | 14 ++++++--------
extra/webapps/wiki/edit.xml | 7 ++++++-
extra/webapps/wiki/view.xml | 3 ++-
extra/webapps/wiki/wiki.factor | 5 ++++-
4 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/extra/webapps/wiki/diff.xml b/extra/webapps/wiki/diff.xml
index 9feb12dc43..55f3ef0b23 100644
--- a/extra/webapps/wiki/diff.xml
+++ b/extra/webapps/wiki/diff.xml
@@ -23,13 +23,11 @@
<t:comparison t:name="diff" />
- <t:bind t:name="old">
- <div class="navbar">
- <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
- | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
- | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
- | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
- </div>
- </t:bind>
+ <div class="navbar">
+ <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
+ | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
+ | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
+ | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
+ </div>
</t:chloe>
diff --git a/extra/webapps/wiki/edit.xml b/extra/webapps/wiki/edit.xml
index 85c8490c5d..37cc6d9a5b 100644
--- a/extra/webapps/wiki/edit.xml
+++ b/extra/webapps/wiki/edit.xml
@@ -16,5 +16,10 @@
</t:form>
- <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
+ <div class="navbar">
+ <t:a t:href="$wiki/view" t:query="title">Latest</t:a>
+ | <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
+ | <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
+ | <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
+ </div>
</t:chloe>
diff --git a/extra/webapps/wiki/view.xml b/extra/webapps/wiki/view.xml
index 56c8b37a1d..0e1f0f7478 100644
--- a/extra/webapps/wiki/view.xml
+++ b/extra/webapps/wiki/view.xml
@@ -8,12 +8,13 @@
<t:farkup t:name="content" />
</div>
+ <p><em>This revision created on <t:label t:name="date" /> by <t:a t:href="user-edits" t:query="author"><t:label t:name="author" /></t:a>.</em></p>
+
<div class="navbar">
<t:a t:href="$wiki/view" t:query="title">Latest</t:a>
| <t:a t:href="$wiki/revisions" t:query="title">Revisions</t:a>
| <t:a t:href="$wiki/edit" t:query="title">Edit</t:a>
| <t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
- | This revision created on <t:label t:name="date" /> by <t:a t:href="user-edits" t:query="author"><t:label t:name="author" /></t:a>.
</div>
</t:chloe>
diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 7444f1012e..31b5a12c41 100644
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -184,7 +184,10 @@ revision "REVISIONS" {
"old-id" "new-id"
[ value <revision> select-tuple ] bi@
- [ [ "old" set-value ] [ "new" set-value ] bi* ]
+ [
+ [ [ title>> "title" set-value ] [ "old" set-value ] bi ]
+ [ "new" set-value ] bi*
+ ]
[ [ content>> string-lines ] bi@ diff "diff" set-value ]
2bi
] >>init