summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-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
@@ -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, "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);
40 else if (!strcmp(name, "index-info")) 42 else if (!strcmp(name, "index-info"))
41 ctx.cfg.index_info = xstrdup(value); 43 ctx.cfg.index_info = xstrdup(value);
42 else if (!strcmp(name, "logo-link")) 44 else if (!strcmp(name, "logo-link"))
43 ctx.cfg.logo_link = xstrdup(value); 45 ctx.cfg.logo_link = xstrdup(value);
44 else if (!strcmp(name, "module-link")) 46 else if (!strcmp(name, "module-link"))
45 ctx.cfg.module_link = xstrdup(value); 47 ctx.cfg.module_link = xstrdup(value);
diff --git a/cgit.h b/cgit.h
index 07a277a..78b30ba 100644
--- a/cgit.h
+++ b/cgit.h
@@ -127,24 +127,25 @@ struct cgit_query {
127 int nohead; 127 int nohead;
128 char *sort; 128 char *sort;
129 int showmsg; 129 int showmsg;
130}; 130};
131 131
132struct cgit_config { 132struct 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;
145 char *repo_group; 146 char *repo_group;
146 char *robots; 147 char *robots;
147 char *root_title; 148 char *root_title;
148 char *root_desc; 149 char *root_desc;
149 char *root_readme; 150 char *root_readme;
150 char *script_name; 151 char *script_name;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 7879f75..683f3b5 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -75,24 +75,28 @@ enable-log-linecount::
75 value: "0". 75 value: "0".
76 76
77favicon:: 77favicon::
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
82footer:: 82footer::
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
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.
90 94
91include:: 95include::
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-
93 file is parsed. Default value: none. 97 file is parsed. Default value: none.
94 98
95index-header:: 99index-header::
96 The content of the file specified with this option will be included 100 The content of the file specified with this option will be included
97 verbatim above the repository index. This setting is deprecated, and 101 verbatim above the repository index. This setting is deprecated, and
98 will not be supported by cgit-1.0 (use root-readme instead). Default 102 will not be supported by cgit-1.0 (use root-readme instead). Default
diff --git a/ui-shared.c b/ui-shared.c
index 10be3c0..66d5b82 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -507,26 +507,28 @@ void cgit_print_docstart(struct cgit_context *ctx)
507 html("'/>\n"); 507 html("'/>\n");
508 if (ctx->cfg.favicon) { 508 if (ctx->cfg.favicon) {
509 html("<link rel='shortcut icon' href='"); 509 html("<link rel='shortcut icon' href='");
510 html_attr(ctx->cfg.favicon); 510 html_attr(ctx->cfg.favicon);
511 html("'/>\n"); 511 html("'/>\n");
512 } 512 }
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
527void cgit_print_docend() 529void cgit_print_docend()
528{ 530{
529 html("</div>"); 531 html("</div>");
530 if (ctx.cfg.footer) 532 if (ctx.cfg.footer)
531 html_include(ctx.cfg.footer); 533 html_include(ctx.cfg.footer);
532 else { 534 else {