From c5475012af6d40d9fc576f179d6603247e7c5117 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 5 Aug 2022 16:42:20 -0700
Subject: [PATCH] webapps: using nav html element, cleanup

---
 .../parser-combinators.html                   |  5 ++-
 extra/webapps/blogs/blogs-common.xml          | 38 +++++++++----------
 extra/webapps/help/help.factor                |  2 +-
 extra/webapps/help/search.xml                 |  6 +--
 extra/webapps/pastebin/pastebin-common.xml    |  4 +-
 extra/webapps/planet/planet-common.xml        |  4 +-
 extra/webapps/todo/todo.xml                   |  4 +-
 extra/webapps/user-admin/user-admin.xml       |  4 +-
 extra/webapps/wee-url/wee-url.xml             |  2 +-
 extra/webapps/wiki/page-common.xml            |  4 +-
 extra/webapps/wiki/wiki-common.xml            |  8 ++--
 extra/webapps/wiki/wiki-contents.css          |  4 +-
 extra/webapps/wiki/wiki.css                   |  2 +-
 extra/websites/concatenative/page.css         |  7 ++--
 14 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/extra/parser-combinators/parser-combinators.html b/extra/parser-combinators/parser-combinators.html
index 6d449130d0..3c7a0f25c3 100644
--- a/extra/parser-combinators/parser-combinators.html
+++ b/extra/parser-combinators/parser-combinators.html
@@ -335,8 +335,9 @@ factored a little, looks quite readable:</p>
   ( 3 ) "40+2" expression call lcar .
         =&gt; [[ "" 42 ]]
 </pre>
-<p class="footer">
+<footer>
 News and updates to this software can be obtained from the authors
 weblog: <a href="http://radio.weblogs.com/0102385">Chris Double</a>.</p>
-<p id="copyright">Copyright (c) 2004, Chris Double. All Rights Reserved.</p>
+<p id="copyright">Copyright (c) 2004, Chris Double. All Rights Reserved.
+</footer>
 </body> </html>
diff --git a/extra/webapps/blogs/blogs-common.xml b/extra/webapps/blogs/blogs-common.xml
index 1beddd6846..30a5356417 100644
--- a/extra/webapps/blogs/blogs-common.xml
+++ b/extra/webapps/blogs/blogs-common.xml
@@ -2,34 +2,34 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<t:atom t:href="$blogs/posts.atom">Recent Posts</t:atom>
+    <t:atom t:href="$blogs/posts.atom">Recent Posts</t:atom>
 
-	<t:style t:include="resource:extra/webapps/blogs/blogs.css" />
+    <t:style t:include="resource:extra/webapps/blogs/blogs.css" />
 
-	<div class="navbar">
-	<div class="navrow">
+    <nav>
+    <div class="navrow">
 
-		<t:a t:href="$blogs/">All Posts</t:a>
-		<t:a t:href="$blogs/by">My Posts</t:a>
-		<t:a t:href="$blogs/new-post">New Post</t:a>
+        <t:a t:href="$blogs/">All Posts</t:a>
+        <t:a t:href="$blogs/by">My Posts</t:a>
+        <t:a t:href="$blogs/new-post">New Post</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: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:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 
-		</t:if>
+        </t:if>
 
-	</div>
-	</div>
+    </div>
+    </nav>
 
-	<div class="page">
-	<h1><t:write-title /></h1>
+    <div class="page">
+    <h1><t:write-title /></h1>
 
-	<t:call-next-template />
-	</div>
+    <t:call-next-template />
+    </div>
 
 </t:chloe>
diff --git a/extra/webapps/help/help.factor b/extra/webapps/help/help.factor
index 73066f5ec7..79c789ed02 100644
--- a/extra/webapps/help/help.factor
+++ b/extra/webapps/help/help.factor
@@ -33,7 +33,7 @@ TUPLE: help-webapp < dispatcher ;
                     [ vocab-apropos ?links "vocabs" set-value ] tri
                 ] with-directory
             ] unless-empty not "empty" set-value
-            help-navbar "navbar" set-value
+            help-nav "nav" set-value
 
             { help-webapp "search" } <chloe-content>
         ] >>display
