bendns' repos / cgit
the repository which powers this website
Merge branch 'ml/head-include'
Browse Source
Lars Hjemli 2009-07-25
parent 681fdc4 · parent f618e8f · commit 542f6a4
Diffstat
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc.5.txt4
-rw-r--r--ui-shared.c4
4 files changed, 10 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index ae202570..513ea125 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 07a277a3..78b30bac 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 7879f75e..683f3b54 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 10be3c05..66d5b822 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)