| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 4 | ||||
| -rw-r--r-- | ui-repolist.c | 19 |
4 files changed, 7 insertions, 20 deletions
@@ -172,8 +172,6 @@ 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")) @@ -356,7 +354,6 @@ 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; @@ -203,7 +203,6 @@ 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 4d27d9f..c1038d7 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -120,10 +120,6 @@ 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 2a910bd..dead1bf 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -110,13 +110,12 @@ void print_sort_header(const char *title, const char *sort) htmlf("'>%s</a></th>", title); } -void print_header() +void print_header(int columns) { html("<tr class='nohover'>"); print_sort_header("Name", "name"); print_sort_header("Description", "desc"); - if (ctx.cfg.enable_index_owner) - print_sort_header("Owner", "owner"); + print_sort_header("Owner", "owner"); print_sort_header("Idle", "idle"); if (ctx.cfg.enable_index_links) html("<th class='left'>Links</th>"); @@ -240,15 +239,13 @@ int sort_repolist(char *field) void cgit_print_repolist() { - int i, columns = 3, hits = 0, header = 0; + int i, columns = 4, hits = 0, header = 0; char *last_section = NULL; char *section; int sorted = 0; if (ctx.cfg.enable_index_links) - ++columns; - if (ctx.cfg.enable_index_owner) - ++columns; + columns++; ctx.page.title = ctx.cfg.root_title; cgit_print_http_headers(&ctx); @@ -274,7 +271,7 @@ void cgit_print_repolist() if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count) continue; if (!header++) - print_header(); + print_header(columns); section = ctx.repo->section; if (section && !strcmp(section, "")) section = NULL; @@ -297,10 +294,8 @@ void cgit_print_repolist() html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc); html_link_close(); html("</td><td>"); - if (ctx.cfg.enable_index_owner) { - html_txt(ctx.repo->owner); - html("</td><td>"); - } + html_txt(ctx.repo->owner); + html("</td><td>"); print_modtime(ctx.repo); html("</td>"); if (ctx.cfg.enable_index_links) { |