-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
@@ -22,24 +22,26 @@ void config_cb(const char *name, const char *value) | |||
22 | if (!strcmp(name, "root-title")) | 22 | if (!strcmp(name, "root-title")) |
23 | ctx.cfg.root_title = xstrdup(value); | 23 | ctx.cfg.root_title = xstrdup(value); |
24 | else if (!strcmp(name, "root-desc")) | 24 | else if (!strcmp(name, "root-desc")) |
25 | ctx.cfg.root_desc = xstrdup(value); | 25 | ctx.cfg.root_desc = xstrdup(value); |
26 | else if (!strcmp(name, "root-readme")) | 26 | else if (!strcmp(name, "root-readme")) |
27 | ctx.cfg.root_readme = xstrdup(value); | 27 | ctx.cfg.root_readme = xstrdup(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, "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")) |
37 | ctx.cfg.index_header = xstrdup(value); | 39 | ctx.cfg.index_header = xstrdup(value); |
38 | else if (!strcmp(name, "index-info")) | 40 | else if (!strcmp(name, "index-info")) |
39 | ctx.cfg.index_info = xstrdup(value); | 41 | ctx.cfg.index_info = xstrdup(value); |
40 | else if (!strcmp(name, "logo-link")) | 42 | else if (!strcmp(name, "logo-link")) |
41 | ctx.cfg.logo_link = xstrdup(value); | 43 | ctx.cfg.logo_link = xstrdup(value); |
42 | else if (!strcmp(name, "module-link")) | 44 | else if (!strcmp(name, "module-link")) |
43 | ctx.cfg.module_link = xstrdup(value); | 45 | ctx.cfg.module_link = xstrdup(value); |
44 | else if (!strcmp(name, "virtual-root")) { | 46 | else if (!strcmp(name, "virtual-root")) { |
45 | ctx.cfg.virtual_root = trim_end(value, '/'); | 47 | ctx.cfg.virtual_root = trim_end(value, '/'); |
@@ -126,24 +126,25 @@ struct cgit_query { | |||
126 | int nohead; | 126 | int nohead; |
127 | char *sort; | 127 | char *sort; |
128 | int showmsg; | 128 | int showmsg; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | struct cgit_config { | 131 | struct cgit_config { |
132 | char *agefile; | 132 | char *agefile; |
133 | char *cache_root; | 133 | char *cache_root; |
134 | char *clone_prefix; | 134 | char *clone_prefix; |
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; |
141 | char *logo_link; | 142 | char *logo_link; |
142 | char *module_link; | 143 | char *module_link; |
143 | char *repo_group; | 144 | char *repo_group; |
144 | char *robots; | 145 | char *robots; |
145 | char *root_title; | 146 | char *root_title; |
146 | char *root_desc; | 147 | char *root_desc; |
147 | char *root_readme; | 148 | char *root_readme; |
148 | char *script_name; | 149 | char *script_name; |
149 | char *virtual_root; | 150 | char *virtual_root; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 09f56a6..fd299ae 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -75,24 +75,28 @@ enable-log-linecount | |||
75 | value: "0". | 75 | value: "0". |
76 | 76 | ||
77 | favicon | 77 | favicon |
78 | Url used as link to a shortcut icon for cgit. If specified, it is | 78 | Url used as link to a shortcut icon for cgit. If specified, it is |
79 | suggested to use the value "/favicon.ico" since certain browsers will | 79 | suggested to use the value "/favicon.ico" since certain browsers will |
80 | ignore other values. Default value: none. | 80 | ignore other values. Default value: none. |
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 | 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. |
90 | 94 | ||
91 | index-header | 95 | index-header |
92 | The content of the file specified with this option will be included | 96 | The content of the file specified with this option will be included |
93 | verbatim above the repository index. This setting is deprecated, and | 97 | verbatim above the repository index. This setting is deprecated, and |
94 | will not be supported by cgit-1.0 (use root-readme instead). Default | 98 | will not be supported by cgit-1.0 (use root-readme instead). Default |
95 | value: none. | 99 | value: none. |
96 | 100 | ||
97 | index-info | 101 | index-info |
98 | The content of the file specified with this option will be included | 102 | The content of the file specified with this option will be included |
diff --git a/ui-shared.c b/ui-shared.c index 4f28512..de77bbf 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -491,24 +491,26 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
491 | html_attr(ctx->cfg.favicon); | 491 | html_attr(ctx->cfg.favicon); |
492 | html("'/>\n"); | 492 | html("'/>\n"); |
493 | } | 493 | } |
494 | if (host && ctx->repo) { | 494 | if (host && ctx->repo) { |
495 | html("<link rel='alternate' title='Atom feed' href='http://"); | 495 | html("<link rel='alternate' title='Atom feed' href='http://"); |
496 | html_attr(cgit_hosturl()); | 496 | html_attr(cgit_hosturl()); |
497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
498 | fmt("h=%s", ctx->qry.head))); | 498 | fmt("h=%s", ctx->qry.head))); |
499 | html("' type='application/atom+xml'/>"); | 499 | html("' type='application/atom+xml'/>"); |
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() |
506 | { | 508 | { |
507 | html("</div>"); | 509 | html("</div>"); |
508 | if (ctx.cfg.footer) | 510 | if (ctx.cfg.footer) |
509 | html_include(ctx.cfg.footer); | 511 | html_include(ctx.cfg.footer); |
510 | else { | 512 | else { |
511 | htmlf("<div class='footer'>generated by cgit %s at ", | 513 | htmlf("<div class='footer'>generated by cgit %s at ", |
512 | cgit_version); | 514 | cgit_version); |
513 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
514 | html("</div>\n"); | 516 | html("</div>\n"); |