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 <krh@bitplanet.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-06-19 00:56:40 +02:00
parent a215bf4620
commit 0d05bca502
4 changed files with 31 additions and 12 deletions

1
cgit.h
View File

@ -118,6 +118,7 @@ extern char *cgit_repo_group;
extern int cgit_nocache; extern int cgit_nocache;
extern int cgit_snapshots; extern int cgit_snapshots;
extern int cgit_enable_index_links;
extern int cgit_enable_log_filecount; extern int cgit_enable_log_filecount;
extern int cgit_enable_log_linecount; extern int cgit_enable_log_linecount;
extern int cgit_max_lock_attempts; extern int cgit_max_lock_attempts;

4
cgitrc
View File

@ -12,6 +12,10 @@
#snapshots=0 #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/disable display of 'number of files changed' in log view
#enable-log-filecount=0 #enable-log-filecount=0

View File

@ -26,6 +26,7 @@ char *cgit_repo_group = NULL;
int cgit_nocache = 0; int cgit_nocache = 0;
int cgit_snapshots = 0; int cgit_snapshots = 0;
int cgit_enable_index_links = 0;
int cgit_enable_log_filecount = 0; int cgit_enable_log_filecount = 0;
int cgit_enable_log_linecount = 0; int cgit_enable_log_linecount = 0;
int cgit_max_lock_attempts = 5; 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); cgit_nocache = atoi(value);
else if (!strcmp(name, "snapshots")) else if (!strcmp(name, "snapshots"))
cgit_snapshots = atoi(value); cgit_snapshots = atoi(value);
else if (!strcmp(name, "enable-index-links"))
cgit_enable_index_links = atoi(value);
else if (!strcmp(name, "enable-log-filecount")) else if (!strcmp(name, "enable-log-filecount"))
cgit_enable_log_filecount = atoi(value); cgit_enable_log_filecount = atoi(value);
else if (!strcmp(name, "enable-log-linecount")) else if (!strcmp(name, "enable-log-linecount"))

View File

@ -44,15 +44,19 @@ static void print_modtime(struct repoinfo *repo)
void cgit_print_repolist(struct cacheitem *item) void cgit_print_repolist(struct cacheitem *item)
{ {
int i; int i, columns = 4;
char *last_group = NULL; char *last_group = NULL;
if (cgit_enable_index_links)
columns++;
cgit_print_docstart(cgit_root_title, item); cgit_print_docstart(cgit_root_title, item);
cgit_print_pageheader(cgit_root_title, 0); cgit_print_pageheader(cgit_root_title, 0);
html("<table class='list nowrap'>"); html("<table class='list nowrap'>");
if (cgit_index_header) { if (cgit_index_header) {
html("<tr class='nohover'><td colspan='5' class='include-block'>"); htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
columns);
html_include(cgit_index_header); html_include(cgit_index_header);
html("</td></tr>"); html("</td></tr>");
} }
@ -60,8 +64,10 @@ void cgit_print_repolist(struct cacheitem *item)
"<th class='left'>Name</th>" "<th class='left'>Name</th>"
"<th class='left'>Description</th>" "<th class='left'>Description</th>"
"<th class='left'>Owner</th>" "<th class='left'>Owner</th>"
"<th class='left'>Idle</th>" "<th class='left'>Idle</th>");
"<th>Links</th></tr>\n"); if (cgit_enable_index_links)
html("<th>Links</th>");
html("</tr>\n");
for (i=0; i<cgit_repolist.count; i++) { for (i=0; i<cgit_repolist.count; i++) {
cgit_repo = &cgit_repolist.repos[i]; cgit_repo = &cgit_repolist.repos[i];
@ -69,7 +75,8 @@ void cgit_print_repolist(struct cacheitem *item)
(last_group != NULL && cgit_repo->group == NULL) || (last_group != NULL && cgit_repo->group == NULL) ||
(last_group != NULL && cgit_repo->group != NULL && (last_group != NULL && cgit_repo->group != NULL &&
strcmp(cgit_repo->group, last_group))) { strcmp(cgit_repo->group, last_group))) {
html("<tr class='nohover'><td colspan='4' class='repogroup'>"); htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
columns);
html_txt(cgit_repo->group); html_txt(cgit_repo->group);
html("</td></tr>"); html("</td></tr>");
last_group = cgit_repo->group; last_group = cgit_repo->group;
@ -85,13 +92,17 @@ void cgit_print_repolist(struct cacheitem *item)
html_txt(cgit_repo->owner); html_txt(cgit_repo->owner);
html("</td><td>"); html("</td><td>");
print_modtime(cgit_repo); print_modtime(cgit_repo);
html("</td><td>"); html("</td>");
html_link_open(cgit_repourl(cgit_repo->url), if (cgit_enable_index_links) {
NULL, "button"); html("<td>");
html("summary</a>"); html_link_open(cgit_repourl(cgit_repo->url),
cgit_log_link("log", NULL, "button", NULL, NULL, NULL); NULL, "button");
cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL); html("summary</a>");
html("</td></tr>\n"); cgit_log_link("log", NULL, "button", NULL, NULL, NULL);
cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
html("</td>");
}
html("</tr>\n");
} }
html("</table>"); html("</table>");
cgit_print_docend(); cgit_print_docend();