issue/activity: author footer below messages

[minimedit.git] / widget / issue / activity.php

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 7829f93c0a5160ed3f4d2ac4a94c524ef10fa996..f09cdc742fd492d2b1178070e6361e79dd84c07f 100644 (file)
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -3,25 +3,37 @@ global $Db;
 require_once 'database.inc.php';
 
 $limit = $Page->place['n'] ?? 50;
-$cols = 'm.*, i.subject, i.closed';
+$cols = 'm.*, i.subject, i.updated, i.closed';
 $sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue";
+$sql .= " WHERE message IS NOT NULL";
 $sql .= " ORDER BY m.created DESC LIMIT $limit";
+$sql = "SELECT * FROM ($sql) x ORDER BY updated DESC, created, id"; # grouped issues
 $query = $Db->query($sql);
 
-print '<ul class="replies">';
+print '<dl class="replies">';
 
+$group = NULL;
 while ($row = $query->fetch()) {
-       $rowuser = new User("profile/{$row->author}");
-       print '<li>';
-       printf('<strong>%s</strong> <small class="date">%s</small>',
-               $rowuser->html, showdate(preg_split('/\D/', $row->created))
-       );
-       printf("\n\t".'<a href="/%s">%s</a>', $row->page, $row->subject);
-       if ($row->closed) {
-               print ' <em>(opgelost)</em>';
+       if ($group !== $row->issue) {
+               $group = $row->issue;
+               print '<dt>';
+               printf('<a href="/%s">%s</a>', $row->page, $row->subject);
+               if ($row->closed) {
+                       print ' <em>(opgelost)</em>';
+               }
+               print '</dt>';
+       }
+       print '<dd>';
+       printf("<blockquote>%s</blockquote>\n\t", $row->message);
+       print '<span class="right">';
+       if ($row->author and $rowuser = new User("profile/{$row->author}")) {
+               printf('<strong>%s</strong> ', $rowuser->html);
        }
-       printf("\n\t<blockquote>%s</blockquote>", $row->message);
-       print "</li>\n";
+       printf('<small class="date">%s</small>',
+               showdate(preg_split('/\D/', $row->created))
+       );
+       print "</span>";
+       print "</dd>\n";
 }
 
-print "</ul>\n";
+print "</dl>\n";