Make branches, tags and log play better together in the summary view

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/ui-log.c b/ui-log.c
index 60c92690e12ceceeaf8c85f323a0f133653c65ca..9b2ffb68d8b088b3f396d1d12f741a626af495b8 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -41,32 +41,33 @@ void print_commit(struct commit *commit)
        html("</td><td>");
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                         sha1_to_hex(commit->object.sha1));
+       html("</td><td>");
+       html_txt(info->author);
        if (ctx.repo->enable_log_filecount) {
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files);
-               html("</td><td class='right'>");
+               html("</td><td>");
                htmlf("%d", files);
                if (ctx.repo->enable_log_linecount) {
-                       html("</td><td class='right'>");
+                       html("</td><td>");
                        htmlf("-%d/+%d", rem_lines, add_lines);
                }
        }
-       html("</td><td>");
-       html_txt(info->author);
        html("</td></tr>\n");
        cgit_free_commitinfo(info);
 }
 
 
-void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
+                   char *path, int pager)
 {
        struct rev_info rev;
        struct commit *commit;
        const char *argv[] = {NULL, tip, NULL, NULL, NULL};
        int argc = 2;
-       int i;
+       int i, columns = 3;
 
        if (!tip)
                argv[1] = ctx.qry.head;
@@ -92,16 +93,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        }
        prepare_revision_walk(&rev);
 
-       html("<table summary='log' class='list nowrap'>");
-       html("<tr class='nohover'><th class='left'>Age</th>"
-            "<th class='left'>Message</th>");
+       if (pager)
+               html("<table class='list nowrap'>");
 
+       html("<tr class='nohover'><th class='left'>Age</th>"
+            "<th class='left'>Commit message</th>"
+            "<th class='left'>Author</th>");
        if (ctx.repo->enable_log_filecount) {
-               html("<th class='right'>Files</th>");
-               if (ctx.repo->enable_log_linecount)
-                       html("<th class='right'>Lines</th>");
+               html("<th class='left'>Files</th>");
+               columns++;
+               if (ctx.repo->enable_log_linecount) {
+                       html("<th class='left'>Lines</th>");
+                       columns++;
+               }
        }
-       html("<th class='left'>Author</th></tr>\n");
+       html("</tr>\n");
 
        if (ofs<0)
                ofs = 0;
@@ -120,10 +126,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                free_commit_list(commit->parents);
                commit->parents = NULL;
        }
-       html("</table>\n");
-
        if (pager) {
-               html("<div class='pager'>");
+               htmlf("</table><div class='pager'>",
+                    columns);
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.path,
@@ -138,5 +143,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                                      ctx.qry.search);
                }
                html("</div>");
+       } else if ((commit = get_revision(&rev)) != NULL) {
+               html("<tr class='nohover'><td colspan='3'>");
+               cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0,
+                             NULL, NULL);
+               html("</td></tr>\n");
        }
 }

diff --git a/ui-refs.c b/ui-refs.c
index 12533cd5f806fa522e80620ced42d18dcaf2beae..44c8f9ae48f534b6472798540a964570771f7ebd 100644 (file)
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -62,11 +62,11 @@ static int print_branch(struct refinfo *ref)
        html("</td><td>");
 
        if (ref->object->type == OBJ_COMMIT) {
-               cgit_print_age(info->commit->date, -1, NULL);
+               cgit_commit_link(info->subject, NULL, NULL, name, NULL);
                html("</td><td>");
                html_txt(info->author);
-               html("</td><td>");
-               cgit_commit_link(info->subject, NULL, NULL, name, NULL);
+               html("</td><td colspan='2'>");
+               cgit_print_age(info->commit->date, -1, NULL);
        } else {
                html("</td><td></td><td>");
                cgit_object_link(ref->object);
@@ -78,9 +78,9 @@ static int print_branch(struct refinfo *ref)
 static void print_tag_header()
 {
        html("<tr class='nohover'><th class='left'>Tag</th>"
-            "<th class='left'>Age</th>"
+            "<th class='left'>Reference</th>"
             "<th class='left'>Author</th>"
-            "<th class='left'>Reference</th></tr>\n");
+            "<th class='left' colspan='2'>Age</th></tr>\n");
        header = 1;
 }
 
@@ -102,20 +102,20 @@ static int print_tag(struct refinfo *ref)
                html_txt(name);
                html_link_close();
                html("</td><td>");
-               if (info->tagger_date > 0)
-                       cgit_print_age(info->tagger_date, -1, NULL);
+               cgit_object_link(tag->tagged);
                html("</td><td>");
                if (info->tagger)
                        html(info->tagger);
-               html("</td><td>");
-               cgit_object_link(tag->tagged);
+               html("</td><td colspan='2'>");
+               if (info->tagger_date > 0)
+                       cgit_print_age(info->tagger_date, -1, NULL);
                html("</td></tr>\n");
        } else {
                if (!header)
                        print_tag_header();
                html("<tr><td>");
                html_txt(name);
-               html("</td><td colspan='2'/><td>");
+               html("</td><td>");
                cgit_object_link(ref->object);
                html("</td></tr>\n");
        }
@@ -135,9 +135,9 @@ void cgit_print_branches(int maxcount)
        int i;
 
        html("<tr class='nohover'><th class='left'>Branch</th>"
-            "<th class='left'>Idle</th>"
+            "<th class='left'>Commit message</th>"
             "<th class='left'>Author</th>"
-            "<th class='left'>Head commit</th></tr>\n");
+            "<th class='left' colspan='2'>Age</th></tr>\n");
 
        list.refs = NULL;
        list.alloc = list.count = 0;
@@ -196,6 +196,5 @@ void cgit_print_refs()
                html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
                cgit_print_tags(0);
        }
-
        html("</table>");
 }

diff --git a/ui-summary.c b/ui-summary.c
index 0b66b5289b54161b048b0d6b9144ed0794e00c37..318148a66b741113a0133c232f84f6cc2494dff9 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -18,14 +18,14 @@ void cgit_print_summary()
                html_include(ctx.repo->readme);
                html("</div>");
        }
-       if (ctx.cfg.summary_log > 0)
-               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
-                              NULL, NULL, 0);
        html("<table summary='repository info' class='list nowrap'>");
-       if (ctx.cfg.summary_log > 0)
-               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_branches(ctx.cfg.summary_branches);
        html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
        cgit_print_tags(ctx.cfg.summary_tags);
+       if (ctx.cfg.summary_log > 0) {
+               html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+               cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
+                              NULL, NULL, 0);
+       }
        html("</table>");
 }