all repos — cgit @ 542f6a433034935a1aa895f7ef3273968915a5d1

a hyperfast web frontend for git written in c 

Merge branch 'ml/head-include'
Lars Hjemli hjemli@gmail.com
Sat, 25 Jul 2009 12:04:08 +0200
commit

542f6a433034935a1aa895f7ef3273968915a5d1

parent

681fdc45473143de3f3c5f69fbc7b94f5d6b0b75

4 files changed, 10 insertions(+), 1 deletions(-)

jump to
M cgit.c → cgit.c 
@@ -31,6 +31,8 @@ else if (!strcmp(name, "favicon"))
 		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"))
M cgit.h → cgit.h 
@@ -136,6 +136,7 @@ char *clone_prefix;
 	char *css;
 	char *favicon;
 	char *footer;
+	char *head_include;
 	char *header;
 	char *index_header;
 	char *index_info;
M cgitrc.5.txt → cgitrc.5.txt 
@@ -84,6 +84,10 @@ The content of the file specified with this option will be included
 	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.
M ui-shared.c → ui-shared.c 
@@ -516,8 +516,10 @@ html(cgit_httpscheme());
 		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)