summaryrefslogtreecommitdiffabout
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-12-23 11:47:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2011-02-19 13:41:39 (UTC)
commit808c685ebb7cd2d24d3881b74e3be2439bd1393b (patch) (side-by-side diff)
tree5bb224b73bbbc7d57864c587cc022fcc9826f4b3
parent17596459fe9a43428a261e66f65b227d15bf7ee5 (diff)
downloadcgit-808c685ebb7cd2d24d3881b74e3be2439bd1393b.zip
cgit-808c685ebb7cd2d24d3881b74e3be2439bd1393b.tar.gz
cgit-808c685ebb7cd2d24d3881b74e3be2439bd1393b.tar.bz2
implement repo.logo and repo.logo-link
Allow for per repo logo and logo-link; Use global logo and logo-link per default. Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c8
-rw-r--r--cgit.h2
-rw-r--r--cgitrc.5.txt9
-rw-r--r--ui-shared.c18
4 files changed, 31 insertions, 6 deletions
diff --git a/cgit.c b/cgit.c
index 412fbf0..e8c1f94 100644
--- a/cgit.c
+++ b/cgit.c
@@ -73,5 +73,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
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"))
diff --git a/cgit.h b/cgit.h
index f5f68ac..8a9d5fa 100644
--- a/cgit.h
+++ b/cgit.h
@@ -72,2 +72,4 @@ struct cgit_repo {
char *clone_url;
+ char *logo;
+ char *logo_link;
int snapshots;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 8e51ca5..01157a9 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -372,2 +372,11 @@ repo.enable-subject-links::
+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::
diff --git a/ui-shared.c b/ui-shared.c
index ae29615..7efae7a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -758,2 +758,4 @@ static void print_header(struct cgit_context *ctx)
{
+ char *logo = NULL, *logo_link = NULL;
+
html("<table id='header'>\n");
@@ -761,6 +763,14 @@ static void print_header(struct cgit_context *ctx)
- 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
@@ -768,3 +778,3 @@ static void print_header(struct cgit_context *ctx)
html("'><img src='");
- html_attr(ctx->cfg.logo);
+ html_attr(logo);
html("' alt='cgit logo'/></a></td>\n");