ui-log: Move 'Age' column when commit graph is present

When the commit graph is present, we prefer to draw it along the left edge,
and moving the 'Age' column to the right of the 'Author' column, like in gitk.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 30 insertions, 12 deletions

diff --git a/ui-log.c b/ui-log.c
index 05b5c29..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -97,5 +97,5 @@ void print_commit(struct commit *commit, struct rev_info *revs)
         struct commitinfo *info;
         char *tmp;
-        int cols = 2;
+        int cols = revs->graph ? 3 : 2;
         struct strbuf graphbuf = STRBUF_INIT;
         struct strbuf msgbuf = STRBUF_INIT;
@@ -111,5 +111,5 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                 while (!graph_next_line(revs->graph, &graphbuf)) {
                         /* 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);
                         htmlf("</td><td colspan='%d' /></tr>\n", cols);
@@ -120,12 +120,5 @@ 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'" : "");
 
         if (revs->graph) {
@@ -136,4 +129,13 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                 strbuf_setlen(&graphbuf, 0);
         }
+        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>");
+        }
 
         htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
@@ -168,4 +170,14 @@ void print_commit(struct commit *commit, struct rev_info *revs)
         html("</td><td>");
         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) {
                 files = 0;
@@ -183,5 +195,5 @@ 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'>");
 
                 if (ctx.qry.showmsg) {
@@ -224,4 +236,6 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                         html("</td>\n");
                 }
+                else
+                        html("<td/>"); /* Empty 'Age' column */
 
                 /* Print msgbuf into remainder of table row */
@@ -346,7 +360,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                 html("<table class='list nowrap'>");
 
-        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");
         if (pager) {
@@ -359,4 +375,6 @@ 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) {
                 html("<th class='left'>Files</th>");