X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/2573a637bff34caeb3de0f3489c0c6dfbf6d2a1d..5aa7946eabd147041a42f3347f447eb53ee0cc47:/widget/login/commits.php

diff --git a/widget/login/commits.php b/widget/login/commits.php
index c2d6449..2060a33 100644
--- a/widget/login/commits.php
+++ b/widget/login/commits.php
@@ -4,8 +4,9 @@ if (!function_exists('popen')) {
 	return;
 }
 
+$baseurl = 'login/commits';
 $pagesize = intval(@$Page->place['n'] ?: @$_GET['n']) ?: 20;
-$gitcmd = "git log -n $pagesize --pretty='%at\t%an\t%s'";
+$gitcmd = "git log -n $pagesize --pretty='%h\t%at\t%an\t%s'";
 
 if ( $offset = intval(@$_GET['start']) ) {
 	$gitcmd .= " --skip=$offset";
@@ -15,20 +16,24 @@ if ( $log = popen($gitcmd, 'r') ) {
 	$lines = 0;
 	print "<ul>\n";
 	while ( $line = fgets($log) ) {
-		list ($atime, $author, $message) = explode("\t", $line, 3);
+		list ($id, $atime, $author, $message) = explode("\t", $line, 4);
 		list ($author) = explode(' ', $author); # first name only
-		printf('<li>%s <small class="date">%s • %s</small></li>'."\n",
-			htmlspecialchars($message),
+		$html = htmlspecialchars(rtrim($message));
+		$html .= sprintf(' <small class="date">%s • %s</small>',
 			htmlspecialchars($author), strftime('%F %H:%M', $atime)
 		);
+		$html = sprintf('<a href="%s">%s</a>',
+			"/$baseurl/$id", $html
+		);
+		print "<li>$html</li>\n";
 		$lines++;
 	}
 	print "</ul>\n\n";
 	pclose($log);
 
-	$navoptions = ["start=$offset", "n=$pagesize", "total=$lines"];
-	if ($Page->handler != 'login/commits') {
-		$navoptions[] = 'link=login/commits';
-	}
-	print $Page->widget('nav', $navoptions);
+	$limit = $offset + $lines + 1; # assume one more
+	print $Page->widget('nav', [
+		'start' => $offset, 'n' => $pagesize, 'total' => $limit,
+		'link' => $Page->link == $baseurl ? NULL : $baseurl,
+	]);
 }