| 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) (side-by-side diff) | |
| tree | 02259d3ef9c31379c2733d1944412a9015e2f311 | |
| 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 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | ui-shared.c | 5 |
3 files changed, 8 insertions, 1 deletions
@@ -16,12 +16,14 @@ const char *cgit_version = CGIT_VERSION; void config_cb(const char *name, const char *value) { if (!strcmp(name, "root-title")) ctx.cfg.root_title = xstrdup(value); + else if (!strcmp(name, "root-desc")) + ctx.cfg.root_desc = xstrdup(value); else if (!strcmp(name, "css")) ctx.cfg.css = xstrdup(value); else if (!strcmp(name, "logo")) ctx.cfg.logo = xstrdup(value); else if (!strcmp(name, "index-header")) ctx.cfg.index_header = xstrdup(value); @@ -156,12 +158,13 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.max_msg_len = 60; ctx->cfg.max_repodesc_len = 60; ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; ctx->cfg.renamelimit = -1; ctx->cfg.robots = "index, nofollow"; ctx->cfg.root_title = "Git repository browser"; + ctx->cfg.root_desc = "a fast webinterface for the git dscm"; ctx->cfg.script_name = CGIT_SCRIPT_NAME; ctx->page.mimetype = "text/html"; ctx->page.charset = PAGE_ENCODING; ctx->page.filename = NULL; } @@ -129,12 +129,13 @@ struct cgit_config { char *logo; char *logo_link; char *module_link; char *repo_group; char *robots; char *root_title; + char *root_desc; char *script_name; char *virtual_root; int cache_dynamic_ttl; int cache_max_create_time; int cache_repo_ttl; int cache_root_ttl; diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..83758f7 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -507,13 +507,16 @@ void cgit_print_pageheader(struct cgit_context *ctx) html("<tr><td class='sub'"); if (ctx->repo) { html(" colspan='2'>"); html_txt(ctx->repo->desc); } else { html(">"); - html_txt("a fast webinterface for the git dscm"); + if (ctx->cfg.root_desc) + html_txt(ctx->cfg.root_desc); + else if (ctx->cfg.index_info) + html_include(ctx->cfg.index_info); } html("</td></tr></table>\n"); html("<table class='tabs'><tr><td>\n"); if (ctx->repo) { reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |