diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:04:08 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:04:08 +0200 |
| commit | 542f6a433034935a1aa895f7ef3273968915a5d1 (patch) | |
| tree | 8fc123b3d9f014f31b5b160a9456c85b6c19aa0d | |
| parent | 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (diff) | |
| parent | f618e8f7174011e1e793df2c67fb9d1341652054 (diff) | |
| download | cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.gz cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.bz2 cgit-542f6a433034935a1aa895f7ef3273968915a5d1.zip | |
Merge branch 'ml/head-include'
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 4 | ||||
| -rw-r--r-- | ui-shared.c | 4 |
4 files changed, 10 insertions, 1 deletions
@@ -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")) @@ -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("</head>\n"); html("<body>\n"); if (ctx->cfg.header) |