author | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 05:42:03 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:58 (UTC) |
commit | e01229cf80bc618a132d2154c0ebd71792d31c64 (patch) (side-by-side diff) | |
tree | 62aa3f02166f7f4b6cdf866a4916b53921ed3ecf | |
parent | 74061ed5f03e72796450aa3b8ca1cf6ced5d59e2 (diff) | |
download | cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.zip cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.tar.gz cgit-e01229cf80bc618a132d2154c0ebd71792d31c64.tar.bz2 |
ui-repolist: handle empty sections similar to NULL sections
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 1 | ||||
-rw-r--r-- | ui-repolist.c | 18 |
2 files changed, 12 insertions, 7 deletions
@@ -264,16 +264,17 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.max_repodesc_len = 80; ctx->cfg.max_stats = 0; ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.renamelimit = -1; ctx->cfg.robots = "index, nofollow"; 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; ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); ctx->env.https = xstrdupn(getenv("HTTPS")); ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); diff --git a/ui-repolist.c b/ui-repolist.c index d56654d..3ef2e99 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -212,16 +212,17 @@ int sort_repolist(char *field) return 0; } 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) columns++; ctx.page.title = ctx.cfg.root_title; cgit_print_http_headers(&ctx); cgit_print_docstart(&ctx); @@ -242,29 +243,32 @@ void cgit_print_repolist() continue; hits++; if (hits <= ctx.qry.ofs) continue; if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) 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("<tr class='nohover'><td colspan='%d' class='reposection'>", columns); - html_txt(ctx.repo->section); + html_txt(section); html("</td></tr>"); - last_section = ctx.repo->section; + last_section = section; } htmlf("<tr><td class='%s'>", - !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("</td><td>"); html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); html_link_close(); html("</td><td>"); html_txt(ctx.repo->owner); html("</td><td>"); |