Merge branch 'ml/head-include'

15 years ago · 542f6a4330
parent 681fdc4547 f618e8f717
commit 542f6a4330
4 changed files with 10 additions and 1 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, "head-include"))
+		ctx.cfg.head_include = xstrdup(value);
 	else if (!strcmp(name, "header"))
 		ctx.cfg.header = xstrdup(value);
 	else if (!strcmp(name, "logo"))
--- a/cgit.h
+++ b/cgit.h
@ -136,6 +136,7 @@ struct cgit_config {
 	char *css;
 	char *favicon;
 	char *footer;
+	char *head_include;
 	char *header;
 	char *index_header;
 	char *index_info;
--- 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.

+head-include::
+	The content of the file specified with this option will be included
+	verbatim in the html HEAD section on all pages. 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.
--- a/ui-shared.c
+++ b/ui-shared.c
@ -516,8 +516,10 @@ void cgit_print_docstart(struct cgit_context *ctx)
 		html_attr(cgit_hosturl());
 		html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
 				       fmt("h=%s", ctx->qry.head)));
-		html("' type='application/atom+xml'/>");
+		html("' type='application/atom+xml'/>\n");
 	}
+	if (ctx->cfg.head_include)
+		html_include(ctx->cfg.head_include);
 	html("</head>\n");
 	html("<body>\n");
 	if (ctx->cfg.header)