From b1e172acca870e7999f2d2d917db7b4c42aa05b3 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 1 Feb 2013 10:59:13 +0100 Subject: Make "owner" column on index page configurable This is not really needed for personal sites where all repos belong to the same person. Since it is pretty useful for shared sites however, it should be configurable. Signed-off-by: Florian Pritz Signed-off-by: Jason A. Donenfeld --- cgit.c | 3 +++ cgit.h | 1 + cgitrc.5.txt | 4 ++++ ui-repolist.c | 19 ++++++++++++------- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/cgit.c b/cgit.c index a97ed69..11edd81 100644 --- a/cgit.c +++ b/cgit.c @@ -172,6 +172,8 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_http_clone = atoi(value); else if (!strcmp(name, "enable-index-links")) ctx.cfg.enable_index_links = atoi(value); + else if (!strcmp(name, "enable-index-owner")) + ctx.cfg.enable_index_owner = atoi(value); else if (!strcmp(name, "enable-commit-graph")) ctx.cfg.enable_commit_graph = atoi(value); else if (!strcmp(name, "enable-log-filecount")) @@ -354,6 +356,7 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.logo = "/cgit.png"; ctx->cfg.local_time = 0; ctx->cfg.enable_http_clone = 1; + ctx->cfg.enable_index_owner = 1; ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.enable_git_config = 0; ctx->cfg.max_repo_count = 50; diff --git a/cgit.h b/cgit.h index 7a99135..f3d2556 100644 --- a/cgit.h +++ b/cgit.h @@ -203,6 +203,7 @@ struct cgit_config { int enable_filter_overrides; int enable_http_clone; int enable_index_links; + int enable_index_owner; int enable_commit_graph; int enable_log_filecount; int enable_log_linecount; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index c1038d7..4d27d9f 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -120,6 +120,10 @@ enable-index-links:: each repo in the repository index (specifically, to the "summary", "commit" and "tree" pages). Default value: "0". +enable-index-owner:: + Flag which, when set to "1", will make cgit display the owner of + each repo in the repository index. Default value: "1". + enable-log-filecount:: Flag which, when set to "1", will make cgit print the number of modified files for each commit on the repository log page. Default diff --git a/ui-repolist.c b/ui-repolist.c index dead1bf..2a910bd 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -110,12 +110,13 @@ void print_sort_header(const char *title, const char *sort) htmlf("'>%s", title); } -void print_header(int columns) +void print_header() { html(""); print_sort_header("Name", "name"); print_sort_header("Description", "desc"); - print_sort_header("Owner", "owner"); + if (ctx.cfg.enable_index_owner) + print_sort_header("Owner", "owner"); print_sort_header("Idle", "idle"); if (ctx.cfg.enable_index_links) html("Links"); @@ -239,13 +240,15 @@ int sort_repolist(char *field) void cgit_print_repolist() { - int i, columns = 4, hits = 0, header = 0; + int i, columns = 3, hits = 0, header = 0; char *last_section = NULL; char *section; int sorted = 0; if (ctx.cfg.enable_index_links) - columns++; + ++columns; + if (ctx.cfg.enable_index_owner) + ++columns; ctx.page.title = ctx.cfg.root_title; cgit_print_http_headers(&ctx); @@ -271,7 +274,7 @@ void cgit_print_repolist() if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) continue; if (!header++) - print_header(columns); + print_header(); section = ctx.repo->section; if (section && !strcmp(section, "")) section = NULL; @@ -294,8 +297,10 @@ void cgit_print_repolist() html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); html_link_close(); html(""); - html_txt(ctx.repo->owner); - html(""); + if (ctx.cfg.enable_index_owner) { + html_txt(ctx.repo->owner); + html(""); + } print_modtime(ctx.repo); html(""); if (ctx.cfg.enable_index_links) { -- cgit v1.2.3-59-g8ed1b