issue: populate ticket data before reply include

[minimedit.git] / issue / index.php

diff --git a/issue/index.php b/issue/index.php
index 82fa39e024287b442086c82dd824e8010a24d8b5..cefe00f363f8765f22faa649267ebfbab2efe751 100644 (file)
--- a/issue/index.php
+++ b/issue/index.php
@@ -5,34 +5,36 @@ require_once 'database.inc.php';
 
 if ($id and ctype_digit($id)) {
        $Article->title = "Issue #$id";
-
+       $Args = "/$id";  # minimal reference
        $Issue = $Db->query(
                'SELECT * FROM issues WHERE page = ? AND id = ?', [$Page, $id]
        )->fetch();
        if (!$Issue) throw new Exception('Issuenummer niet gevonden');
 
+       $replies = placeholder_include('reply');  # handle updates
+
        $Article->title .= ': '.htmlspecialchars($Issue->subject);
        print "<h2>{$Article->title}</h2>\n";
-       $author = $Issue->author ? new User('profile/'.$Issue->author, FALSE) : NULL;
-       printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
-               'Geplaatst',
-               $author ? " door <strong>{$author->html}</strong>" : '',
-               showdate(preg_split('/\D/', $Issue->created))
-       );
+       print "<dl class=\"aside right sidebar\">\n";
+       print '<dt>Geplaatst</dt>';
+       printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->created)));
+       if ($Issue->author and $author = new User('profile/'.$Issue->author, FALSE)) {
+               printf('<dd>%s</dd>'."\n", $author->html);
+       }
        if ($Issue->assign) {
-               printf('<p><em>%s</em> aan <strong>%s</strong></p>'."\n",
-                       'Toegewezen', htmlspecialchars($Issue->assign)
-               );
+               print '<dt>Toegewezen aan</dt>';
+               printf('<dd>%s</dd>'."\n", htmlspecialchars($Issue->assign));
        }
        if ($Issue->closed) {
-               printf('<p><em>%s</em>%s <small class=date>%s</small></p>'."\n",
-                       'Opgelost', '',
-                       showdate(preg_split('/\D/', $Issue->closed))
-               );
+               print '<dt>Opgelost</dt>';
+               printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
        }
+       print "</dl>\n\n";
+
+       print '<div>';
        print $Issue->body;
-       $Args = "/$id";  # minimal reference
-       print placeholder_include('reply');
+       print $replies;
+       print "</div>\n";
        return;
 }
 
@@ -66,7 +68,7 @@ if ($id == 'feed') {
 ob_start();
 print '<ul>';
 while ($row = $query->fetch()) {
-       printf('<li%s><a href="%s">%s <small class="date">%s</small>%s</a>',
+       printf('<li%s><div><a href="%s">%s <small class="date">%s</small>%s</a>',
                $row->closed ? ' class="disabled"' : '',
                "/$Page/{$row->id}/{$row->link}",
                sprintf($row->closed ? '<s>%s</s>' : '%s',
@@ -77,7 +79,7 @@ while ($row = $query->fetch()) {
                        isset($row->assign) ? '<em class="right">'.$row->assign.'</em>' : '',
                ])
        );
-       print "</li>\n";
+       print "</div></li>\n";
 }
 print "</ul>\n";
 $Place['issuelist'] = ob_get_clean();