aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-02-01 19:17:52 +0100
committerLars Hjemli <hjemli@gmail.com>2009-02-01 19:17:52 +0100
commit0b3c746ba80738dbe0885a21406409390936537c (patch)
tree405a9f959feafab650f53e17561a1d3a85cb8097
parentMerge branch 'stable' (diff)
parentAdd support for a custom header (diff)
downloadcgit-0b3c746ba80738dbe0885a21406409390936537c.tar.xz
cgit-0b3c746ba80738dbe0885a21406409390936537c.zip
Merge branch 'lh/header'
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt4
-rw-r--r--ui-shared.c2
4 files changed, 9 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 608cab6..64d95f9 100644
--- a/cgit.c
+++ b/cgit.c
@@ -31,6 +31,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.favicon = xstrdup(value);
else if (!strcmp(name, "footer"))
ctx.cfg.footer = xstrdup(value);
+ else if (!strcmp(name, "header"))
+ ctx.cfg.header = xstrdup(value);
else if (!strcmp(name, "logo"))
ctx.cfg.logo = xstrdup(value);
else if (!strcmp(name, "index-header"))
diff --git a/cgit.h b/cgit.h
index 4fe94c6..4942b96 100644
--- a/cgit.h
+++ b/cgit.h
@@ -135,6 +135,7 @@ struct cgit_config {
char *css;
char *favicon;
char *footer;
+ char *header;
char *index_header;
char *index_info;
char *logo;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 09f56a6..fd299ae 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -84,6 +84,10 @@ footer
verbatim at the bottom of all pages (i.e. it replaces the standard
"generated by..." message. Default value: none.
+header
+ The content of the file specified with this option will be included
+ verbatim at the top of all pages. Default value: none.
+
include
Name of a configfile to include before the rest of the current config-
file is parsed. Default value: none.
diff --git a/ui-shared.c b/ui-shared.c
index 4f28512..de77bbf 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -500,6 +500,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
}
html("</head>\n");
html("<body>\n");
+ if (ctx->cfg.header)
+ html_include(ctx->cfg.header);
}
void cgit_print_docend()