summaryrefslogtreecommitdiffabout
authorLars Hjemli <larsh@hatman.(none)>2008-07-19 18:40:30 (UTC)
committer Lars Hjemli <larsh@hatman.(none)>2008-07-19 18:47:39 (UTC)
commit502865a5ec40fed5f1f865cb34002aecaab8405e (patch) (unidiff)
treeab53ab68d6c56948502287ff3cdad45c409aebbb
parentde5e9281719809c5b07051faa88e95bd16e8d485 (diff)
downloadcgit-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc2
-rw-r--r--ui-shared.c5
4 files changed, 10 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 8f154c9..8795085 100644
--- a/cgit.c
+++ b/cgit.c
@@ -22,12 +22,14 @@ void config_cb(const char *name, const char *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);
diff --git a/cgit.h b/cgit.h
index d18d9ca..7881aca 100644
--- a/cgit.h
+++ b/cgit.h
@@ -122,12 +122,13 @@ struct cgit_query {
122 122
123struct cgit_config { 123struct 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;
diff --git a/cgitrc b/cgitrc
index f1d8997..9e8a0f2 100644
--- a/cgitrc
+++ b/cgitrc
@@ -104,12 +104,14 @@
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
diff --git a/ui-shared.c b/ui-shared.c
index 8a00099..6f83d2a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -434,12 +434,17 @@ void cgit_print_docstart(struct cgit_context *ctx)
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
444void cgit_print_docend() 449void cgit_print_docend()
445{ 450{