summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.css5
-rw-r--r--cgit.h2
-rw-r--r--shared.c4
-rw-r--r--ui-repolist.c10
4 files changed, 21 insertions, 0 deletions
diff --git a/cgit.css b/cgit.css
index 6c7f9c3..88a0a1d 100644
--- a/cgit.css
+++ b/cgit.css
@@ -350,6 +350,11 @@ table.diff td div.del {
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
357table.list td.repogroup {
358 padding-top: 1em;
359 font-weight: bold;
360}
diff --git a/cgit.h b/cgit.h
index f3d783e..8a69a1f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -33,12 +33,13 @@ 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
@@ -77,12 +78,13 @@ extern char *cgit_css;
77extern char *cgit_logo; 78extern char *cgit_logo;
78extern char *cgit_logo_link; 79extern char *cgit_logo_link;
79extern char *cgit_module_link; 80extern char *cgit_module_link;
80extern char *cgit_virtual_root; 81extern char *cgit_virtual_root;
81extern char *cgit_script_name; 82extern char *cgit_script_name;
82extern char *cgit_cache_root; 83extern char *cgit_cache_root;
84extern char *cgit_repo_group;
83 85
84extern int cgit_nocache; 86extern int cgit_nocache;
85extern int cgit_snapshots; 87extern int cgit_snapshots;
86extern int cgit_enable_log_filecount; 88extern int cgit_enable_log_filecount;
87extern int cgit_enable_log_linecount; 89extern int cgit_enable_log_linecount;
88extern int cgit_max_lock_attempts; 90extern int cgit_max_lock_attempts;
diff --git a/shared.c b/shared.c
index 53cd9b0..4ddba61 100644
--- a/shared.c
+++ b/shared.c
@@ -16,12 +16,13 @@ char *cgit_css = "/cgit.css";
16char *cgit_logo = "/git-logo.png"; 16char *cgit_logo = "/git-logo.png";
17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 17char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
18char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 18char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
19char *cgit_virtual_root = NULL; 19char *cgit_virtual_root = NULL;
20char *cgit_script_name = CGIT_SCRIPT_NAME; 20char *cgit_script_name = CGIT_SCRIPT_NAME;
21char *cgit_cache_root = "/var/cache/cgit"; 21char *cgit_cache_root = "/var/cache/cgit";
22char *cgit_repo_group = NULL;
22 23
23int cgit_nocache = 0; 24int cgit_nocache = 0;
24int cgit_snapshots = 0; 25int cgit_snapshots = 0;
25int cgit_enable_log_filecount = 0; 26int cgit_enable_log_filecount = 0;
26int cgit_enable_log_linecount = 0; 27int cgit_enable_log_linecount = 0;
27int cgit_max_lock_attempts = 5; 28int cgit_max_lock_attempts = 5;
@@ -82,12 +83,13 @@ struct repoinfo *add_repo(const char *url)
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;
@@ -128,12 +130,14 @@ void cgit_global_config_cb(const char *name, const char *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);
diff --git a/ui-repolist.c b/ui-repolist.c
index d7311e4..a884c20 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -9,12 +9,13 @@
9#include "cgit.h" 9#include "cgit.h"
10 10
11void cgit_print_repolist(struct cacheitem *item) 11void 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'>"
@@ -22,12 +23,21 @@ void cgit_print_repolist(struct cacheitem *item)
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);