Merge branch 'ml/head-include'

这个提交包含在:
Lars Hjemli 2009-07-25 12:04:08 +02:00
当前提交 542f6a4330
共有 4 个文件被更改,包括 10 次插入1 次删除

2
cgit.c
查看文件

@ -31,6 +31,8 @@ void config_cb(const char *name, const char *value)
ctx.cfg.favicon = xstrdup(value); ctx.cfg.favicon = xstrdup(value);
else if (!strcmp(name, "footer")) else if (!strcmp(name, "footer"))
ctx.cfg.footer = xstrdup(value); ctx.cfg.footer = xstrdup(value);
else if (!strcmp(name, "head-include"))
ctx.cfg.head_include = xstrdup(value);
else if (!strcmp(name, "header")) else if (!strcmp(name, "header"))
ctx.cfg.header = xstrdup(value); ctx.cfg.header = xstrdup(value);
else if (!strcmp(name, "logo")) else if (!strcmp(name, "logo"))

1
cgit.h
查看文件

@ -136,6 +136,7 @@ struct cgit_config {
char *css; char *css;
char *favicon; char *favicon;
char *footer; char *footer;
char *head_include;
char *header; char *header;
char *index_header; char *index_header;
char *index_info; char *index_info;

查看文件

@ -84,6 +84,10 @@ footer::
verbatim at the bottom of all pages (i.e. it replaces the standard verbatim at the bottom of all pages (i.e. it replaces the standard
"generated by..." message. Default value: none. "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:: header::
The content of the file specified with this option will be included The content of the file specified with this option will be included
verbatim at the top of all pages. Default value: none. verbatim at the top of all pages. Default value: none.

查看文件

@ -516,8 +516,10 @@ void cgit_print_docstart(struct cgit_context *ctx)
html_attr(cgit_hosturl()); html_attr(cgit_hosturl());
html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
fmt("h=%s", ctx->qry.head))); 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("</head>\n");
html("<body>\n"); html("<body>\n");
if (ctx->cfg.header) if (ctx->cfg.header)