|
diff --git a/cgit.css b/cgit.css index 3675697..0c88b65 100644 --- a/ cgit.css+++ b/ cgit.css |
|
@@ -155,24 +155,35 @@ table.list td { |
155 | |
155 | |
156 | table.list td.logsubject { |
156 | table.list td.logsubject { |
157 | font-family: monospace; |
157 | font-family: monospace; |
158 | font-weight: bold; |
158 | font-weight: bold; |
159 | } |
159 | } |
160 | |
160 | |
161 | table.list td.logmsg { |
161 | table.list td.logmsg { |
162 | font-family: monospace; |
162 | font-family: monospace; |
163 | white-space: pre; |
163 | white-space: pre; |
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 | } |
170 | |
181 | |
171 | table.list td a.ls-dir { |
182 | table.list td a.ls-dir { |
172 | font-weight: bold; |
183 | font-weight: bold; |
173 | color: #00f; |
184 | color: #00f; |
174 | } |
185 | } |
175 | |
186 | |
176 | table.list td a:hover { |
187 | table.list td a:hover { |
177 | color: #00f; |
188 | color: #00f; |
178 | } |
189 | } |
|
|
diff --git a/ui-log.c b/ui-log.c index ee93653..7f38d2a 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -102,33 +102,45 @@ void print_commit(struct commit *commit) |
102 | add_lines = 0; |
102 | add_lines = 0; |
103 | rem_lines = 0; |
103 | rem_lines = 0; |
104 | cgit_diff_commit(commit, inspect_files); |
104 | cgit_diff_commit(commit, inspect_files); |
105 | html("</td><td>"); |
105 | html("</td><td>"); |
106 | htmlf("%d", files); |
106 | htmlf("%d", files); |
107 | if (ctx.repo->enable_log_linecount) { |
107 | if (ctx.repo->enable_log_linecount) { |
108 | html("</td><td>"); |
108 | html("</td><td>"); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); |
110 | } |
110 | } |
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) |
117 | cols++; |
120 | cols++; |
118 | } |
121 | } |
119 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
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 | } |
126 | |
138 | |
127 | static const char *disambiguate_ref(const char *ref) |
139 | static const char *disambiguate_ref(const char *ref) |
128 | { |
140 | { |
129 | unsigned char sha1[20]; |
141 | unsigned char sha1[20]; |
130 | const char *longref; |
142 | const char *longref; |
131 | |
143 | |
132 | longref = fmt("refs/heads/%s", ref); |
144 | longref = fmt("refs/heads/%s", ref); |
133 | if (get_sha1(longref, sha1) == 0) |
145 | if (get_sha1(longref, sha1) == 0) |
134 | return longref; |
146 | return longref; |
|