author | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 22:55:34 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-28 22:55:34 (UTC) |
commit | 4c9916043d6aabb8278e0d78f5fa71a59f82889d (patch) (unidiff) | |
tree | 02259d3ef9c31379c2733d1944412a9015e2f311 /cgit.c | |
parent | 8062817885495b07cf70304c484e8f18c78ab2b5 (diff) | |
download | cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.zip cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar.gz cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar.bz2 |
Re-enable 'index-info' and add support for 'root-desc' in cgitrc
The 'index-info' option got lost when the layout was converted from
sidebar to old-fashioned header (noticed by Harley Laue, thanks!), and
this commit re-enables it.
But there is now also an alternative in the 'root-desc' option; where
'index-info' specifies a file to include, 'root-desc' specifies the text
literally. This might be nicer for the one-liner descriptions which these
options typically provides.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -14,16 +14,18 @@ | |||
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | 15 | ||
16 | const char *cgit_version = CGIT_VERSION; | 16 | const char *cgit_version = CGIT_VERSION; |
17 | 17 | ||
18 | void config_cb(const char *name, const char *value) | 18 | void config_cb(const char *name, const char *value) |
19 | { | 19 | { |
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")) | ||
23 | ctx.cfg.root_desc = xstrdup(value); | ||
22 | else if (!strcmp(name, "css")) | 24 | else if (!strcmp(name, "css")) |
23 | ctx.cfg.css = xstrdup(value); | 25 | ctx.cfg.css = xstrdup(value); |
24 | else if (!strcmp(name, "logo")) | 26 | else if (!strcmp(name, "logo")) |
25 | ctx.cfg.logo = xstrdup(value); | 27 | ctx.cfg.logo = xstrdup(value); |
26 | else if (!strcmp(name, "index-header")) | 28 | else if (!strcmp(name, "index-header")) |
27 | ctx.cfg.index_header = xstrdup(value); | 29 | ctx.cfg.index_header = xstrdup(value); |
28 | else if (!strcmp(name, "index-info")) | 30 | else if (!strcmp(name, "index-info")) |
29 | ctx.cfg.index_info = xstrdup(value); | 31 | ctx.cfg.index_info = xstrdup(value); |
@@ -154,16 +156,17 @@ static void prepare_context(struct cgit_context *ctx) | |||
154 | ctx->cfg.max_commit_count = 50; | 156 | ctx->cfg.max_commit_count = 50; |
155 | ctx->cfg.max_lock_attempts = 5; | 157 | ctx->cfg.max_lock_attempts = 5; |
156 | ctx->cfg.max_msg_len = 60; | 158 | ctx->cfg.max_msg_len = 60; |
157 | ctx->cfg.max_repodesc_len = 60; | 159 | ctx->cfg.max_repodesc_len = 60; |
158 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 160 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
159 | ctx->cfg.renamelimit = -1; | 161 | ctx->cfg.renamelimit = -1; |
160 | ctx->cfg.robots = "index, nofollow"; | 162 | ctx->cfg.robots = "index, nofollow"; |
161 | ctx->cfg.root_title = "Git repository browser"; | 163 | ctx->cfg.root_title = "Git repository browser"; |
164 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | ||
162 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 165 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
163 | ctx->page.mimetype = "text/html"; | 166 | ctx->page.mimetype = "text/html"; |
164 | ctx->page.charset = PAGE_ENCODING; | 167 | ctx->page.charset = PAGE_ENCODING; |
165 | ctx->page.filename = NULL; | 168 | ctx->page.filename = NULL; |
166 | } | 169 | } |
167 | 170 | ||
168 | static int cgit_prepare_cache(struct cacheitem *item) | 171 | static int cgit_prepare_cache(struct cacheitem *item) |
169 | { | 172 | { |