diff options
| -rw-r--r-- | cgit.c | 8 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | cgitrc.5.txt | 9 | ||||
| -rw-r--r-- | ui-shared.c | 18 | 
4 files changed, 31 insertions, 6 deletions
| @@ -71,9 +71,13 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)  		repo->module_link= xstrdup(value);  	else if (!strcmp(name, "section"))  		repo->section = xstrdup(value); -	else if (!strcmp(name, "readme") && value != NULL) { +	else if (!strcmp(name, "readme") && value != NULL)  		repo->readme = xstrdup(value); -	} else if (ctx.cfg.enable_filter_overrides) { +	else if (!strcmp(name, "logo") && value != NULL) +		repo->logo = xstrdup(value); +	else if (!strcmp(name, "logo-link") && value != NULL) +		repo->logo_link = xstrdup(value); +	else if (ctx.cfg.enable_filter_overrides) {  		if (!strcmp(name, "about-filter"))  			repo->about_filter = new_filter(value, 0);  		else if (!strcmp(name, "commit-filter")) @@ -70,6 +70,8 @@ struct cgit_repo {  	char *readme;  	char *section;  	char *clone_url; +	char *logo; +	char *logo_link;  	int snapshots;  	int enable_log_filecount;  	int enable_log_linecount; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 8e51ca5..01157a9 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -370,6 +370,15 @@ repo.enable-subject-links::  	A flag which can be used to override the global setting  	`enable-subject-links'. Default value: none. +repo.logo:: +	Url which specifies the source of an image which will be used as a logo +	on this repo's pages. Default value: global logo. + +repo.logo-link:: +	Url loaded when clicking on the cgit logo image. If unspecified the +	calculated url of the repository index page will be used. Default +	value: global logo-link. +  repo.max-stats::  	Override the default maximum statistics period. Valid values are equal  	to the values specified for the global "max-stats" setting. Default diff --git a/ui-shared.c b/ui-shared.c index ae29615..7efae7a 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -756,17 +756,27 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)  static void print_header(struct cgit_context *ctx)  { +	char *logo = NULL, *logo_link = NULL; +  	html("<table id='header'>\n");  	html("<tr>\n"); -	if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { +	if (ctx->repo && ctx->repo->logo && *ctx->repo->logo) +		logo = ctx->repo->logo; +	else +		logo = ctx->cfg.logo; +	if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link) +		logo_link = ctx->repo->logo_link; +	else +		logo_link = ctx->cfg.logo_link; +	if (logo && *logo) {  		html("<td class='logo' rowspan='2'><a href='"); -		if (ctx->cfg.logo_link) -			html_attr(ctx->cfg.logo_link); +		if (logo_link && *logo_link) +			html_attr(logo_link);  		else  			html_attr(cgit_rooturl());  		html("'><img src='"); -		html_attr(ctx->cfg.logo); +		html_attr(logo);  		html("' alt='cgit logo'/></a></td>\n");  	} | 
