nieuws: navigation links in common aside container

diff --git a/article.inc.php b/article.inc.php
index 2f5b8739deb3f6c2a2446395156749b7b6284e14..98cd475b22194095fca6924c9ef4570b6eaed041 100644 (file)
--- 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 747683f08e0d388f1df0f4578bac6a5e6efc24ab..96219780f49fd2134989290d2f126ab799a0c092 100644 (file)
--- 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 513237fb8133e60a5fef5565e8baf3145b1cd9c6..e83a5bab7423ec6ac551f9ec4e032d6fec85941c 100644 (file)
--- 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>