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 77c34f642c8dcdb96eef2a6115f462279c4ef51f..1a04c9bc53f648451057690bbec99961f6d3f9ae 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -2,15 +2,15 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-       <t:atom t:href="$wiki/changes.atom">
-               Recent Changes
-       </t:atom>
+    <t:atom t:href="$wiki/changes.atom">
+        Recent Changes
+    </t:atom>
 
-       <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
+    <t:style t:include="resource:extra/webapps/wiki/wiki.css" />
 
     <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=%2724%27 viewBox=%270 0 100 100%27 fill=%27rgb(0,0,0)%27%3E%3Crect x=%2710%27 y=%2720%27 width=%2780%27 height=%2712%27 rx=%276%27 /%3E%3Crect x=%2710%27 y=%2744%27 width=%2780%27 height=%2712%27 rx=%276%27 /%3E%3Crect x=%2710%27 y=%2768%27 width=%2780%27 height=%2712%27 rx=%276%27 /%3E%3C/svg>" />
+            <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:a t:href="$wiki">Front Page</t:a>
@@ -27,9 +27,15 @@
             <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
         </t:if>
+
+        <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>
 
     <div class="page">
+
         <div id="left">
             <t:if t:value="contents">
 
@@ -52,15 +58,16 @@
         <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>
 
-        <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>
 
     <span style="display:none"></span>