Fixes #2966

[factor.git] / extra / webapps / wiki / wiki-common.xml

diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index 67a5b91c934d3c873130d6d050abbf3cde7f815c..1a04c9bc53f648451057690bbec99961f6d3f9ae 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -2,28 +2,74 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-       <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
+    <t:atom t:href="$wiki/changes.atom">
+        Recent Changes
+    </t:atom>
 
-       <div class="navbar">
+    <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
 
-               <t:a t:href="$wiki">Front Page</t:a>
-               | <t:a t:href="$wiki/articles">All Articles</t:a>
-               | <t:a t:href="$wiki/changes">Recent Changes</t:a>
+    <nav>
+        <t:if t:value="contents">
+            <img id="menu" onclick="toggleSidebar()" src="data:image/svg+xml;utf8,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 xmlns:xlink=%27http://www.w3.org/1999/xlink%27 width=%2724%27 height=%2716%27 viewBox=%270 0 120 100%27 fill=%27rgb(0,0,0)%27%3E%3Crect y=%270%27 width=%27120%27 height=%2720%27 rx=%2710%27 /%3E%3Crect y=%2740%27 width=%27120%27 height=%2720%27 rx=%2710%27 /%3E%3Crect y=%2780%27 width=%27120%27 height=%2720%27 rx=%2710%27 /%3E%3C/svg%3E" />
+        </t:if>
 
-               <t:if t:code="furnace.sessions:uid">
+        <t:a t:href="$wiki">Front Page</t:a>
+        <t:a t:href="$wiki/articles">All Articles</t:a>
+        <t:a t:href="$wiki/changes">Recent Changes</t:a>
+        <t:a t:href="$wiki/random">Random Article</t:a>
 
-                       <t:if t:code="furnace.auth.login:allow-edit-profile?">
-                               | <t:a t:href="$login/edit-profile" t:flow="begin">Edit Profile</t:a>
-                       </t:if>
+        <t:if t:code="furnace.auth:logged-in?">
 
-                       | <t:button t:action="$login/logout" t:flow="begin" class="link-button link">Logout</t:button>
+            <t:if t:code="furnace.auth.features.edit-profile:allow-edit-profile?">
+                <t:a t:href="$realm/edit-profile" t:aside="begin">Edit Profile</t:a>
+            </t:if>
 
-               </t:if>
+            <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
-       </div>
+        </t:if>
 
-       <h1><t:write-title /></h1>
+        <t:form t:method="get" t:action="$wiki/search" style="display: inline;">
+            <input placeholder="Search" name="search" type="text"/>
+            <input type="submit" value="Go"/>
+        </t:form>
+    </nav>
 
-        <t:call-next-template />
+    <div class="page">
+
+        <div id="left">
+            <t:if t:value="contents">
+
+                <t:script t:include="resource:extra/webapps/wiki/wiki.js" />
+
+                <div class="contents">
+                    <t:bind t:name="contents">
+                        <h2>
+                            <t:a t:href="$wiki/view" t:rest="title">
+                                <t:label t:name="title" />
+                            </t:a>
+                        </h2>
+
+                        <t:farkup t:name="content" t:no-follow="true" />
+                    </t:bind>
+                </div>
+            </t:if>
+        </div>
+
+        <div id="right">
+            <h1 class="title"><t:write-title /></h1>
+            <t:call-next-template />
+
+            <t:if t:value="footer">
+                <footer>
+                    <t:bind t:name="footer">
+                        <t:farkup t:name="content" t:no-follow="true" />
+                    </t:bind>
+                </footer>
+            </t:if>
+        </div>
+
+    </div>
+
+    <span style="display:none"></span>
 
 </t:chloe>