diff options
author | Lars Hjemli | 2008-04-29 00:55:34 +0200 |
---|---|---|
committer | Lars Hjemli | 2008-04-29 00:55:34 +0200 |
commit | 4c9916043d6aabb8278e0d78f5fa71a59f82889d (patch) | |
tree | 02259d3ef9c31379c2733d1944412a9015e2f311 /ui-shared.c | |
parent | 8062817885495b07cf70304c484e8f18c78ab2b5 (diff) | |
download | cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar.gz cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar.bz2 cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.zip |
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>
Diffstat (limited to 'ui-shared.c')
-rw-r--r-- | ui-shared.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a804c2..83758f7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -510,7 +510,10 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
510 | html_txt(ctx->repo->desc); | 510 | html_txt(ctx->repo->desc); |
511 | } else { | 511 | } else { |
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 | } |
515 | html("</td></tr></table>\n"); | 518 | html("</td></tr></table>\n"); |
516 | 519 | ||