X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/7213175b8391e8f47f54096fada4fdc33d82b8a1..HEAD:/widget/nieuws.php

diff --git a/widget/nieuws.php b/widget/nieuws.php
index 0dc8d7d..10e31a3 100644
--- a/widget/nieuws.php
+++ b/widget/nieuws.php
@@ -1,8 +1,9 @@
 <?php
 if (!function_exists('shownews')) {
-function shownews($input, $limit = 1000)
+function shownews($input, $limit = 1000, $abbr = FALSE)
 {
 	if (!is_array($input)) $input = glob("$input/*.html");
+	print "<div>\n";
 	foreach (array_reverse($input) as $filename) {
 		$article = new ArchiveArticle($filename);
 		print '<article class="left">';
@@ -16,14 +17,24 @@ function shownews($input, $limit = 1000)
 		print '<div>';
 		printf(
 			'<h3><a href="/%s">%s <small class="date">%s</small></a></h3>',
-			$article->link, $article->title, $article->date
+			$article->link, $article->title, showdate($article->dateparts)
 		);
-		print $article->story;
+		if ($abbr) {
+			print '<p>' . $article->teaser;
+			if ($article->story != "<p>{$article->teaser}</p>\n\n") {
+				print ' <small class="footer">(Meer op de site)</small>';
+			}
+			print "</p>\n";
+		}
+		else {
+			print $article->story;
+		}
 		print '</div>';
 		print "</article>\n\n";
 
 		if (--$limit <= 0) break;
 	}
+	print "</div>\n";
 }
 
 function printtoc($input, $class = FALSE)
@@ -42,7 +53,7 @@ function printtoc($input, $class = FALSE)
 		$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('<img src="/%s" />', $article->thumb(200)) . $html;
 		}
 		$html = sprintf('<a href="/%s">%s</a>', $article->link, $html);
 		print "<li><article>$html</article></li>\n";
@@ -51,23 +62,26 @@ function printtoc($input, $class = FALSE)
 }
 }
 
-$articles = (ltrim($Args, '/') ?: 'nieuws');
+$articles = $Page->place[0] ?? 'nieuws';
 if (strpos($articles, '/') === FALSE) {
-	if (@$Place['view'] === 'toc') {
+	if (@$Page->place['view'] === 'toc') {
+		print "<div>\n";
 		foreach (array_reverse(glob("$articles/2???")) as $page) {
 			$year = basename($page, '.html');
 			printf('<h3><a href="/%s">%s</a></h3>'."\n", $page, $year);
 			printtoc($page, 'gallery');
 		}
+		print "</div>\n";
 		return;
 	}
 	$articles .= '/????';
 }
 
-if (@$Place['view'] === 'toc') {
+if (@$Page->place['view'] === 'toc') {
 	printtoc($articles);
 	return;
 }
 ob_start();
-shownews($articles, @$Place['n'] ?: 5);
-print getoutput();
+shownews($articles, @$Page->place['n'] ?: 5, !empty($Page->place['teaser']));
+$Page->raw = ob_get_clean();
+print $Page->render();