diff options
author | Jeff Smith | 2010-07-29 09:32:31 -0500 |
---|---|---|
committer | Lars Hjemli | 2010-08-04 03:10:07 +0200 |
commit | 39c2e224d3c55dfa1a7668399897be295be07dc7 (patch) | |
tree | 361f85c61886eecf153243fae1ada8a7618d8728 | |
parent | ui-commit: Display git notes when present (diff) | |
download | cgit-39c2e224d3c55dfa1a7668399897be295be07dc7.tar.gz cgit-39c2e224d3c55dfa1a7668399897be295be07dc7.zip |
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
diff --git a/cgit.css b/cgit.css index 3675697..0c88b65 100644 --- a/cgit.css +++ b/cgit.css | |||
@@ -164,6 +164,17 @@ table.list td.logmsg { | |||
164 | padding: 1em 0.5em 2em 0.5em; | 164 | padding: 1em 0.5em 2em 0.5em; |
165 | } | 165 | } |
166 | 166 | ||
167 | table.list td.lognotes-label { | ||
168 | text-align:right; | ||
169 | vertical-align:top; | ||
170 | } | ||
171 | |||
172 | table.list td.lognotes { | ||
173 | font-family: monospace; | ||
174 | white-space: pre; | ||
175 | padding: 0em 0.5em 2em 0.5em; | ||
176 | } | ||
177 | |||
167 | table.list td a { | 178 | table.list td a { |
168 | color: black; | 179 | color: black; |
169 | } | 180 | } |
diff --git a/ui-log.c b/ui-log.c index ee93653..7f38d2a 100644 --- a/ui-log.c +++ b/ui-log.c | |||
@@ -111,6 +111,9 @@ void print_commit(struct commit *commit) | |||
111 | } | 111 | } |
112 | html("</td></tr>\n"); | 112 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { | 113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; | ||
115 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | ||
116 | |||
114 | if (ctx.repo->enable_log_filecount) { | 117 | if (ctx.repo->enable_log_filecount) { |
115 | cols++; | 118 | cols++; |
116 | if (ctx.repo->enable_log_linecount) | 119 | if (ctx.repo->enable_log_linecount) |
@@ -120,6 +123,15 @@ void print_commit(struct commit *commit) | |||
120 | cols); | 123 | cols); |
121 | html_txt(info->msg); | 124 | html_txt(info->msg); |
122 | html("</td></tr>\n"); | 125 | html("</td></tr>\n"); |
126 | if (notes.len != 0) { | ||
127 | html("<tr class='nohover'>"); | ||
128 | html("<td class='lognotes-label'>Notes:</td>"); | ||
129 | htmlf("<td colspan='%d' class='lognotes'>", | ||
130 | cols); | ||
131 | html_txt(notes.buf); | ||
132 | html("</td></tr>\n"); | ||
133 | } | ||
134 | strbuf_release(¬es); | ||
123 | } | 135 | } |
124 | cgit_free_commitinfo(info); | 136 | cgit_free_commitinfo(info); |
125 | } | 137 | } |