From 23734c5a2b607dca2d634cafdc63202a687f26d3 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Wed, 17 Jan 2007 01:10:39 +0100 Subject: Extend repo summary with tag list Show all tags in the repo below the branch list. Signed-off-by: Lars Hjemli --- cgit.css | 8 +++++-- ui-summary.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 72 insertions(+), 10 deletions(-) diff --git a/cgit.css b/cgit.css index 9112bfe..d94b1b7 100644 --- a/cgit.css +++ b/cgit.css @@ -8,9 +8,9 @@ body { h2 { - font-size: 100%; + font-size: 120%; font-weight: bold; - margin-bottom: 0.1em; + margin-bottom: 0.5em; } a { @@ -33,9 +33,13 @@ table.list tr { table.list tr:hover { background: #eeb; } +table.list tr.nohover:hover { + background: white; +} table.list th { font-weight: normal; background: #ddd; + border-top: solid 1px #aaa; border-bottom: solid 1px #aaa; padding: 0.1em 0.5em 0.1em 0.5em; vertical-align: baseline; diff --git a/ui-summary.c b/ui-summary.c index de95053..1591632 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -15,6 +15,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 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); @@ -22,26 +23,72 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, 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(""); cgit_print_date(commit->date); html(""); + html_txt(info->author); + html(""); url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); html_link_open(url, NULL, NULL); html_ntxt(80, info->subject); html_link_close(); - html(""); - html_txt(info->author); html("\n"); cgit_free_commitinfo(info); } else { html(""); html_txt(buf); + html(""); + htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); + html("\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(""); + 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(""); + if (info->tagger_date > 0) + cgit_print_date(info->tagger_date); html(""); - htmlf("*** bad ref %s", sha1_to_hex(sha1)); + if (info->tagger) + html(info->tagger); + html(""); + 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("\n"); + } else { + html(""); + html_txt(buf); + html(""); + htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); html("\n"); } return 0; @@ -49,13 +96,20 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, static void cgit_print_branches() { - html(""); html("" "" - "" - "\n"); + "" + "\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); - html("
BranchUpdatedCommit subjectAuthor
AuthorHead commit
"); +} + +static void cgit_print_tags() +{ + html("Tag" + "Created" + "Author" + "Reference\n"); + for_each_tag_ref(cgit_print_tag_cb, NULL); } void cgit_print_summary() @@ -63,5 +117,9 @@ void cgit_print_summary() html("

"); html_txt("Repo summary page"); html("

"); + html(""); cgit_print_branches(); + html(""); + cgit_print_tags(); + html("
 
"); } -- cgit 1.3.0-6-gf8a5