From c2c6febce3ca1dc68bf1fcb9d444a21ebbb64276 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Thu, 27 Feb 2020 15:11:55 -0800
Subject: [PATCH] websites.concatenative: move container div to page.xml.

---
 extra/webapps/pastebin/pastebin-common.xml |  39 ++++----
 extra/webapps/pastebin/pastebin.css        |   8 --
 extra/webapps/planet/planet-common.xml     |   3 -
 extra/webapps/planet/planet.css            |   8 --
 extra/webapps/wiki/wiki-common.xml         | 110 ++++++++++-----------
 extra/webapps/wiki/wiki-contents.css       |   4 +-
 extra/webapps/wiki/wiki.css                |  16 +--
 extra/websites/concatenative/page.css      |   8 ++
 extra/websites/concatenative/page.xml      |   8 +-
 9 files changed, 90 insertions(+), 114 deletions(-)

diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml
index 435028ecf7..e7a137f5c0 100644
--- a/extra/webapps/pastebin/pastebin-common.xml
+++ b/extra/webapps/pastebin/pastebin-common.xml
@@ -6,31 +6,28 @@
 
 	<t:style t:include="resource:extra/webapps/pastebin/pastebin.css" />
 
-    <div id="container">
+    <div class="navbar">
 
-        <div class="navbar">
+        <t:a t:href="$pastebin">Pastes</t:a>
+        <t:a t:href="$pastebin/new-paste">New Paste</t:a>
 
-            <t:a t:href="$pastebin">Pastes</t:a>
-            <t:a t:href="$pastebin/new-paste">New Paste</t:a>
+        <t:if t:code="furnace.auth:logged-in?">
 
-            <t:if t:code="furnace.auth:logged-in?">
-
-                <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:button t:action="$login-realm/logout" t:aside="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>
-            <div style="float: right;">
-                <a href="//factorcode.org"><b>factorcode.org</b></a>
-            </div>
+
+            <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+        </t:if>
+        <div style="float: right;">
+            <a href="//factorcode.org"><b>factorcode.org</b></a>
         </div>
-
-        <div class="page">
-            <h1><t:write-title /></h1>
-
-            <t:call-next-template />
-        </div>
-
     </div>
+
+    <div class="page">
+        <h1><t:write-title /></h1>
+
+        <t:call-next-template />
+    </div>
+
 </t:chloe>
