diff options
| author | 2007-05-19 05:48:22 (JST) | |
|---|---|---|
| committer | 2007-05-19 05:51:18 (JST) | |
| commit | 5877c49f68b1e1bef94b4867f22c336f0e1605b6 (patch) | |
| tree | 4e628096d9f189b7ef5ff9dcda40a07a5f7b21d0 | |
| parent | 08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff) | |
| download | cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.zip cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.tar.gz | |
Teach cgit how to group repositories by category
The new parameter 'repo.group' is used to set the repository group
for the following repositores. Whenever this parameter changes value,
a subheading is generated in the index page (printing the current value
of repo.group).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | cgit.css | 5 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | shared.c | 4 | ||||
| -rw-r--r-- | ui-repolist.c | 10 |
4 files changed, 21 insertions, 0 deletions
| @@ -353,3 +353,8 @@ table.diff td div.del { | |||
| 353 | .right { | 353 | .right { |
| 354 | text-align: right; | 354 | text-align: right; |
| 355 | } | 355 | } |
| 356 | |||
| 357 | table.list td.repogroup { | ||
| 358 | padding-top: 1em; | ||
| 359 | font-weight: bold; | ||
| 360 | } | ||
| @@ -36,6 +36,7 @@ struct repoinfo { | |||
| 36 | char *desc; | 36 | char *desc; |
| 37 | char *owner; | 37 | char *owner; |
| 38 | char *defbranch; | 38 | char *defbranch; |
| 39 | char *group; | ||
| 39 | char *module_link; | 40 | char *module_link; |
| 40 | int snapshots; | 41 | int snapshots; |
| 41 | int enable_log_filecount; | 42 | int enable_log_filecount; |
| @@ -80,6 +81,7 @@ extern char *cgit_module_link; | |||
| 80 | extern char *cgit_virtual_root; | 81 | extern char *cgit_virtual_root; |
| 81 | extern char *cgit_script_name; | 82 | extern char *cgit_script_name; |
| 82 | extern char *cgit_cache_root; | 83 | extern char *cgit_cache_root; |
| 84 | extern char *cgit_repo_group; | ||
| 83 | 85 | ||
| 84 | extern int cgit_nocache; | 86 | extern int cgit_nocache; |
| 85 | extern int cgit_snapshots; | 87 | extern int cgit_snapshots; |
| @@ -19,6 +19,7 @@ char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | |||
| 19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
| 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
| 21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
| 22 | char *cgit_repo_group = NULL; | ||
| 22 | 23 | ||
| 23 | int cgit_nocache = 0; | 24 | int cgit_nocache = 0; |
| 24 | int cgit_snapshots = 0; | 25 | int cgit_snapshots = 0; |
| @@ -85,6 +86,7 @@ struct repoinfo *add_repo(const char *url) | |||
| 85 | ret->path = NULL; | 86 | ret->path = NULL; |
| 86 | ret->desc = NULL; | 87 | ret->desc = NULL; |
| 87 | ret->owner = NULL; | 88 | ret->owner = NULL; |
| 89 | ret->group = cgit_repo_group; | ||
| 88 | ret->defbranch = "master"; | 90 | ret->defbranch = "master"; |
| 89 | ret->snapshots = cgit_snapshots; | 91 | ret->snapshots = cgit_snapshots; |
| 90 | ret->enable_log_filecount = cgit_enable_log_filecount; | 92 | ret->enable_log_filecount = cgit_enable_log_filecount; |
| @@ -131,6 +133,8 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
| 131 | cgit_max_repodesc_len = atoi(value); | 133 | cgit_max_repodesc_len = atoi(value); |
| 132 | else if (!strcmp(name, "max-commit-count")) | 134 | else if (!strcmp(name, "max-commit-count")) |
| 133 | cgit_max_commit_count = atoi(value); | 135 | cgit_max_commit_count = atoi(value); |
| 136 | else if (!strcmp(name, "repo.group")) | ||
| 137 | cgit_repo_group = xstrdup(value); | ||
| 134 | else if (!strcmp(name, "repo.url")) | 138 | else if (!strcmp(name, "repo.url")) |
| 135 | cgit_repo = add_repo(value); | 139 | cgit_repo = add_repo(value); |
| 136 | else if (!strcmp(name, "repo.name")) | 140 | else if (!strcmp(name, "repo.name")) |
diff --git a/ui-repolist.c b/ui-repolist.c index d7311e4..a884c20 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
| @@ -12,6 +12,7 @@ void cgit_print_repolist(struct cacheitem *item) | |||
| 12 | { | 12 | { |
| 13 | struct repoinfo *repo; | 13 | struct repoinfo *repo; |
| 14 | int i; | 14 | int i; |
| 15 | char *last_group = NULL; | ||
| 15 | 16 | ||
| 16 | cgit_print_docstart(cgit_root_title, item); | 17 | cgit_print_docstart(cgit_root_title, item); |
| 17 | cgit_print_pageheader(cgit_root_title, 0); | 18 | cgit_print_pageheader(cgit_root_title, 0); |
| @@ -25,6 +26,15 @@ void cgit_print_repolist(struct cacheitem *item) | |||
| 25 | 26 | ||
| 26 | for (i=0; i<cgit_repolist.count; i++) { | 27 | for (i=0; i<cgit_repolist.count; i++) { |
| 27 | repo = &cgit_repolist.repos[i]; | 28 | repo = &cgit_repolist.repos[i]; |
| 29 | if ((last_group == NULL && repo->group != NULL) || | ||
| 30 | (last_group != NULL && repo->group == NULL) || | ||
| 31 | (last_group != NULL && repo->group!= NULL && | ||
| 32 | strcmp(repo->group, last_group))) { | ||
| 33 | html("<tr><td colspan='4' class='repogroup'>"); | ||
| 34 | html_txt(repo->group); | ||
| 35 | html("</td></tr>"); | ||
| 36 | last_group = repo->group; | ||
| 37 | } | ||
| 28 | html("<tr><td>"); | 38 | html("<tr><td>"); |
| 29 | html_link_open(cgit_repourl(repo->url), NULL, NULL); | 39 | html_link_open(cgit_repourl(repo->url), NULL, NULL); |
| 30 | html_txt(repo->name); | 40 | html_txt(repo->name); |
