issue: metadata list in aside container

[minimedit.git] / issue / index.php

diff --git a/issue/index.php b/issue/index.php
index 6b34216a785fee7c085ca780f12fb8eee71346b8..cc17f0310ac0cb44f0a1018477fb51dd4256c074 100644 (file)
--- a/issue/index.php
+++ b/issue/index.php
@@ -14,8 +14,11 @@ if ($id and ctype_digit($id)) {
        $replies = placeholder_include('reply');  # handle updates
 
        $Article->title .= ': '.htmlspecialchars($Issue->subject);
+       $Article->teaser = $Issue->body;
+       $Article->body = $replies;  # find image
+
        print "<h2>{$Article->title}</h2>\n";
-       print "<dl class=\"aside right sidebar\">\n";
+       print '<aside class="metadata"><dl>'."\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)) {
@@ -29,7 +32,7 @@ if ($id and ctype_digit($id)) {
                print '<dt>Opgelost</dt>';
                printf('<dd>%s</dd>'."\n", showdate(preg_split('/\D/', $Issue->closed)));
        }
-       print "</dl>\n\n";
+       print "</dl></aside>\n\n";
 
        print '<div>';
        print $Issue->body;
@@ -54,7 +57,7 @@ if ($_POST) {
 
 $subsql = "SELECT count(*) FROM comments WHERE page=i.page||'/'||i.id";
 $cols = "*, ($subsql AND message IS NOT NULL) AS replycount";
-$cols .= ", ($subsql AND message ~ 'img') AS imagecount";
+$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
 $sql = "SELECT $cols FROM issues i WHERE page = ?";
 if (isset($_GET['open'])) {
        $sql .= ' AND closed IS NULL';
@@ -79,15 +82,15 @@ while ($row = $query->fetch()) {
                        showdate(array_slice(preg_split('/\D/', $row->updated), 0, 3))
                );
        }
-       if ($row->imagecount) {
-               print ' <span class="right icon images" title="afbeeldingen">*</span>';
-       }
        if ($row->replycount) {
                printf(' <span class=right>%s %d</span>',
-                       '<span class="icon replies" title="reacties">+</span>',
+                       '<span class="icon icon-comment" title="reacties">&#x1F5E8;</span>',
                        $row->replycount
                );
        }
+       if ($row->imagecount) {
+               print ' <span class="right icon icon-camera" title="afbeeldingen">&#x1F4F7;</span>';
+       }
        if (isset($row->assign)) {
                print ' <em class="right">'.$row->assign.'</em>';
        }