From 271ac5a7e6b5b67f54fdd16e8542aa282f1c7140 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 20 May 2007 20:13:17 +0000 Subject: Merge branch 'repogroups' * repogroups: Adjust apperance of repogroup headers Don't highlight repogroup headings Teach cgit how to group repositories by category --- diff --git a/cgit.css b/cgit.css index 6c7f9c3..5dd43b0 100644 --- a/cgit.css +++ b/cgit.css @@ -353,3 +353,8 @@ table.diff td div.del { .right { text-align: right; } + +table.list td.repogroup { + padding-top: 1em; + border-bottom: solid 1px #777; +} diff --git a/cgit.h b/cgit.h index e0879bd..8927236 100644 --- a/cgit.h +++ b/cgit.h @@ -47,6 +47,7 @@ struct repoinfo { char *desc; char *owner; char *defbranch; + char *group; char *module_link; int snapshots; int enable_log_filecount; @@ -93,6 +94,7 @@ extern char *cgit_module_link; extern char *cgit_virtual_root; extern char *cgit_script_name; extern char *cgit_cache_root; +extern char *cgit_repo_group; extern int cgit_nocache; extern int cgit_snapshots; diff --git a/shared.c b/shared.c index 45fde7f..65af11a 100644 --- a/shared.c +++ b/shared.c @@ -21,6 +21,7 @@ char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; char *cgit_virtual_root = NULL; char *cgit_script_name = CGIT_SCRIPT_NAME; char *cgit_cache_root = "/var/cache/cgit"; +char *cgit_repo_group = NULL; int cgit_nocache = 0; int cgit_snapshots = 0; @@ -99,6 +100,7 @@ struct repoinfo *add_repo(const char *url) ret->path = NULL; ret->desc = NULL; ret->owner = NULL; + ret->group = cgit_repo_group; ret->defbranch = "master"; ret->snapshots = cgit_snapshots; ret->enable_log_filecount = cgit_enable_log_filecount; @@ -160,6 +162,8 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_max_repodesc_len = atoi(value); else if (!strcmp(name, "max-commit-count")) cgit_max_commit_count = atoi(value); + else if (!strcmp(name, "repo.group")) + cgit_repo_group = xstrdup(value); else if (!strcmp(name, "repo.url")) cgit_repo = add_repo(value); else if (!strcmp(name, "repo.name")) diff --git a/ui-repolist.c b/ui-repolist.c index 8e367a2..33e3e7f 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -12,6 +12,7 @@ void cgit_print_repolist(struct cacheitem *item) { struct repoinfo *repo; int i; + char *last_group = NULL; cgit_print_docstart(cgit_root_title, item); cgit_print_pageheader(cgit_root_title, 0); @@ -30,6 +31,15 @@ void cgit_print_repolist(struct cacheitem *item) for (i=0; igroup != NULL) || + (last_group != NULL && repo->group == NULL) || + (last_group != NULL && repo->group!= NULL && + strcmp(repo->group, last_group))) { + html(""); + html_txt(repo->group); + html(""); + last_group = repo->group; + } html(""); html_link_open(cgit_repourl(repo->url), NULL, NULL); html_txt(repo->name); -- cgit v0.9.0.2