| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:04:08 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:04:08 (UTC) |
| commit | 542f6a433034935a1aa895f7ef3273968915a5d1 (patch) (unidiff) | |
| tree | 8fc123b3d9f014f31b5b160a9456c85b6c19aa0d | |
| parent | 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (diff) | |
| parent | f618e8f7174011e1e793df2c67fb9d1341652054 (diff) | |
| download | cgit-542f6a433034935a1aa895f7ef3273968915a5d1.zip cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.gz cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.bz2 | |
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) | |||
| 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")) |
| @@ -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 | ||
| 87 | head-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 | |||
| 87 | header:: | 91 | header:: |
| 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) |