author | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:48:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:18 (UTC) |
commit | 5877c49f68b1e1bef94b4867f22c336f0e1605b6 (patch) (unidiff) | |
tree | 4e628096d9f189b7ef5ff9dcda40a07a5f7b21d0 | |
parent | 08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff) | |
download | cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.zip cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.tar.gz cgit-5877c49f68b1e1bef94b4867f22c336f0e1605b6.tar.bz2 |
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
@@ -348,8 +348,13 @@ table.diff td div.del { | |||
348 | 348 | ||
349 | .left { | 349 | .left { |
350 | text-align: left; | 350 | text-align: left; |
351 | } | 351 | } |
352 | 352 | ||
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 | } | ||
@@ -31,16 +31,17 @@ struct cacheitem { | |||
31 | 31 | ||
32 | struct repoinfo { | 32 | struct repoinfo { |
33 | char *url; | 33 | char *url; |
34 | char *name; | 34 | char *name; |
35 | char *path; | 35 | char *path; |
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; |
42 | int enable_log_linecount; | 43 | int enable_log_linecount; |
43 | }; | 44 | }; |
44 | 45 | ||
45 | struct repolist { | 46 | struct repolist { |
46 | int length; | 47 | int length; |
@@ -75,16 +76,17 @@ extern struct repoinfo *cgit_repo; | |||
75 | extern char *cgit_root_title; | 76 | extern char *cgit_root_title; |
76 | extern char *cgit_css; | 77 | extern char *cgit_css; |
77 | extern char *cgit_logo; | 78 | extern char *cgit_logo; |
78 | extern char *cgit_logo_link; | 79 | extern char *cgit_logo_link; |
79 | extern char *cgit_module_link; | 80 | 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; |
86 | extern int cgit_enable_log_filecount; | 88 | extern int cgit_enable_log_filecount; |
87 | extern int cgit_enable_log_linecount; | 89 | extern int cgit_enable_log_linecount; |
88 | extern int cgit_max_lock_attempts; | 90 | extern int cgit_max_lock_attempts; |
89 | extern int cgit_cache_root_ttl; | 91 | extern int cgit_cache_root_ttl; |
90 | extern int cgit_cache_repo_ttl; | 92 | extern int cgit_cache_repo_ttl; |
@@ -14,16 +14,17 @@ struct repoinfo *cgit_repo; | |||
14 | char *cgit_root_title = "Git repository browser"; | 14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 18 | 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; |
25 | int cgit_enable_log_filecount = 0; | 26 | int cgit_enable_log_filecount = 0; |
26 | int cgit_enable_log_linecount = 0; | 27 | int cgit_enable_log_linecount = 0; |
27 | int cgit_max_lock_attempts = 5; | 28 | int cgit_max_lock_attempts = 5; |
28 | int cgit_cache_root_ttl = 5; | 29 | int cgit_cache_root_ttl = 5; |
29 | int cgit_cache_repo_ttl = 5; | 30 | int cgit_cache_repo_ttl = 5; |
@@ -80,16 +81,17 @@ struct repoinfo *add_repo(const char *url) | |||
80 | } | 81 | } |
81 | 82 | ||
82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret->url = xstrdup(url); | 84 | ret->url = xstrdup(url); |
84 | ret->name = ret->url; | 85 | ret->name = ret->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; |
91 | ret->enable_log_linecount = cgit_enable_log_linecount; | 93 | ret->enable_log_linecount = cgit_enable_log_linecount; |
92 | ret->module_link = cgit_module_link; | 94 | ret->module_link = cgit_module_link; |
93 | return ret; | 95 | return ret; |
94 | } | 96 | } |
95 | 97 | ||
@@ -126,16 +128,18 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
126 | else if (!strcmp(name, "cache-dynamic-ttl")) | 128 | else if (!strcmp(name, "cache-dynamic-ttl")) |
127 | cgit_cache_dynamic_ttl = atoi(value); | 129 | cgit_cache_dynamic_ttl = atoi(value); |
128 | else if (!strcmp(name, "max-message-length")) | 130 | else if (!strcmp(name, "max-message-length")) |
129 | cgit_max_msg_len = atoi(value); | 131 | cgit_max_msg_len = atoi(value); |
130 | else if (!strcmp(name, "max-repodesc-length")) | 132 | else if (!strcmp(name, "max-repodesc-length")) |
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")) |
137 | cgit_repo->name = xstrdup(value); | 141 | cgit_repo->name = xstrdup(value); |
138 | else if (cgit_repo && !strcmp(name, "repo.path")) | 142 | else if (cgit_repo && !strcmp(name, "repo.path")) |
139 | cgit_repo->path = xstrdup(value); | 143 | cgit_repo->path = xstrdup(value); |
140 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 144 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
141 | cgit_repo->desc = xstrdup(value); | 145 | cgit_repo->desc = xstrdup(value); |
diff --git a/ui-repolist.c b/ui-repolist.c index d7311e4..a884c20 100644 --- a/ui-repolist.c +++ b/ui-repolist.c | |||
@@ -7,29 +7,39 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | void cgit_print_repolist(struct cacheitem *item) | 11 | 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); |
18 | 19 | ||
19 | html("<table class='list nowrap'>"); | 20 | html("<table class='list nowrap'>"); |
20 | html("<tr class='nohover'>" | 21 | html("<tr class='nohover'>" |
21 | "<th class='left'>Name</th>" | 22 | "<th class='left'>Name</th>" |
22 | "<th class='left'>Description</th>" | 23 | "<th class='left'>Description</th>" |
23 | "<th class='left'>Owner</th>" | 24 | "<th class='left'>Owner</th>" |
24 | "<th class='left'>Links</th></tr>\n"); | 25 | "<th class='left'>Links</th></tr>\n"); |
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); |
31 | html_link_close(); | 41 | html_link_close(); |
32 | html("</td><td>"); | 42 | html("</td><td>"); |
33 | html_ntxt(cgit_max_repodesc_len, repo->desc); | 43 | html_ntxt(cgit_max_repodesc_len, repo->desc); |
34 | html("</td><td>"); | 44 | html("</td><td>"); |
35 | html_txt(repo->owner); | 45 | html_txt(repo->owner); |