X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/88fa0277fa6f5acd7e4d075840aca909b18317e0..fc1eaa7b91bd44d7939c67b1d3d8aef50af3c5db:/widget/reply.php?ds=sidebyside

diff --git a/widget/reply.php b/widget/reply.php
index f8984aa..0c5d5a3 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -23,32 +23,38 @@ if ($_POST) {
 $cols = "*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id AND property = 'attr') AS journal";
 $query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page->link]);
 
-if ($row = $query->fetch()) {
-	print $row->message;
-	$Page->teaser = $row->raw;
-}
-
-print '<ul class="replies">';
+print '<section class="replies">';
 
 $imagecount = 0;
-while ($row = $query->fetch()) {
+for ($i = 0; $row = $query->fetch(); $i++) {
 	$rowuser = new User("profile/{$row->author}");
-	printf('<li id="%d">', $row->id);
-	printf('<strong>%s</strong>', $rowuser->html);
+	printf('<article id="%d">', $row->id);
+	if ($i) {
+		# subsequent reply header
+		printf('<strong>%s</strong>', $rowuser->html);
+	}
+	else {
+		$Page->teaser = $row->raw;
+	}
 	$rowdate = showdate(preg_split('/\D/', $row->created));
-	if ($User->admin('beheer') and $row->updated) {
-		$rowdate = "<s>$rowdate</s> " . showdate(preg_split('/\D/', $row->updated));
+	if ($User->admin('beheer')) {
+		if ($row->updated) {
+			$rowdate = "<s>$rowdate</s> " . showdate(preg_split('/\D/', $row->updated));
+		}
+		if ($User->admin('user') || $User->login === $row->author) {
+			$rowdate .= sprintf(' <a href="%s" title="%s" class=icon>%s</a>',
+				"/{$Page->link}/{$row->id}", 'reactie aanpassen', "\u{270D}");
+		}
 	}
 	printf(' <small class=date>%s</small>', $rowdate);
-	if ($User->admin('beheer') and $User->admin('user') || $User->login === $row->author) {
-		printf(' <a href="%s" title="%s" class=icon>%s</a>',
-			"/{$Page->link}/{$row->id}", 'reactie aanpassen', "\u{270D}");
-	}
 	if ($html = $row->message) {
 		$html = preg_replace('/(?<=<img )/',
 			$imagecount > 2 ? 'loading="lazy" ' : '', $html, -1, $found);
 		$imagecount += $found;
-		printf("<blockquote>\n%s</blockquote>\n", $html);
+		if ($i) {
+			$html = "<blockquote>\n$html</blockquote>\n";
+		}
+		print $html;
 	}
 	if ($changes = json_decode($row->journal)) {
 		print '<ul>';
@@ -71,11 +77,11 @@ while ($row = $query->fetch()) {
 		}
 		print "</ul>\n";
 	}
-	print "</li>\n";
+	print "</article>\n";
 }
 
 if ($User->login) {
-	print '<li><hr/>';
+	print '<article><hr />';
 	print '<form method="post" action="" enctype="multipart/form-data">';
 	if (isset($Issue) and $User->admin("edit {$Page->link}")) {
 		print "<aside>\n";
@@ -139,7 +145,7 @@ if ($User->login) {
 	print '<input type="submit" value="Plaatsen" />'."\n";
 	print "</form>";
 	print '<script src="/upload/progress.js"></script>';
-	print "</li>\n";
+	print "</article>\n";
 }
 
-print "</ul>\n\n";
+print "</section>\n\n";