summaryrefslogtreecommitdiffabout
authorMark Lodato <lodatom@gmail.com>2009-03-15 04:11:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-06-07 16:55:44 (UTC)
commitb5a3a2049648415e86d518a8bf2229b3e463b10f (patch) (side-by-side diff)
tree37c44671e4557d38ba3d5905f0b595376aece5d6
parent45e7fcecc1117440e6274ce3c6ab7d893c4986ee (diff)
downloadcgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.zip
cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.gz
cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.bz2
Add head-include configuration option.
This patch adds an option to the configuration file, "head-include", which works just like "header" or "footer", except the content is put into the HTML's <head> tag.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--ui-shared.c4
3 files changed, 6 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 64d95f9..2afc598 100644
--- a/cgit.c
+++ b/cgit.c
@@ -22,24 +22,26 @@ void config_cb(const char *name, const char *value)
if (!strcmp(name, "root-title"))
ctx.cfg.root_title = xstrdup(value);
else if (!strcmp(name, "root-desc"))
ctx.cfg.root_desc = xstrdup(value);
else if (!strcmp(name, "root-readme"))
ctx.cfg.root_readme = xstrdup(value);
else if (!strcmp(name, "css"))
ctx.cfg.css = xstrdup(value);
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"))
ctx.cfg.logo = xstrdup(value);
else if (!strcmp(name, "index-header"))
ctx.cfg.index_header = xstrdup(value);
else if (!strcmp(name, "index-info"))
ctx.cfg.index_info = xstrdup(value);
else if (!strcmp(name, "logo-link"))
ctx.cfg.logo_link = xstrdup(value);
else if (!strcmp(name, "module-link"))
ctx.cfg.module_link = xstrdup(value);
diff --git a/cgit.h b/cgit.h
index 5f7af51..aed826a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -127,24 +127,25 @@ struct cgit_query {
int nohead;
char *sort;
int showmsg;
};
struct cgit_config {
char *agefile;
char *cache_root;
char *clone_prefix;
char *css;
char *favicon;
char *footer;
+ char *head_include;
char *header;
char *index_header;
char *index_info;
char *logo;
char *logo_link;
char *module_link;
char *repo_group;
char *robots;
char *root_title;
char *root_desc;
char *root_readme;
char *script_name;
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..fea2c40 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -487,26 +487,28 @@ void cgit_print_docstart(struct cgit_context *ctx)
html_attr(ctx->cfg.css);
html("'/>\n");
if (ctx->cfg.favicon) {
html("<link rel='shortcut icon' href='");
html_attr(ctx->cfg.favicon);
html("'/>\n");
}
if (host && ctx->repo) {
html("<link rel='alternate' title='Atom feed' href='http://");
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)
html_include(ctx->cfg.header);
}
void cgit_print_docend()
{
html("</div>");
if (ctx.cfg.footer)
html_include(ctx.cfg.footer);
else {