diff --git a/extra/webapps/pastebin/pastebin.css b/extra/webapps/pastebin/pastebin.css
index 2e96ef4f10..94f063cd0b 100644
--- a/extra/webapps/pastebin/pastebin.css
+++ b/extra/webapps/pastebin/pastebin.css
@@ -1,11 +1,3 @@
-body {
-    margin: 0;
-}
-
-#container {
-    max-width: 1000px;
-}
-
 .page {
     padding-left: 15px;
     padding-right: 15px;
diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml
index 81bc022744..87e1a2f9f9 100644
--- a/extra/webapps/planet/planet-common.xml
+++ b/extra/webapps/planet/planet-common.xml
@@ -4,8 +4,6 @@
 
 	<t:style t:include="resource:extra/webapps/planet/planet.css" />
 
-    <div id="container">
-
 	<div class="navbar">
 		<t:a t:href="$planet">Front Page</t:a>
 		<t:a t:href="$planet/feed.xml">Atom Feed</t:a>
@@ -29,5 +27,4 @@
         <t:call-next-template />
     </div>
 
-    </div>
 </t:chloe>
diff --git a/extra/webapps/planet/planet.css b/extra/webapps/planet/planet.css
index 4679d56540..dff6eb4c45 100644
--- a/extra/webapps/planet/planet.css
+++ b/extra/webapps/planet/planet.css
@@ -1,11 +1,3 @@
-body {
-    margin: 0;
-}
-
-#container {
-    max-width: 1000px;
-}
-
 .page {
     padding-left: 15px;
     padding-right: 15px;
diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index 03f5f7bc30..b5325e91a1 100644
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -8,68 +8,64 @@
 
 	<t:style t:include="resource:extra/webapps/wiki/wiki.css" />
 
-    <div id="container">
+    <div id="left">
 
-        <div id="left">
+        <t:if t:value="contents">
 
-            <t:if t:value="contents">
-
-                <t:style t:include="resource:extra/webapps/wiki/wiki-contents.css" />
-                <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:bind>
-                </div>
-            </t:if>
-
-        </div>
-
-        <div id="right">
-
-            <div class="navbar">
-
-                <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:logged-in?">
-
-                    <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:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
-
-                </t:if>
+            <t:style t:include="resource:extra/webapps/wiki/wiki-contents.css" />
+            <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:bind>
             </div>
-
-            <div class="page">
-                <h1><t:write-title /></h1>
-
-                <t:call-next-template />
-
-            </div>
-
-            <t:if t:value="footer">
-                <div class="footer">
-                    <t:bind t:name="footer">
-                        <t:farkup t:name="content" />
-                    </t:bind>
-                </div>
-            </t:if>
-
-        </div>
-
-        <span style="display:none"></span>
+        </t:if>
 
     </div>
 
+    <div id="right">
+
+        <div class="navbar">
+
+            <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:logged-in?">
+
+                <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:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
+
+            </t:if>
+
+        </div>
+
+        <div class="page">
+            <h1><t:write-title /></h1>
+
+            <t:call-next-template />
+
+        </div>
+
+        <t:if t:value="footer">
+            <div class="footer">
+                <t:bind t:name="footer">
+                    <t:farkup t:name="content" />
+                </t:bind>
+            </div>
+        </t:if>
+
+    </div>
+
+    <span style="display:none"></span>
+
 </t:chloe>
diff --git a/extra/webapps/wiki/wiki-contents.css b/extra/webapps/wiki/wiki-contents.css
index 321c412269..c53dcfff34 100644
--- a/extra/webapps/wiki/wiki-contents.css
+++ b/extra/webapps/wiki/wiki-contents.css
@@ -1,10 +1,10 @@
 #left {
     float: left;
-    width: 180px;
+    width: 200px;
     border-right: 1px solid #ccc;
     background: #f3f2ea;
 }
 
 #right {
-    margin-left: 180px;
+    margin-left: 200px;
 }
diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css
index 4ed03ce3be..5fa8348b63 100644
--- a/extra/webapps/wiki/wiki.css
+++ b/extra/webapps/wiki/wiki.css
@@ -1,18 +1,9 @@
-body {
-    margin: 0;
-}
-
-#container {
-    margin: 0 auto;
-    width: 100%;
-}
-
 #left {
     width: 0;
 }
 
 #right {
-    max-width: 800px;
+    width: 800px;
 }
 
 .comparison th {
@@ -56,18 +47,17 @@ body {
 }
 
 .contents {
-    font-size: smaller;
+    font-size: 90%;
     margin: 0;
     padding: 0;
     padding-left: 10px;
     padding-right: 10px;
-    line-height: 125%;
 }
 
 .contents ul {
     list-style-type: none;
     margin: 0;
-    padding-left: 10px;
+    padding-left: 20px;
 }
 
 .page {
diff --git a/extra/websites/concatenative/page.css b/extra/websites/concatenative/page.css
index 9eb41b0f51..e72702b987 100644
--- a/extra/websites/concatenative/page.css
+++ b/extra/websites/concatenative/page.css
@@ -6,6 +6,10 @@ html {
     box-sizing: inherit;
 }
 
+body {
+    margin: 0;
+}
+
 body, button {
     font-size: 12pt;
     font-family: sans-serif;
@@ -31,6 +35,10 @@ a, .link { color: #104e8b; }
 a:link, a:visited, a:active, .link { text-decoration: none; }
 a:hover, .link:hover { text-decoration: underline; }
 
+#container {
+    max-width: 1000px;
+}
+
 .error { color: #a00; }
 
 .errors li { color: #a00; }
diff --git a/extra/websites/concatenative/page.xml b/extra/websites/concatenative/page.xml
index 5f9611c21b..7f490c7d0b 100644
--- a/extra/websites/concatenative/page.xml
+++ b/extra/websites/concatenative/page.xml
@@ -16,8 +16,12 @@
 			<t:write-atom />
 		</head>
 
-		<body>
-			<t:call-next-template />
+        <body>
+
+            <div id="container">
+            <t:call-next-template />
+            </div>
+
 		</body>
 
 	</t:chloe>