author | Lars Hjemli <larsh@hatman.(none)> | 2008-07-19 18:40:30 (UTC) |
---|---|---|
committer | Lars Hjemli <larsh@hatman.(none)> | 2008-07-19 18:47:39 (UTC) |
commit | 502865a5ec40fed5f1f865cb34002aecaab8405e (patch) (unidiff) | |
tree | ab53ab68d6c56948502287ff3cdad45c409aebbb | |
parent | de5e9281719809c5b07051faa88e95bd16e8d485 (diff) | |
download | cgit-502865a5ec40fed5f1f865cb34002aecaab8405e.zip cgit-502865a5ec40fed5f1f865cb34002aecaab8405e.tar.gz cgit-502865a5ec40fed5f1f865cb34002aecaab8405e.tar.bz2 |
Add a favicon option to cgitrc
This option is used to specify a shortcut icon on all cgit pages.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc | 2 | ||||
-rw-r--r-- | ui-shared.c | 5 |
4 files changed, 10 insertions, 0 deletions
@@ -20,16 +20,18 @@ void config_cb(const char *name, const char *value) | |||
20 | if (!strcmp(name, "root-title")) | 20 | if (!strcmp(name, "root-title")) |
21 | ctx.cfg.root_title = xstrdup(value); | 21 | ctx.cfg.root_title = xstrdup(value); |
22 | else if (!strcmp(name, "root-desc")) | 22 | else if (!strcmp(name, "root-desc")) |
23 | ctx.cfg.root_desc = xstrdup(value); | 23 | ctx.cfg.root_desc = xstrdup(value); |
24 | else if (!strcmp(name, "root-readme")) | 24 | else if (!strcmp(name, "root-readme")) |
25 | ctx.cfg.root_readme = xstrdup(value); | 25 | ctx.cfg.root_readme = xstrdup(value); |
26 | else if (!strcmp(name, "css")) | 26 | else if (!strcmp(name, "css")) |
27 | ctx.cfg.css = xstrdup(value); | 27 | ctx.cfg.css = xstrdup(value); |
28 | else if (!strcmp(name, "favicon")) | ||
29 | ctx.cfg.favicon = xstrdup(value); | ||
28 | else if (!strcmp(name, "footer")) | 30 | else if (!strcmp(name, "footer")) |
29 | ctx.cfg.footer = xstrdup(value); | 31 | ctx.cfg.footer = xstrdup(value); |
30 | else if (!strcmp(name, "logo")) | 32 | else if (!strcmp(name, "logo")) |
31 | ctx.cfg.logo = xstrdup(value); | 33 | ctx.cfg.logo = xstrdup(value); |
32 | else if (!strcmp(name, "index-header")) | 34 | else if (!strcmp(name, "index-header")) |
33 | ctx.cfg.index_header = xstrdup(value); | 35 | ctx.cfg.index_header = xstrdup(value); |
34 | else if (!strcmp(name, "index-info")) | 36 | else if (!strcmp(name, "index-info")) |
35 | ctx.cfg.index_info = xstrdup(value); | 37 | ctx.cfg.index_info = xstrdup(value); |
@@ -120,16 +120,17 @@ struct cgit_query { | |||
120 | int ofs; | 120 | int ofs; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct cgit_config { | 123 | struct cgit_config { |
124 | char *agefile; | 124 | char *agefile; |
125 | char *cache_root; | 125 | char *cache_root; |
126 | char *clone_prefix; | 126 | char *clone_prefix; |
127 | char *css; | 127 | char *css; |
128 | char *favicon; | ||
128 | char *footer; | 129 | char *footer; |
129 | char *index_header; | 130 | char *index_header; |
130 | char *index_info; | 131 | char *index_info; |
131 | char *logo; | 132 | char *logo; |
132 | char *logo_link; | 133 | char *logo_link; |
133 | char *module_link; | 134 | char *module_link; |
134 | char *repo_group; | 135 | char *repo_group; |
135 | char *robots; | 136 | char *robots; |
@@ -102,16 +102,18 @@ | |||
102 | ## If specified, the file at this path will be included as HTML above | 102 | ## If specified, the file at this path will be included as HTML above |
103 | ## the repository index | 103 | ## the repository index |
104 | #index-header= | 104 | #index-header= |
105 | 105 | ||
106 | 106 | ||
107 | ## Link to css file | 107 | ## Link to css file |
108 | #css=/cgit/cgit.css | 108 | #css=/cgit/cgit.css |
109 | 109 | ||
110 | ## Link to favicon | ||
111 | #favicon=/favicon.ico | ||
110 | 112 | ||
111 | ## Link to logo file | 113 | ## Link to logo file |
112 | #logo=/cgit/git-logo.png | 114 | #logo=/cgit/git-logo.png |
113 | 115 | ||
114 | 116 | ||
115 | ## Url loaded when clicking the logo | 117 | ## Url loaded when clicking the logo |
116 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ | 118 | #logo-link=http://www.kernel.org/pub/software/scm/git/docs/ |
117 | 119 | ||
diff --git a/ui-shared.c b/ui-shared.c index 8a00099..6f83d2a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -432,16 +432,21 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
432 | html_txt(ctx->page.title); | 432 | html_txt(ctx->page.title); |
433 | html("</title>\n"); | 433 | html("</title>\n"); |
434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
435 | if (ctx->cfg.robots && *ctx->cfg.robots) | 435 | if (ctx->cfg.robots && *ctx->cfg.robots) |
436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
437 | html("<link rel='stylesheet' type='text/css' href='"); | 437 | html("<link rel='stylesheet' type='text/css' href='"); |
438 | html_attr(ctx->cfg.css); | 438 | html_attr(ctx->cfg.css); |
439 | html("'/>\n"); | 439 | html("'/>\n"); |
440 | if (ctx->cfg.favicon) { | ||
441 | html("<link rel='shortcut icon' href='"); | ||
442 | html_attr(ctx->cfg.favicon); | ||
443 | html("'/>\n"); | ||
444 | } | ||
440 | html("</head>\n"); | 445 | html("</head>\n"); |
441 | html("<body>\n"); | 446 | html("<body>\n"); |
442 | } | 447 | } |
443 | 448 | ||
444 | void cgit_print_docend() | 449 | void cgit_print_docend() |
445 | { | 450 | { |
446 | html("</div>"); | 451 | html("</div>"); |
447 | if (ctx.cfg.footer) | 452 | if (ctx.cfg.footer) |