Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'ml/head-include'
cgit.c | 2 ++ cgit.h | 1 + cgitrc.5.txt | 4 ++++ ui-shared.c | 4 +++-
diff --git a/cgit.c b/cgit.c index ae2025709a05b4f888e9fc090005c5a1a9ed10be..513ea125bb196a065a4b1cc24f24cae0f571de52 100644 --- a/cgit.c +++ b/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")) diff --git a/cgit.h b/cgit.h index 07a277a3e727b93b64623d4fa366ac3131486bdd..78b30bace9327dc310dd646fa1ad86bdecd64ce6 100644 --- a/cgit.h +++ b/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; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7879f75efc6b9be86659207e44d88c5d1b07eddf..683f3b54853cd398c2159886ebc51dab22eb92a3 100644 --- a/cgitrc.5.txt +++ b/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. diff --git a/ui-shared.c b/ui-shared.c index 10be3c057dab494ad9782220374d0df258247cf0..66d5b8220de122d69a8398119592f09114c83731 100644 --- a/ui-shared.c +++ b/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)