author | Mark Lodato <lodatom@gmail.com> | 2009-03-15 04:11:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-06-07 16:55:44 (UTC) |
commit | b5a3a2049648415e86d518a8bf2229b3e463b10f (patch) (unidiff) | |
tree | 37c44671e4557d38ba3d5905f0b595376aece5d6 | |
parent | 45e7fcecc1117440e6274ce3c6ab7d893c4986ee (diff) | |
download | cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.zip cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.gz cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.bz2 |
Add head-include configuration option.
This patch adds an option to the configuration file, "head-include",
which works just like "header" or "footer", except the content is put
into the HTML's <head> tag.
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 4 |
3 files changed, 6 insertions, 1 deletions
@@ -10,48 +10,50 @@ | |||
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | void config_cb(const char *name, const char *value) | 20 | void config_cb(const char *name, const char *value) |
21 | { | 21 | { |
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); |
46 | else if (!strcmp(name, "virtual-root")) { | 48 | else if (!strcmp(name, "virtual-root")) { |
47 | ctx.cfg.virtual_root = trim_end(value, '/'); | 49 | ctx.cfg.virtual_root = trim_end(value, '/'); |
48 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 50 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
49 | ctx.cfg.virtual_root = ""; | 51 | ctx.cfg.virtual_root = ""; |
50 | } else if (!strcmp(name, "nocache")) | 52 | } else if (!strcmp(name, "nocache")) |
51 | ctx.cfg.nocache = atoi(value); | 53 | ctx.cfg.nocache = atoi(value); |
52 | else if (!strcmp(name, "snapshots")) | 54 | else if (!strcmp(name, "snapshots")) |
53 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 55 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
54 | else if (!strcmp(name, "enable-index-links")) | 56 | else if (!strcmp(name, "enable-index-links")) |
55 | ctx.cfg.enable_index_links = atoi(value); | 57 | ctx.cfg.enable_index_links = atoi(value); |
56 | else if (!strcmp(name, "enable-log-filecount")) | 58 | else if (!strcmp(name, "enable-log-filecount")) |
57 | ctx.cfg.enable_log_filecount = atoi(value); | 59 | ctx.cfg.enable_log_filecount = atoi(value); |
@@ -115,48 +115,49 @@ struct cgit_query { | |||
115 | char *page; | 115 | char *page; |
116 | char *search; | 116 | char *search; |
117 | char *grep; | 117 | char *grep; |
118 | char *head; | 118 | char *head; |
119 | char *sha1; | 119 | char *sha1; |
120 | char *sha2; | 120 | char *sha2; |
121 | char *path; | 121 | char *path; |
122 | char *name; | 122 | char *name; |
123 | char *mimetype; | 123 | char *mimetype; |
124 | char *url; | 124 | char *url; |
125 | char *period; | 125 | char *period; |
126 | int ofs; | 126 | int ofs; |
127 | int nohead; | 127 | int nohead; |
128 | char *sort; | 128 | char *sort; |
129 | int showmsg; | 129 | int showmsg; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | struct cgit_config { | 132 | 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; |
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; |
151 | char *virtual_root; | 152 | char *virtual_root; |
152 | int cache_size; | 153 | int cache_size; |
153 | int cache_dynamic_ttl; | 154 | int cache_dynamic_ttl; |
154 | int cache_max_create_time; | 155 | int cache_max_create_time; |
155 | int cache_repo_ttl; | 156 | int cache_repo_ttl; |
156 | int cache_root_ttl; | 157 | int cache_root_ttl; |
157 | int cache_static_ttl; | 158 | int cache_static_ttl; |
158 | int enable_index_links; | 159 | int enable_index_links; |
159 | int enable_log_filecount; | 160 | int enable_log_filecount; |
160 | int enable_log_linecount; | 161 | int enable_log_linecount; |
161 | int local_time; | 162 | int local_time; |
162 | int max_repo_count; | 163 | int max_repo_count; |
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..fea2c40 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -475,50 +475,52 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
475 | { | 475 | { |
476 | char *host = cgit_hosturl(); | 476 | char *host = cgit_hosturl(); |
477 | html(cgit_doctype); | 477 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 479 | html("<head>\n"); |
480 | html("<title>"); | 480 | html("<title>"); |
481 | html_txt(ctx->page.title); | 481 | html_txt(ctx->page.title); |
482 | html("</title>\n"); | 482 | html("</title>\n"); |
483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 484 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 486 | html("<link rel='stylesheet' type='text/css' href='"); |
487 | html_attr(ctx->cfg.css); | 487 | html_attr(ctx->cfg.css); |
488 | html("'/>\n"); | 488 | html("'/>\n"); |
489 | if (ctx->cfg.favicon) { | 489 | if (ctx->cfg.favicon) { |
490 | html("<link rel='shortcut icon' href='"); | 490 | html("<link rel='shortcut icon' href='"); |
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'/>\n"); |
500 | } | 500 | } |
501 | if (ctx->cfg.head_include) | ||
502 | html_include(ctx->cfg.head_include); | ||
501 | html("</head>\n"); | 503 | html("</head>\n"); |
502 | html("<body>\n"); | 504 | html("<body>\n"); |
503 | if (ctx->cfg.header) | 505 | if (ctx->cfg.header) |
504 | html_include(ctx->cfg.header); | 506 | html_include(ctx->cfg.header); |
505 | } | 507 | } |
506 | 508 | ||
507 | void cgit_print_docend() | 509 | void cgit_print_docend() |
508 | { | 510 | { |
509 | html("</div>"); | 511 | html("</div>"); |
510 | if (ctx.cfg.footer) | 512 | if (ctx.cfg.footer) |
511 | html_include(ctx.cfg.footer); | 513 | html_include(ctx.cfg.footer); |
512 | else { | 514 | else { |
513 | htmlf("<div class='footer'>generated by cgit %s at ", | 515 | htmlf("<div class='footer'>generated by cgit %s at ", |
514 | cgit_version); | 516 | cgit_version); |
515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 517 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
516 | html("</div>\n"); | 518 | html("</div>\n"); |
517 | } | 519 | } |
518 | html("</body>\n</html>\n"); | 520 | html("</body>\n</html>\n"); |
519 | } | 521 | } |
520 | 522 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 523 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 524 | int flags, void *cb_data) |
523 | { | 525 | { |
524 | char *name = (char *)refname; | 526 | char *name = (char *)refname; |