X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/06fe0c2f47eaf467db8ab1443e61dfa1c280f30a..ce1c7336e5b3e3ebe8f8c9029c405aedec98c208:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 29baa74..5518d01 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,32 +12,83 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct commit *commit;
+	struct commitinfo *info;
 	char buf[256], *url;
 
+	strncpy(buf, refname, sizeof(buf));
 	commit = lookup_commit(sha1);
 	if (commit && !parse_commit(commit)){
+		info = cgit_parse_commit(commit);
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "log", 
 				   fmt("h=%s", refname));
 		html_link_open(url, NULL, NULL);
-		strncpy(buf, refname, sizeof(buf));
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
-		pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf,
-				    sizeof(buf), 0, NULL, NULL, 0);
-		html_txt(buf);
-		html("</td><td><a href='");
-		html_attr(cgit_pageurl(cgit_query_repo, "tree", 
-				       fmt("id=%s", 
-					   sha1_to_hex(commit->tree->object.sha1))));
-		html("'>tree</a>");
+		cgit_print_date(commit->date);
+		html("</td><td>");
+		html_txt(info->author);
+		html("</td><td>");
+		url = cgit_pageurl(cgit_query_repo, "commit", 
+				   fmt("id=%s", sha1_to_hex(sha1)));
+		html_link_open(url, NULL, NULL);
+		html_ntxt(cgit_max_msg_len, info->subject);
+		html_link_close();
 		html("</td></tr>\n");
+		cgit_free_commitinfo(info);
 	} else {
 		html("<tr><td>");
 		html_txt(buf);
+		html("</td><td colspan='3'>");
+		htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
+		html("</td></tr>\n");
+	}
+	return 0;
+}
+
+static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
+				int flags, void *cb_data)
+{
+	struct tag *tag;
+	struct taginfo *info;
+	char buf[256], *page, *url;
+
+	strncpy(buf, refname, sizeof(buf));
+	tag = lookup_tag(sha1);
+	if (tag && !parse_tag(tag) && (info = cgit_parse_tag(tag))){
+		html("<tr><td>");
+		url = cgit_pageurl(cgit_query_repo, "view", 
+				   fmt("id=%s", sha1_to_hex(sha1)));
+		html_link_open(url, NULL, NULL);
+		html_txt(buf);
+		html_link_close();
+		html("</td><td>");
+		if (info->tagger_date > 0)
+			cgit_print_date(info->tagger_date);
+		html("</td><td>");
+		if (info->tagger)
+			html(info->tagger);
 		html("</td><td>");
-		htmlf("*** bad ref %s", sha1_to_hex(sha1));
+		if (tag->tagged->type == OBJ_COMMIT)
+			page = "commit";
+		else if (tag->tagged->type == OBJ_TREE)
+			page = "tree";
+		else
+			page = "view";
+		
+		url = cgit_pageurl(cgit_query_repo, page, 
+				   fmt("id=%s", sha1_to_hex(tag->tagged->sha1)));
+		html_link_open(url, NULL, NULL);
+		htmlf("%s %s", type_names[tag->tagged->type], 
+		      sha1_to_hex(tag->tagged->sha1));
+		html_link_close();
+		html("</td></tr>\n");
+	} else {
+		html("<tr><td>");
+		html_txt(buf);
+		html("</td><td colspan='3'>");
+		htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
 		html("</td></tr>\n");
 	}
 	return 0;
@@ -45,10 +96,20 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 
 static void cgit_print_branches()
 {
-	html("<table class='list'>");
-	html("<tr><th>Branch name</th><th>Latest</th><th>Link</th></tr>\n");
+	html("<tr class='nohover'><th class='left'>Branch</th>"
+	     "<th class='left'>Updated</th>"
+	     "<th class='left'>Author</th>"
+	     "<th class='left'>Head commit</th></tr>\n");
 	for_each_branch_ref(cgit_print_branch_cb, NULL);
-	html("</table>");
+}
+
+static void cgit_print_tags()
+{
+	html("<tr class='nohover'><th class='left'>Tag</th>"
+	     "<th class='left'>Created</th>"
+	     "<th class='left'>Author</th>"
+	     "<th class='left'>Reference</th></tr>\n");
+	for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 void cgit_print_summary()
@@ -56,5 +117,9 @@ void cgit_print_summary()
 	html("<h2>");
 	html_txt("Repo summary page");
 	html("</h2>");
+	html("<table class='list nowrap'>");
 	cgit_print_branches();
+	html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+	cgit_print_tags();
+	html("</table>");
 }