Rename sidebar to contents

diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index 978551a6380429050efc9f733fe3797aadadc73d..6a90f0d0de98384ee8e44debd07c747bf5addb20 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -10,10 +10,10 @@
 
        <table width="100%">
                <tr>
-                       <t:if t:value="sidebar">
+                       <t:if t:value="contents">
                                <td valign="top" style="width: 210px;">
-                                       <div class="sidebar">
-                                               <t:bind t:name="sidebar">
+                                       <div class="contents">
+                                               <t:bind t:name="contents">
                                                        <h2>
                                                                <t:a t:href="$wiki/view" t:query="title">
                                                                        <t:label t:name="title" />

diff --git a/extra/webapps/wiki/wiki.factor b/extra/webapps/wiki/wiki.factor
index 9d1ad15aa4a0b592aee9b4d3394d4be92c8de51a..7165f169c55c2ffcbdea9fd58a9ca8a99e682c53 100644 (file)
--- a/extra/webapps/wiki/wiki.factor
+++ b/extra/webapps/wiki/wiki.factor
@@ -344,8 +344,8 @@ M: revision feed-entry-url id>> revision-url ;
         [ "author" value user-edits-url ] >>url
         [ list-user-edits ] >>entries ;
 
-: init-sidebar ( -- )
-    "Sidebar" latest-revision [ "sidebar" [ from-object ] nest-form ] when*
+: init-sidebars ( -- )
+    "Contents" latest-revision [ "contents" [ from-object ] nest-form ] when*
     "Footer" latest-revision [ "footer" [ from-object ] nest-form ] when* ;
 
 : <wiki> ( -- dispatcher )
@@ -367,7 +367,7 @@ M: revision feed-entry-url id>> revision-url ;
         <list-changes-feed-action> "changes.atom" add-responder
         <delete-action> "delete" add-responder
     <boilerplate>
-        [ init-sidebar ] >>init
+        [ init-sidebars ] >>init
         { wiki "wiki-common" } >>template ;
 
 : init-wiki ( -- )