nieuws: list items in article containers

diff --git a/nieuws.inc.php b/nieuws.inc.php
index b58def7b7302bdad9ac4e41cc7e93c1155d6cbb2..1565c63af25994371a3367cb4ad177d52c79f6d4 100644 (file)
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -109,26 +109,25 @@ class ArchiveArticle
 function shownews($input, $limit = 1000)
 {
        if (!is_array($input)) $input = glob("$input/*.html");
-       print '<ul class="left">'."\n\n";
        foreach (array_reverse($input) as $filename) {
                $article = new ArchiveArticle($filename);
-               print '<li>';
+               print '<article class="left">';
                if ($article->thumb) {
                        $img = preg_replace('{(?<= \b src="/) [^"]* }x', $article->thumb, $article->img);
                        $img = preg_replace('{(?= />$)}', ' class="left"', $img);
                        print $img;
                }
-               print '<article>';
+               print '<div>';
                printf(
                        '<h3><a href="/%s">%s <small class="date">%s</small></a></h3>',
                        $article->link, $article->title, $article->date
                );
                print $article->body;
-               print "</article></li>\n\n";
+               print '</div>';
+               print "</article>\n\n";
 
                if (--$limit <= 0) break;
        }
-       print "</ul>\n\n";
 }
 
 function printtoc($input)
@@ -137,8 +136,10 @@ function printtoc($input)
        print '<ul>';
        foreach (array_reverse($input) as $page) {
                $article = new ArchiveArticle($page);
-               printf('<li><a href="/%s">%s <small class="date">%s</small></a></li>',
-                       $article->link, $article->safetitle, $article->date);
+               $html = $article->safetitle;
+               $html .= sprintf(' <small class="date">%s</small>', $article->date);
+               $html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
+               print "<li><article>$html</article></li>\n";
        }
        print "</ul>\n";
 }