diff --git a/extra/webapps/help/search.xml b/extra/webapps/help/search.xml
index b64b49ecbd..6446b8e800 100644
--- a/extra/webapps/help/search.xml
+++ b/extra/webapps/help/search.xml
@@ -6,7 +6,7 @@
     <t:style t:include="resource:extra/webapps/help/search.css" />
     <t:script t:include="resource:extra/webapps/help/search.js" />
 
-    <t:html t:name="navbar"/>
+    <t:html t:name="nav"/>
 
     <div class="page">
 
@@ -57,7 +57,7 @@
     </div>
 
     <br />
-    <div class="footer">
+    <footer>
     <p>
     This documentation was generated offline from a
     <code>load-all</code> image.  If you want, you can also
@@ -66,7 +66,7 @@
     the <a href="https://factorcode.org">Factor website</a>
     for more information.
     </p>
-    </div>
+    </footer>
 
     </div>
 
diff --git a/extra/webapps/pastebin/pastebin-common.xml b/extra/webapps/pastebin/pastebin-common.xml
index 852ac433b0..44d0859875 100644
--- a/extra/webapps/pastebin/pastebin-common.xml
+++ b/extra/webapps/pastebin/pastebin-common.xml
@@ -6,7 +6,7 @@
 
 	<t:style t:include="resource:extra/webapps/pastebin/pastebin.css" />
 
-    <div class="navbar">
+    <nav>
     <div class="navrow">
         <a href="https://factorcode.org"><img src="https://factorcode.org/favicon.ico" width="24" height="24" /></a>
 
@@ -22,7 +22,7 @@
             <t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
         </t:if>
     </div>
-    </div>
+    </nav>
 
     <div class="page">
         <h1><t:write-title /></h1>
diff --git a/extra/webapps/planet/planet-common.xml b/extra/webapps/planet/planet-common.xml
index 0a49452d88..bb8aafd874 100644
--- a/extra/webapps/planet/planet-common.xml
+++ b/extra/webapps/planet/planet-common.xml
@@ -4,7 +4,7 @@
 
 	<t:style t:include="resource:extra/webapps/planet/planet.css" />
 
-	<div class="navbar">
+    <nav>
 	<div class="navrow">
 		<a href="https://factorcode.org"><img src="https://factorcode.org/favicon.ico" width="24" height="24" /></a>
 
@@ -20,7 +20,7 @@
 			<t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
         </t:if>
 	</div>
-	</div>
+	</nav>
 
     <div class="page">
 	<h1><t:write-title /></h1>
diff --git a/extra/webapps/todo/todo.xml b/extra/webapps/todo/todo.xml
index 39578084d9..d74e93972d 100644
--- a/extra/webapps/todo/todo.xml
+++ b/extra/webapps/todo/todo.xml
@@ -10,7 +10,7 @@
 
     <body>
 
-	<div class="navbar">
+    <nav>
 	<div class="navrow">
 		<t:a t:href="$todo-list/list">List Items</t:a>
 		<t:a t:href="$todo-list/new">Add Item</t:a>
@@ -21,7 +21,7 @@
 
 		<t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
 	</div>
-	</div>
+	</nav>
 
 	<div class="page">
 	<h1><t:write-title /></h1>
diff --git a/extra/webapps/user-admin/user-admin.xml b/extra/webapps/user-admin/user-admin.xml
index 1144f8eec6..3c0f937d08 100644
--- a/extra/webapps/user-admin/user-admin.xml
+++ b/extra/webapps/user-admin/user-admin.xml
@@ -2,7 +2,7 @@
 
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-	<div class="navbar">
+    <nav>
 		<t:a t:href="$user-admin">List Users</t:a>
 		<t:a t:href="$user-admin/new">Add User</t:a>
 
@@ -11,7 +11,7 @@
 		</t:if>
 
 		<t:button t:action="$login-realm/logout" t:aside="begin" class="link-button link">Logout</t:button>
-	</div>
+	</nav>
 
 	<h1><t:write-title /></h1>
 
diff --git a/extra/webapps/wee-url/wee-url.xml b/extra/webapps/wee-url/wee-url.xml
index 98d1095ed6..df0a6c8c08 100644
--- a/extra/webapps/wee-url/wee-url.xml
+++ b/extra/webapps/wee-url/wee-url.xml
@@ -4,7 +4,7 @@
 
 	<t:title>WeeURL!</t:title>
 
