2 files changed, 25 insertions, 18 deletions

diff --git a/cgit.css b/cgit.css
index 7a5f423..0c88b65 100644
--- a/cgit.css
+++ b/cgit.css
@@ -161,7 +161,18 @@ table.list td.logsubject {
 table.list td.logmsg {
 	font-family: monospace;
 	white-space: pre;
-	padding: 0 0.5em;
+	padding: 1em 0.5em 2em 0.5em;
+}
+
+table.list td.lognotes-label {
+	text-align:right;
+	vertical-align:top;
+}
+
+table.list td.lognotes {
+	font-family: monospace;
+	white-space: pre;
+	padding: 0em 0.5em 2em 0.5em;
 }
 
 table.list td a {
diff --git a/ui-log.c b/ui-log.c
index 6d7fcae..27f5a1a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -111,33 +111,29 @@ void print_commit(struct commit *commit)
 		}
 	}
 	html("</td></tr>\n");
-
-	if (ctx.qry.showmsg) { /* Print message + notes in a second table row */
-		/* Concatenate commit message and notes in msgbuf */
-		struct strbuf msgbuf = STRBUF_INIT;
-		if (info->msg && *(info->msg)) {
-			strbuf_addstr(&msgbuf, info->msg);
-			strbuf_addch(&msgbuf, '\n');
-		}
-		format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING,
-		            NOTES_SHOW_HEADER | NOTES_INDENT);
-		strbuf_addch(&msgbuf, '\n');
-		strbuf_ltrim(&msgbuf);
+	if (ctx.qry.showmsg) {
+		struct strbuf notes = STRBUF_INIT;
+		format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);
 
 		if (ctx.repo->enable_log_filecount) {
 			cols++;
 			if (ctx.repo->enable_log_linecount)
 				cols++;
 		}
-
-		/* Create second table row containing msgbuf */
 		htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>",
 			cols);
-		html_txt(msgbuf.buf);
+		html_txt(info->msg);
 		html("</td></tr>\n");
-		strbuf_release(&msgbuf);
+		if (notes.len != 0) {
+			html("<tr class='nohover'>");
+			html("<td class='lognotes-label'>Notes:</td>");
+			htmlf("<td colspan='%d' class='lognotes'>",
+				cols);
+			html_txt(notes.buf);
+			html("</td></tr>\n");
+		}
+		strbuf_release(&notes);
 	}
-
 	cgit_free_commitinfo(info);
 }