diff options
| author | Lars Hjemli | 2009-02-01 19:17:52 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-02-01 19:17:52 +0100 |
| commit | 0b3c746ba80738dbe0885a21406409390936537c (patch) | |
| tree | 405a9f959feafab650f53e17561a1d3a85cb8097 | |
| parent | Merge branch 'stable' (diff) | |
| parent | Add support for a custom header (diff) | |
| download | cgit-0b3c746ba80738dbe0885a21406409390936537c.tar.gz cgit-0b3c746ba80738dbe0885a21406409390936537c.zip | |
Merge branch 'lh/header'
| -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 | 2 |
4 files changed, 9 insertions, 0 deletions
| diff --git a/cgit.c b/cgit.c index 608cab6..64d95f9 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, "header")) | ||
| 35 | ctx.cfg.header = xstrdup(value); | ||
| 34 | else if (!strcmp(name, "logo")) | 36 | else if (!strcmp(name, "logo")) |
| 35 | ctx.cfg.logo = xstrdup(value); | 37 | ctx.cfg.logo = xstrdup(value); |
| 36 | else if (!strcmp(name, "index-header")) | 38 | else if (!strcmp(name, "index-header")) |
| diff --git a/cgit.h b/cgit.h index 4fe94c6..4942b96 100644 --- a/cgit.h +++ b/cgit.h | |||
| @@ -135,6 +135,7 @@ struct cgit_config { | |||
| 135 | char *css; | 135 | char *css; |
| 136 | char *favicon; | 136 | char *favicon; |
| 137 | char *footer; | 137 | char *footer; |
| 138 | char *header; | ||
| 138 | char *index_header; | 139 | char *index_header; |
| 139 | char *index_info; | 140 | char *index_info; |
| 140 | char *logo; | 141 | char *logo; |
| diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 09f56a6..fd299ae 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 | header | ||
| 88 | The content of the file specified with this option will be included | ||
| 89 | verbatim at the top of all pages. Default value: none. | ||
| 90 | |||
| 87 | include | 91 | include |
| 88 | Name of a configfile to include before the rest of the current config- | 92 | Name of a configfile to include before the rest of the current config- |
| 89 | file is parsed. Default value: none. | 93 | file is parsed. Default value: none. |
| diff --git a/ui-shared.c b/ui-shared.c index 4f28512..de77bbf 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -500,6 +500,8 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
| 500 | } | 500 | } |
| 501 | html("</head>\n"); | 501 | html("</head>\n"); |
| 502 | html("<body>\n"); | 502 | html("<body>\n"); |
| 503 | if (ctx->cfg.header) | ||
| 504 | html_include(ctx->cfg.header); | ||
| 503 | } | 505 | } |
| 504 | 506 | ||
| 505 | void cgit_print_docend() | 507 | void cgit_print_docend() |