Merge branch 'repogroups'
* repogroups: Adjust apperance of repogroup headers Don't highlight repogroup headings Teach cgit how to group repositories by category
此提交包含在:
		
							
								
								
									
										5
									
								
								cgit.css
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								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; | ||||
| } | ||||
|   | ||||
							
								
								
									
										2
									
								
								cgit.h
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								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; | ||||
|   | ||||
							
								
								
									
										4
									
								
								shared.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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")) | ||||
|   | ||||
| @@ -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; 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); | ||||
|   | ||||
		新增問題並參考
	
	封鎖使用者
	 Lars Hjemli
					Lars Hjemli