| -rw-r--r-- | ui-log.c | 42 |
1 files changed, 30 insertions, 12 deletions
@@ -98,3 +98,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) char *tmp; - int cols = 2; + int cols = revs->graph ? 3 : 2; struct strbuf graphbuf = STRBUF_INIT; @@ -112,3 +112,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) /* Print graph segment in otherwise empty table row */ - html("<tr class='nohover'><td/><td class='commitgraph'>"); + html("<tr class='nohover'><td class='commitgraph'>"); html(graphbuf.buf); @@ -121,10 +121,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) info = cgit_parse_commit(commit); - htmlf("<tr%s><td>", - ctx.qry.showmsg ? " class='logheader'" : ""); - tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); - html_link_open(tmp, NULL, NULL); - cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html_link_close(); - html("</td>"); + htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); @@ -137,2 +130,11 @@ void print_commit(struct commit *commit, struct rev_info *revs) } + else { + html("<td>"); + tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); + tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); + html_link_open(tmp, NULL, NULL); + cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); + html_link_close(); + html("</td>"); + } @@ -169,2 +171,12 @@ void print_commit(struct commit *commit, struct rev_info *revs) html_txt(info->author); + + if (revs->graph) { + html("</td><td>"); + tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); + tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); + html_link_open(tmp, NULL, NULL); + cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); + html_link_close(); + } + if (ctx.repo->enable_log_filecount) { @@ -184,3 +196,3 @@ void print_commit(struct commit *commit, struct rev_info *revs) if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ - html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ + html("<tr class='nohover'>"); @@ -225,2 +237,4 @@ void print_commit(struct commit *commit, struct rev_info *revs) } + else + html("<td/>"); /* Empty 'Age' column */ @@ -347,5 +361,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern - html("<tr class='nohover'><th class='left'>Age</th>"); + html("<tr class='nohover'>"); if (commit_graph) html("<th></th>"); + else + html("<th class='left'>Age</th>"); 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 html("</th><th class='left'>Author</th>"); + if (commit_graph) + html("<th class='left'>Age</th>"); if (ctx.repo->enable_log_filecount) { |