-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
@@ -28,12 +28,14 @@ void config_cb(const char *name, const char *value) | |||
28 | else if (!strcmp(name, "css")) | 28 | else if (!strcmp(name, "css")) |
29 | ctx.cfg.css = xstrdup(value); | 29 | ctx.cfg.css = xstrdup(value); |
30 | else if (!strcmp(name, "favicon")) | 30 | else if (!strcmp(name, "favicon")) |
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")) |
37 | ctx.cfg.logo = xstrdup(value); | 39 | ctx.cfg.logo = xstrdup(value); |
38 | else if (!strcmp(name, "index-header")) | 40 | else if (!strcmp(name, "index-header")) |
39 | ctx.cfg.index_header = xstrdup(value); | 41 | ctx.cfg.index_header = xstrdup(value); |
@@ -133,12 +133,13 @@ struct cgit_config { | |||
133 | char *agefile; | 133 | char *agefile; |
134 | char *cache_root; | 134 | char *cache_root; |
135 | char *clone_prefix; | 135 | char *clone_prefix; |
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; |
142 | char *logo; | 143 | char *logo; |
143 | char *logo_link; | 144 | char *logo_link; |
144 | char *module_link; | 145 | char *module_link; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 7879f75..683f3b5 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -81,12 +81,16 @@ favicon:: | |||
81 | 81 | ||
82 | footer:: | 82 | footer:: |
83 | The content of the file specified with this option will be included | 83 | The content of the file specified with this option will be included |
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. |
90 | 94 | ||
91 | include:: | 95 | include:: |
92 | Name of a configfile to include before the rest of the current config- | 96 | Name of a configfile to include before the rest of the current config- |
diff --git a/ui-shared.c b/ui-shared.c index 10be3c0..66d5b82 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -513,14 +513,16 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
513 | if (host && ctx->repo) { | 513 | if (host && ctx->repo) { |
514 | html("<link rel='alternate' title='Atom feed' href='"); | 514 | html("<link rel='alternate' title='Atom feed' href='"); |
515 | html(cgit_httpscheme()); | 515 | html(cgit_httpscheme()); |
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) |
524 | html_include(ctx->cfg.header); | 526 | html_include(ctx->cfg.header); |
525 | } | 527 | } |
526 | 528 | ||