author | Jeff Smith <whydoubt@yahoo.com> | 2010-07-29 14:32:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:07 (UTC) |
commit | 39c2e224d3c55dfa1a7668399897be295be07dc7 (patch) (side-by-side diff) | |
tree | 361f85c61886eecf153243fae1ada8a7618d8728 | |
parent | 059b39344fdcde324dff1099fc4b70c7aab12a96 (diff) | |
download | cgit-39c2e224d3c55dfa1a7668399897be295be07dc7.zip cgit-39c2e224d3c55dfa1a7668399897be295be07dc7.tar.gz cgit-39c2e224d3c55dfa1a7668399897be295be07dc7.tar.bz2 |
ui-log: Display git notes when present
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 11 | ||||
-rw-r--r-- | ui-log.c | 12 |
2 files changed, 23 insertions, 0 deletions
@@ -159,16 +159,27 @@ table.list td.logsubject { } table.list td.logmsg { font-family: monospace; white-space: pre; 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 { color: black; } table.list td a.ls-dir { font-weight: bold; color: #00f; } @@ -106,25 +106,37 @@ void print_commit(struct commit *commit) htmlf("%d", files); if (ctx.repo->enable_log_linecount) { html("</td><td>"); htmlf("-%d/+%d", rem_lines, add_lines); } } html("</td></tr>\n"); if (ctx.qry.showmsg) { + struct strbuf notes = STRBUF_INIT; + get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); + if (ctx.repo->enable_log_filecount) { cols++; if (ctx.repo->enable_log_linecount) cols++; } htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", cols); html_txt(info->msg); html("</td></tr>\n"); + 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(¬es); } cgit_free_commitinfo(info); } static const char *disambiguate_ref(const char *ref) { unsigned char sha1[20]; const char *longref; |