-rw-r--r-- | ui-summary.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/ui-summary.c b/ui-summary.c index f6120f9..3410e1a 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -5,13 +5,13 @@ * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" -static int items; +static int header; static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct commit *commit; struct commitinfo *info; @@ -66,12 +66,21 @@ static void cgit_print_object_ref(struct object *obj) html_link_open(url, NULL, NULL); htmlf("%s %s", typename(obj->type), sha1_to_hex(obj->sha1)); html_link_close(); } +static void print_tag_header() +{ + 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"); + header = 1; +} + static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; struct object *obj; @@ -82,19 +91,14 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, if (!obj) return 1; if (obj->type == OBJ_TAG) { tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 2; - if (!items) { - 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"); - } - items++; + if (!header) + print_tag_header(); 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(); @@ -105,12 +109,14 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, if (info->tagger) html(info->tagger); html("</td><td>"); cgit_print_object_ref(tag->tagged); html("</td></tr>\n"); } else { + if (!header) + print_tag_header(); html("<tr><td>"); html_txt(buf); html("</td><td colspan='2'/><td>"); cgit_print_object_ref(obj); html("</td></tr>\n"); } @@ -136,17 +142,17 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 0; hashcpy(sha1, tag->tagged->sha1); } else if (obj->type != OBJ_BLOB) { return 0; } - if (!items) { + if (!header) { html("<table>"); html("<tr><th>Downloads</th></tr>"); + header = 1; } - items++; html("<tr><td>"); url = cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s&path=%s", sha1_to_hex(sha1), buf)); html_link_open(url, NULL, NULL); html_txt(buf); @@ -163,21 +169,21 @@ static void cgit_print_branches() "<th class='left'>Head commit</th></tr>\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); } 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("</table>"); } void cgit_print_summary() { html("<table class='list nowrap'>"); |