X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9f48df63f6d8d9a8abcc02cd2f08293da7081520..495e39677326284ea13b2f6d76195d6800c2a450:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index 9388f5f..3410e1a 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -8,7 +8,7 @@ #include "cgit.h" -int items = 0; +static int header; static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) @@ -22,7 +22,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, if (commit && !parse_commit(commit)){ info = cgit_parse_commit(commit); html(""); - url = cgit_pageurl(cgit_query_repo, "log", + url = cgit_pageurl(cgit_query_repo, "log", fmt("h=%s", refname)); html_link_open(url, NULL, NULL); html_txt(buf); @@ -32,7 +32,7 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, html(""); html_txt(info->author); html(""); - url = cgit_pageurl(cgit_query_repo, "commit", + 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); @@ -61,14 +61,23 @@ static void cgit_print_object_ref(struct object *obj) else page = "view"; - url = cgit_pageurl(cgit_query_repo, page, + url = cgit_pageurl(cgit_query_repo, page, fmt("id=%s", sha1_to_hex(obj->sha1))); html_link_open(url, NULL, NULL); - htmlf("%s %s", typename(obj->type), + htmlf("%s %s", typename(obj->type), sha1_to_hex(obj->sha1)); html_link_close(); } +static void print_tag_header() +{ + html("Tag" + "Created" + "Author" + "Reference\n"); + header = 1; +} + static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { @@ -76,7 +85,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, struct taginfo *info; struct object *obj; char buf[256], *url; - + strncpy(buf, refname, sizeof(buf)); obj = parse_object(sha1); if (!obj) @@ -85,15 +94,10 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 2; - if (!items) { - html("Tag" - "Created" - "Author" - "Reference\n"); - } - items++; + if (!header) + print_tag_header(); html(""); - url = cgit_pageurl(cgit_query_repo, "view", + url = cgit_pageurl(cgit_query_repo, "view", fmt("id=%s", sha1_to_hex(sha1))); html_link_open(url, NULL, NULL); html_txt(buf); @@ -108,6 +112,8 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, cgit_print_object_ref(tag->tagged); html("\n"); } else { + if (!header) + print_tag_header(); html(""); html_txt(buf); html(""); @@ -139,11 +145,11 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, } else if (obj->type != OBJ_BLOB) { return 0; } - if (!items) { + if (!header) { html(""); html(""); + header = 1; } - items++; html("
Downloads
"); url = cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s&path=%s", sha1_to_hex(sha1), @@ -166,15 +172,15 @@ static void cgit_print_branches() static void cgit_print_tags() { - items = 0; + header = 0; for_each_tag_ref(cgit_print_tag_cb, NULL); } static void cgit_print_archives() { - items = 0; + header = 0; for_each_ref(cgit_print_archive_cb, NULL); - if (items) + if (header) html("
"); }