From e01229cf80bc618a132d2154c0ebd71792d31c64 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 24 Aug 2009 07:42:03 +0200 Subject: ui-repolist: handle empty sections similar to NULL sections Signed-off-by: Lars Hjemli --- cgit.c | 1 + ui-repolist.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/cgit.c b/cgit.c index e281aa9..167b5dd 100644 --- a/cgit.c +++ b/cgit.c @@ -269,6 +269,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.root_title = "Git repository browser"; ctx->cfg.root_desc = "a fast webinterface for the git dscm"; ctx->cfg.script_name = CGIT_SCRIPT_NAME; + ctx->cfg.section = ""; ctx->cfg.summary_branches = 10; ctx->cfg.summary_log = 10; ctx->cfg.summary_tags = 10; diff --git a/ui-repolist.c b/ui-repolist.c index d56654d..3ef2e99 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -217,6 +217,7 @@ void cgit_print_repolist() { int i, columns = 4, hits = 0, header = 0; char *last_section = NULL; + char *section; int sorted = 0; if (ctx.cfg.enable_index_links) @@ -247,19 +248,22 @@ void cgit_print_repolist() continue; if (!header++) print_header(columns); + section = ctx.repo->section; + if (section && !strcmp(section, "")) + section = NULL; if (!sorted && - ((last_section == NULL && ctx.repo->section != NULL) || - (last_section != NULL && ctx.repo->section == NULL) || - (last_section != NULL && ctx.repo->section != NULL && - strcmp(ctx.repo->section, last_section)))) { + ((last_section == NULL && section != NULL) || + (last_section != NULL && section == NULL) || + (last_section != NULL && section != NULL && + strcmp(section, last_section)))) { htmlf("", columns); - html_txt(ctx.repo->section); + html_txt(section); html(""); - last_section = ctx.repo->section; + last_section = section; } htmlf("", - !sorted && ctx.repo->section ? "sublevel-repo" : "toplevel-repo"); + !sorted && section ? "sublevel-repo" : "toplevel-repo"); cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); html(""); html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); -- cgit v1.2.3-57-g22cb