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

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

1 files changed, 12 insertions, 13 deletions

diff --git a/ui-refs.c b/ui-refs.c
index 12533cd..44c8f9a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -64,7 +64,7 @@ static int print_branch(struct refinfo *ref)
         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 {
@@ -80,5 +80,5 @@ 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;
@@ -104,4 +104,3 @@ static int print_tag(struct refinfo *ref)
                 html("</td><td>");
-                if (info->tagger_date > 0)
-                        cgit_print_age(info->tagger_date, -1, NULL);
+                cgit_object_link(tag->tagged);
                 html("</td><td>");
@@ -109,4 +108,5 @@ static int print_tag(struct refinfo *ref)
                         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");
@@ -117,3 +117,3 @@ static int print_tag(struct refinfo *ref)
                 html_txt(name);
-                html("</td><td colspan='2'/><td>");
+                html("</td><td>");
                 cgit_object_link(ref->object);
@@ -137,5 +137,5 @@ void cgit_print_branches(int maxcount)
         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");
 
@@ -198,3 +198,2 @@ void cgit_print_refs()
         }
-
         html("</table>");