From 8375d212106918b602911f6286d2e4fd172d446e Mon Sep 17 00:00:00 2001
From: Marcel Korpel <marcel.korpel@gmail.com>
Date: Thu, 9 Jul 2015 00:33:25 +0200
Subject: Use SVG image for comment deletion icon

This also puts the icon to the right and the timestamp in the byline
and wipes out a repeated instance of the byline.

Signed-off-by: Marcel Korpel <marcel.korpel@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
---
 web/template/pkg_comments.php | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'web/template/pkg_comments.php')

diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index 3e99d9b..03a6581 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -20,32 +20,26 @@ $count = pkgbase_comments_count($base_id, $include_deleted);
 			$row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>";
 		endif; ?>
 		<h4<?php if ($row['DelUsersID']): ?> class="comment-deleted"<?php endif; ?>>
-			<?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?>
-				<form method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>">
-					<fieldset style="display:inline;">
-						<input type="hidden" name="action" value="do_DeleteComment" />
-						<input type="hidden" name="comment_id" value="<?= $row['ID'] ?>" />
-						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
-						<input type="image" src="/images/x.png" alt="<?= __('Delete comment') ?>" name="submit" value="1" />
-					</fieldset>
-					<?php if ($row['UserName']): ?>
-					<?= __('Comment by %s', $row['UserName']) ?>
-					<?php else: ?>
-					<?= __('Anonymous comment') ?>
-					<?php endif; ?>
-				</form>
-			<?php else: ?>
 			<?php if ($row['UserName']): ?>
-			<?= __('Comment by %s', $row['UserName']) ?>
+			<?= __('%s commented', $row['UserName']) ?>
 			<?php else: ?>
 			<?= __('Anonymous comment') ?>
 			<?php endif; ?>
+			<?= __('on %s', gmdate('Y-m-d H:i', $row['CommentTS'])) ?>
 			<?php if ($row['DelUsersID']): ?>
 			(<?= __('deleted') ?>)
 			<?php endif; ?>
+			<?php if (!$row['DelUsersID'] && can_delete_comment_array($row)): ?>
+				<form class="delete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>">
+					<fieldset style="display:inline;">
+						<input type="hidden" name="action" value="do_DeleteComment" />
+						<input type="hidden" name="comment_id" value="<?= $row['ID'] ?>" />
+						<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />
+						<input type="image" class="delete-comment" src="/images/x.min.svg" width="11" height="11" alt="<?= __('Delete comment') ?>" title="<?= __('Delete comment') ?>" name="submit" value="1" />
+					</fieldset>
+				</form>
 			<?php endif; ?>
 		</h4>
-		<p class="timestamp"><?= gmdate('Y-m-d H:i', $row['CommentTS']) ?></p>
 		<div class="article-content<?php if ($row['DelUsersID']): ?> comment-deleted<?php endif; ?>">
 			<p>
 				<?= parse_comment($row['Comments']) ?>
-- 
cgit v1.2.3-70-g09d2