From 542f6a433034935a1aa895f7ef3273968915a5d1 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 25 Jul 2009 10:04:08 +0000 Subject: Merge branch 'ml/head-include' --- diff --git a/cgit.c b/cgit.c index ae20257..513ea12 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, "head-include")) + ctx.cfg.head_include = xstrdup(value); else if (!strcmp(name, "header")) ctx.cfg.header = xstrdup(value); else if (!strcmp(name, "logo")) diff --git a/cgit.h b/cgit.h index 07a277a..78b30ba 100644 --- 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; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7879f75..683f3b5 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. +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. diff --git a/ui-shared.c b/ui-shared.c index 10be3c0..66d5b82 100644 --- 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("\n"); html("\n"); if (ctx->cfg.header) -- cgit v0.9.0.2