webapps.wiki: simplify and fix table layouts

[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..2c572e852b6780e16f56eaf0e5f6256f2dcd2bec 100644 (file)
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -10,7 +10,7 @@
 
     <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>
@@ -30,6 +30,7 @@
     </nav>
 
     <div class="page">
+
         <div id="left">
             <t:if t:value="contents">
 
@@ -52,15 +53,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>