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

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

3 files changed, 43 insertions, 34 deletions

diff --git a/ui-log.c b/ui-log.c
index 60c9269..9b2ffb6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -40,34 +40,35 @@ void print_commit(struct commit *commit)
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	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;
 
@@ -91,18 +92,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		compile_grep_patterns(rev.grep_filter);
 	}
 	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;
 
@@ -119,12 +125,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		commit->buffer = NULL;
 		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,
 				      ofs - cnt, ctx.qry.grep,
@@ -137,6 +142,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 				      ofs + cnt, ctx.qry.grep,
 				      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 12533cd..44c8f9a 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -61,13 +61,13 @@ static int print_branch(struct refinfo *ref)
 	cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
 	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);
 	}
@@ -77,11 +77,11 @@ 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;
 }
 
 static int print_tag(struct refinfo *ref)
@@ -101,22 +101,22 @@ static int print_tag(struct refinfo *ref)
 		html_link_open(url, NULL, NULL);
 		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");
 	}
 	return 0;
@@ -134,11 +134,11 @@ void cgit_print_branches(int maxcount)
 	struct reflist list;
 	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;
 	for_each_branch_ref(cgit_refs_cb, &list);
@@ -195,7 +195,6 @@ void cgit_print_refs()
 		cgit_print_branches(0);
 		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 0b66b52..318148a 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -17,15 +17,15 @@ void cgit_print_summary()
 		html("<div id='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>");
 }