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 | |
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
@@ -21,2 +21,4 @@ void config_cb(const char *name, const char *value) | |||
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")) |
@@ -161,2 +163,3 @@ static void prepare_context(struct cgit_context *ctx) | |||
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; |
@@ -134,2 +134,3 @@ struct cgit_config { | |||
134 | char *root_title; | 134 | char *root_title; |
135 | char *root_desc; | ||
135 | char *script_name; | 136 | char *script_name; |
diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..83758f7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -512,3 +512,6 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
512 | html(">"); | 512 | html(">"); |
513 | html_txt("a fast webinterface for the git dscm"); | 513 | if (ctx->cfg.root_desc) |
514 | html_txt(ctx->cfg.root_desc); | ||
515 | else if (ctx->cfg.index_info) | ||
516 | html_include(ctx->cfg.index_info); | ||
514 | } | 517 | } |