Clean up wiki a bit

diff --git a/extra/webapps/wiki/diff.xml b/extra/webapps/wiki/diff.xml
index 9feb12dc4394adb274bc579340e1fe45cc2368b3..55f3ef0b238cddd68146c8fed8db891bb0275f33 100644 (file)
--- 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 85c8490c5dec6e0b89d45c1510b821cbd5b2c389..37cc6d9a5b8d75890f98b03ef6981de6439325a6 100644 (file)
--- 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 56c8b37a1ded53378206ffce0e5148affecfc687..0e1f0f74786a09f17947801b41020880dbfaed62 100644 (file)
--- 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 7444f1012ea3cca22cca4da99f2ab3495cee8559..31b5a12c4144ad9853eb8380e63cc0eeaab01625 100644 (file)
--- 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