Merge branch 'lh/header'

16 years ago · 0b3c746ba8
parent d6174b7aab b115955d71
commit 0b3c746ba8
4 changed files with 9 additions and 0 deletions
--- 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"))
--- 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;
--- 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.
--- 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()