-	<div class="navbar"><t:a t:href="$wee-url">Shorten URL</t:a></div>
+	<nav><t:a t:href="$wee-url">Shorten URL</t:a></nav>
 
 	<h1><t:write-title /></h1>
 
diff --git a/extra/webapps/wiki/page-common.xml b/extra/webapps/wiki/page-common.xml
index 072df30e8a..42291693cf 100644
--- a/extra/webapps/wiki/page-common.xml
+++ b/extra/webapps/wiki/page-common.xml
@@ -8,13 +8,13 @@
 
 	<t:call-next-template />
 
-	<div class="navbar">
+    <nav>
 	<div class="navrow">
 		<t:a t:href="$wiki/view" t:rest="title">Latest</t:a>
 		<t:a t:href="$wiki/revisions" t:rest="title">Revisions</t:a>
 		<t:a t:href="$wiki/edit" t:rest="title" rel="nofollow">Edit</t:a>
 		<t:button t:action="$wiki/delete" t:for="title" class="link-button link">Delete</t:button>
 	</div>
-	</div>
+	</nav>
 
 </t:chloe>
diff --git a/extra/webapps/wiki/wiki-common.xml b/extra/webapps/wiki/wiki-common.xml
index 92ec99ab9f..95732bf6f1 100644
--- a/extra/webapps/wiki/wiki-common.xml
+++ b/extra/webapps/wiki/wiki-common.xml
@@ -33,7 +33,7 @@
 
     <div id="right">
 
-        <div class="navbar">
+        <nav>
         <div class="navrow">
 
             <t:if t:value="contents">
@@ -56,7 +56,7 @@
             </t:if>
 
         </div>
-        </div>
+        </nav>
 
         <div class="page">
             <h1 class="title"><t:write-title /></h1>
@@ -66,11 +66,11 @@
         </div>
 
         <t:if t:value="footer">
-            <div class="footer">
+            <footer>
                 <t:bind t:name="footer">
                     <t:farkup t:name="content" t:no-follow="true" />
                 </t:bind>
-            </div>
+            </footer>
         </t:if>
 
     </div>
diff --git a/extra/webapps/wiki/wiki-contents.css b/extra/webapps/wiki/wiki-contents.css
index 1dc461827d..552942d528 100644
--- a/extra/webapps/wiki/wiki-contents.css
+++ b/extra/webapps/wiki/wiki-contents.css
@@ -9,7 +9,7 @@
     margin-left: 200px;
 }
 
-.navbar img {
+nav img {
     margin: -15px;
     margin-top: -19px;
     margin-right: 0px;
@@ -31,7 +31,7 @@
         margin-left: 0;
     }
 
-    .navbar img {
+    nav img {
         display: inline;
     }
 }
diff --git a/extra/webapps/wiki/wiki.css b/extra/webapps/wiki/wiki.css
index d8ce628ab5..81746b44ff 100644
--- a/extra/webapps/wiki/wiki.css
+++ b/extra/webapps/wiki/wiki.css
@@ -72,7 +72,7 @@
     padding-bottom: 15px;
 }
 
-.page .navbar {
+.page nav {
     margin-left: -15px;
     margin-right: -15px;
     margin-bottom: -15px;
diff --git a/extra/websites/concatenative/page.css b/extra/websites/concatenative/page.css
index 0eb11ac4e0..c420456f7a 100644
--- a/extra/websites/concatenative/page.css
+++ b/extra/websites/concatenative/page.css
@@ -51,7 +51,8 @@ a:hover, .link:hover { text-decoration: underline; }
 .inline {
     display: inline;
 }
-.navbar {
+
+nav {
     border-bottom: 1px solid #ccc;
     background-color: #f5f5f5;
 }
@@ -98,11 +99,11 @@ a:hover, .link:hover { text-decoration: underline; }
         color: #8ab4f8;
     }
 
-    .page .navbar {
+    .page nav {
         border-top: 1px solid #666;
     }
 
-    .navbar {
+    nav {
         background-color: #373e48;
         border-bottom: 1px solid #666;
     }
-- 
2.34.1