diff options
| author |   Andy Green <andy@warmcat.com> | 2018-06-23 18:25:53 +0800 |
|---|---|---|
| committer |   Christian Hesse <mail@eworm.de> | 2021-03-14 23:18:22 +0100 |
| commit | 72904bbd1a2f471d17f43c2c84d31a840e7e4ae7 (patch) | |
| tree | a66035022779178ca850d3717dc286973107a5eb | |
| parent | 21c36836b16c225d335aa562fd42c74bbd8b4f8a (diff) | |
| download | cgit-72904bbd1a2f471d17f43c2c84d31a840e7e4ae7.tar.gz cgit-72904bbd1a2f471d17f43c2c84d31a840e7e4ae7.tar.zst cgit-72904bbd1a2f471d17f43c2c84d31a840e7e4ae7.zip | |
config: add js
Just like the config allows setting css URL path,
add a config for setting the js URL path
Setting the js path to an empty string disables
emitting the reference to it in the head section.
Signed-off-by: Andy Green <andy@warmcat.com>
Reviewed-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgit.js | 7 | ||||
| -rw-r--r-- | cgitrc.5.txt | 5 | ||||
| -rw-r--r-- | ui-shared.c | 11 |
6 files changed, 27 insertions, 0 deletions
@@ -87,6 +87,7 @@ install: all $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css + $(INSTALL) -m 0644 cgit.js $(DESTDIR)$(CGIT_DATA_PATH)/cgit.js $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt @@ -143,6 +143,8 @@ static void config_cb(const char *name, const char *value) ctx.cfg.root_readme = xstrdup(value); else if (!strcmp(name, "css")) string_list_append(&ctx.cfg.css, xstrdup(value)); + else if (!strcmp(name, "js")) + string_list_append(&ctx.cfg.js, xstrdup(value)); else if (!strcmp(name, "favicon")) ctx.cfg.favicon = xstrdup(value); else if (!strcmp(name, "footer")) @@ -264,6 +264,7 @@ struct cgit_config { int branch_sort; int commit_sort; struct string_list mimetypes; + struct string_list js; struct cgit_filter *about_filter; struct cgit_filter *commit_filter; struct cgit_filter *source_filter; @@ -0,0 +1,7 @@ +/* cgit.js: javacript functions for cgit + * + * Copyright (C) 2006-2018 cgit Development Team <cgit@lists.zx2c4.com> + * + * Licensed under GNU General Public License v2 + * (see COPYING for full license text) + */ diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 9f7020e..cf2f10a 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -239,6 +239,11 @@ include:: Name of a configfile to include before the rest of the current config- file is parsed. Default value: none. See also: "MACRO EXPANSION". +js:: + Url which specifies the javascript script document to include in all cgit + pages. Default value: "/cgit.js". Setting this to an empty string will + disable generation of the link to this file in the head section. + local-time:: Flag which, if set to "1", makes cgit print commit and tag times in the servers timezone. Default value: "0". diff --git a/ui-shared.c b/ui-shared.c index f998912..e6def60 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -780,6 +780,15 @@ static int emit_css_link(struct string_list_item *s, void *arg) return 0; } +static int emit_js_link(struct string_list_item *s, void *arg) +{ + html("<script type='text/javascript' src='"); + html_attr(s->string); + html("'></script>\n"); + + return 0; +} + void cgit_print_docstart(void) { char *host = cgit_hosturl(); @@ -805,6 +814,8 @@ void cgit_print_docstart(void) else emit_css_link(NULL, "/cgit.css"); + for_each_string_list(&ctx.cfg.js, emit_js_link, NULL); + if (ctx.cfg.favicon) { html("<link rel='shortcut icon' href='"); html_attr(ctx.cfg.favicon); |