X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b0b882940b3eb7edb6bd742fa4ff9f8ebbe7abba..519348de7aa1839fe208ecceca7386e1b9ff609d:/nieuws.inc.php

diff --git a/nieuws.inc.php b/nieuws.inc.php
index b58def7..40313e4 100644
--- a/nieuws.inc.php
+++ b/nieuws.inc.php
@@ -109,36 +109,47 @@ 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)
+function printtoc($input, $class = FALSE)
 {
 	if (!is_array($input)) $input = glob("$input/*.html");
-	print '<ul>';
+	print '<ul';
+	if ($class) printf(' class="%s"', $class);
+	print '>';
 	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;
+		$dateparts = $article->dateparts;
+		if ($class) {
+			$dateparts[1] = NULL;  # omit year
+		}
+		$html .= sprintf(' <small class="date">%s</small>', showdate($dateparts));
+		if ($class == 'gallery' and $article->img) {
+			$html = "<div>$html</div>";
+			$html = sprintf('<img src="%s" />', $article->thumb(200)) . $html;
+		}
+		$html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
+		print "<li><article>$html</article></li>\n";
 	}
 	print "</ul>\n";
 }