Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'repogroups' * repogroups: Adjust apperance of repogroup headers Don't highlight repogroup headings Teach cgit how to group repositories by category
cgit.css | 5 +++++ cgit.h | 2 ++ shared.c | 4 ++++ ui-repolist.c | 10 ++++++++++
diff --git a/cgit.css b/cgit.css index 6c7f9c35979629aec35682edbb46a9f017a8b8f1..5dd43b001a58c162c123d61d2be7613a16cd3808 100644 --- a/cgit.css +++ b/cgit.css @@ -353,3 +353,8 @@ .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 e0879bd26d0eda774d045586e1f1e6b16a0e3aaf..892723651361b622629aa4a39f42528654882d7f 100644 --- a/cgit.h +++ b/cgit.h @@ -47,6 +47,7 @@ char *path; 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 45fde7fe3bc23fd8d7e9bbf6861f70395330df25..65af11a05ac6433189f1da6f40a4bbf6fa96cfda 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 @@ ret->name = ret->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 @@ else if (!strcmp(name, "max-repodesc-length")) 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 8e367a2e34e386944bf9b2915c68945f1f886acb..33e3e7fdcc45690aad81d66ebee33d31cdd84dcf 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 @@ "Links \n"); for (i=0; i<cgit_repolist.count; i++) { repo = &cgit_repolist.repos[i]; + if ((last_group == NULL && repo->group != NULL) || + (last_group != NULL && repo->group == NULL) || + (last_group != NULL && repo->group!= NULL && + strcmp(repo->group, last_group))) { + html("<tr class='nohover'><td colspan='4' class='repogroup'>"); + html_txt(repo->group); + html("</td></tr>"); + last_group = repo->group; + } html("<tr><td>"); html_link_open(cgit_repourl(repo->url), NULL, NULL); html_txt(repo->name);