From db34f863d9a47e768ac0ea9a00d1646dda069c09 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sun, 17 May 2020 05:42:58 +0200
Subject: [PATCH] nieuws: navigation links in common aside container

---
 article.inc.php      | 2 +-
 login/post/index.php | 2 +-
 nieuws/index.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/article.inc.php b/article.inc.php
index 2f5b873..98cd475 100644
--- a/article.inc.php
+++ b/article.inc.php
@@ -132,7 +132,7 @@ class ArchiveArticle
 		$offset = strpos($this->raw, '</h2>');
 		$offset = $offset ? $offset + 5 : 0;
 		if (preg_match('{
-			\G (?> \s+ | <p\sclass="nav\b.*?</p> | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
+			\G (?> \s+ | <aside\b.*?</aside> | <div [^>]*> | \[\[[^]]*\]\] )* <p> \s* (.*?) </p>
 		}sx', $this->raw, $bodyp, 0, $offset)) {
 			return $bodyp[1];
 		}
diff --git a/login/post/index.php b/login/post/index.php
index 747683f..9621978 100644
--- a/login/post/index.php
+++ b/login/post/index.php
@@ -31,4 +31,4 @@ else {
 	$Place['pass'] = '<em>onbekend</em>';
 }
 
-print '<p class="nav right"><a href="javascript:window.print()">Print</a></p>'."\n";
+print '<aside class="nav"><a href="javascript:window.print()">Print</a></aside>'."\n";
diff --git a/nieuws/index.html b/nieuws/index.html
index 513237f..e83a5ba 100644
--- a/nieuws/index.html
+++ b/nieuws/index.html
@@ -1,4 +1,4 @@
-<div class="nav right"><a href="/nieuws/feed" rel="alternate" title="Atom feed van nieuwsberichten" type="application/atom+xml">Feed</a></div>
+<aside class="nav"><a href="/nieuws/feed" rel="alternate" title="Atom feed van nieuwsberichten" type="application/atom+xml">Feed</a></aside>
 
 <div id="news">
 <h2>Nieuwsarchief</h2>
-- 
2.30.0