|
diff --git a/ui-log.c b/ui-log.c index 05b5c29..8add66a 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -98,3 +98,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
98 | char *tmp; |
98 | char *tmp; |
99 | int cols = 2; |
99 | int cols = revs->graph ? 3 : 2; |
100 | struct strbuf graphbuf = STRBUF_INIT; |
100 | struct strbuf graphbuf = STRBUF_INIT; |
@@ -112,3 +112,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
112 | /* Print graph segment in otherwise empty table row */ |
112 | /* Print graph segment in otherwise empty table row */ |
113 | html("<tr class='nohover'><td/><td class='commitgraph'>"); |
113 | html("<tr class='nohover'><td class='commitgraph'>"); |
114 | html(graphbuf.buf); |
114 | html(graphbuf.buf); |
@@ -121,10 +121,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
121 | info = cgit_parse_commit(commit); |
121 | info = cgit_parse_commit(commit); |
122 | htmlf("<tr%s><td>", |
122 | htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); |
123 | ctx.qry.showmsg ? " class='logheader'" : ""); |
| |
124 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
| |
125 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
| |
126 | html_link_open(tmp, NULL, NULL); |
| |
127 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
| |
128 | html_link_close(); |
| |
129 | html("</td>"); |
| |
130 | |
123 | |
@@ -137,2 +130,11 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
137 | } |
130 | } |
| |
131 | else { |
| |
132 | html("<td>"); |
| |
133 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
| |
134 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
| |
135 | html_link_open(tmp, NULL, NULL); |
| |
136 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
| |
137 | html_link_close(); |
| |
138 | html("</td>"); |
| |
139 | } |
138 | |
140 | |
@@ -169,2 +171,12 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
169 | html_txt(info->author); |
171 | html_txt(info->author); |
| |
172 | |
| |
173 | if (revs->graph) { |
| |
174 | html("</td><td>"); |
| |
175 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
| |
176 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
| |
177 | html_link_open(tmp, NULL, NULL); |
| |
178 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
| |
179 | html_link_close(); |
| |
180 | } |
| |
181 | |
170 | if (ctx.repo->enable_log_filecount) { |
182 | if (ctx.repo->enable_log_filecount) { |
@@ -184,3 +196,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
184 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
196 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
185 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
197 | html("<tr class='nohover'>"); |
186 | |
198 | |
@@ -225,2 +237,4 @@ void print_commit(struct commit *commit, struct rev_info *revs) |
225 | } |
237 | } |
| |
238 | else |
| |
239 | html("<td/>"); /* Empty 'Age' column */ |
226 | |
240 | |
@@ -347,5 +361,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
347 | |
361 | |
348 | html("<tr class='nohover'><th class='left'>Age</th>"); |
362 | html("<tr class='nohover'>"); |
349 | if (commit_graph) |
363 | if (commit_graph) |
350 | html("<th></th>"); |
364 | html("<th></th>"); |
| |
365 | else |
| |
366 | html("<th class='left'>Age</th>"); |
351 | html("<th class='left'>Commit message"); |
367 | html("<th class='left'>Commit message"); |
@@ -360,2 +376,4 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
360 | html("</th><th class='left'>Author</th>"); |
376 | html("</th><th class='left'>Author</th>"); |
| |
377 | if (commit_graph) |
| |
378 | html("<th class='left'>Age</th>"); |
361 | if (ctx.repo->enable_log_filecount) { |
379 | if (ctx.repo->enable_log_filecount) { |
|