about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2009-07-25 12:04:08 +0200
committerLars Hjemli2009-07-25 12:04:08 +0200
commit542f6a433034935a1aa895f7ef3273968915a5d1 (patch)
tree8fc123b3d9f014f31b5b160a9456c85b6c19aa0d
parentMerge branch 'plain-etag' (diff)
parentcgitrc.5.txt: document 'head-include' (diff)
downloadcgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.gz
cgit-542f6a433034935a1aa895f7ef3273968915a5d1.zip
Merge branch 'ml/head-include'
-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 ae20257..513ea12 100644 --- a/cgit.c +++ b/cgit.c
@@ -31,6 +31,8 @@ void config_cb(const char *name, const char *value)
31 ctx.cfg.favicon = xstrdup(value); 31 ctx.cfg.favicon = xstrdup(value);
32 else if (!strcmp(name, "footer")) 32 else if (!strcmp(name, "footer"))
33 ctx.cfg.footer = xstrdup(value); 33 ctx.cfg.footer = xstrdup(value);
34 else if (!strcmp(name, "head-include"))
35 ctx.cfg.head_include = xstrdup(value);
34 else if (!strcmp(name, "header")) 36 else if (!strcmp(name, "header"))
35 ctx.cfg.header = xstrdup(value); 37 ctx.cfg.header = xstrdup(value);
36 else if (!strcmp(name, "logo")) 38 else if (!strcmp(name, "logo"))
diff --git a/cgit.h b/cgit.h index 07a277a..78b30ba 100644 --- a/cgit.h +++ b/cgit.h
@@ -136,6 +136,7 @@ struct cgit_config {
136 char *css; 136 char *css;
137 char *favicon; 137 char *favicon;
138 char *footer; 138 char *footer;
139 char *head_include;
139 char *header; 140 char *header;
140 char *index_header; 141 char *index_header;
141 char *index_info; 142 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::
84 verbatim at the bottom of all pages (i.e. it replaces the standard 84 verbatim at the bottom of all pages (i.e. it replaces the standard
85 "generated by..." message. Default value: none. 85 "generated by..." message. Default value: none.
86 86
87head-include::
88 The content of the file specified with this option will be included
89 verbatim in the html HEAD section on all pages. Default value: none.
90
87header:: 91header::
88 The content of the file specified with this option will be included 92 The content of the file specified with this option will be included
89 verbatim at the top of all pages. Default value: none. 93 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)
516 html_attr(cgit_hosturl()); 516 html_attr(cgit_hosturl());
517 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 517 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
518 fmt("h=%s", ctx->qry.head))); 518 fmt("h=%s", ctx->qry.head)));
519 html("' type='application/atom+xml'/>"); 519 html("' type='application/atom+xml'/>\n");
520 } 520 }
521 if (ctx->cfg.head_include)
522 html_include(ctx->cfg.head_include);
521 html("</head>\n"); 523 html("</head>\n");
522 html("<body>\n"); 524 html("<body>\n");
523 if (ctx->cfg.header) 525 if (ctx->cfg.header)