From 0d05bca502f4a5347fa629045aca97ba9b404acc Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 19 Jun 2007 00:56:40 +0200 Subject: Add setting to enable/disable extra links on index page The summary/log/tree links displayed for each repository on the index page lost some of their purpose when the header menu was added, so this commit introduces the parameter 'enable-index-links' which must be set to 1 to enable these links. Suggested-by: Kristian Høgsberg Signed-off-by: Lars Hjemli --- cgit.h | 1 + cgitrc | 4 ++++ shared.c | 3 +++ ui-repolist.c | 35 +++++++++++++++++++++++------------ 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/cgit.h b/cgit.h index bd2dd0d..81c819d 100644 --- a/cgit.h +++ b/cgit.h @@ -118,6 +118,7 @@ extern char *cgit_repo_group; extern int cgit_nocache; extern int cgit_snapshots; +extern int cgit_enable_index_links; extern int cgit_enable_log_filecount; extern int cgit_enable_log_linecount; extern int cgit_max_lock_attempts; diff --git a/cgitrc b/cgitrc index 0f602e4..40877f8 100644 --- a/cgitrc +++ b/cgitrc @@ -12,6 +12,10 @@ #snapshots=0 +## Enable/disable extra links to summary/log/tree per repo on index page +#enable-index-links=0 + + ## Enable/disable display of 'number of files changed' in log view #enable-log-filecount=0 diff --git a/shared.c b/shared.c index f20fb5c..ab00bc9 100644 --- a/shared.c +++ b/shared.c @@ -26,6 +26,7 @@ char *cgit_repo_group = NULL; int cgit_nocache = 0; int cgit_snapshots = 0; +int cgit_enable_index_links = 0; int cgit_enable_log_filecount = 0; int cgit_enable_log_linecount = 0; int cgit_max_lock_attempts = 5; @@ -146,6 +147,8 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_nocache = atoi(value); else if (!strcmp(name, "snapshots")) cgit_snapshots = atoi(value); + else if (!strcmp(name, "enable-index-links")) + cgit_enable_index_links = atoi(value); else if (!strcmp(name, "enable-log-filecount")) cgit_enable_log_filecount = atoi(value); else if (!strcmp(name, "enable-log-linecount")) diff --git a/ui-repolist.c b/ui-repolist.c index 4f820a8..c735368 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -44,15 +44,19 @@ static void print_modtime(struct repoinfo *repo) void cgit_print_repolist(struct cacheitem *item) { - int i; + int i, columns = 4; char *last_group = NULL; + if (cgit_enable_index_links) + columns++; + cgit_print_docstart(cgit_root_title, item); cgit_print_pageheader(cgit_root_title, 0); html(""); if (cgit_index_header) { - html(""); } @@ -60,8 +64,10 @@ void cgit_print_repolist(struct cacheitem *item) "" "" "" - "" - "\n"); + ""); + if (cgit_enable_index_links) + html(""); + html("\n"); for (i=0; igroup == NULL) || (last_group != NULL && cgit_repo->group != NULL && strcmp(cgit_repo->group, last_group))) { - html(""); last_group = cgit_repo->group; @@ -85,13 +92,17 @@ void cgit_print_repolist(struct cacheitem *item) html_txt(cgit_repo->owner); html("\n"); + html(""); + if (cgit_enable_index_links) { + html(""); + } + html("\n"); } html("
"); + htmlf("
", + columns); html_include(cgit_index_header); html("
NameDescriptionOwnerIdleLinks
IdleLinks
"); + htmlf("
", + columns); html_txt(cgit_repo->group); html("
"); print_modtime(cgit_repo); - html(""); - html_link_open(cgit_repourl(cgit_repo->url), - NULL, "button"); - html("summary"); - cgit_log_link("log", NULL, "button", NULL, NULL, NULL); - cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); - html("
"); + html_link_open(cgit_repourl(cgit_repo->url), + NULL, "button"); + html("summary"); + cgit_log_link("log", NULL, "button", NULL, NULL, NULL); + cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); + html("
"); cgit_print_docend(); -- cgit 1.4.1-21-gabe81