summaryrefslogtreecommitdiff
path: root/ui-shared.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-04-28 22:55:34 +0000
committerLars Hjemli <hjemli@gmail.com>2008-04-28 22:55:34 +0000
commit4c9916043d6aabb8278e0d78f5fa71a59f82889d (patch)
tree02259d3ef9c31379c2733d1944412a9015e2f311 /ui-shared.c
parent8062817885495b07cf70304c484e8f18c78ab2b5 (diff)
downloadcgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar
cgit-4c9916043d6aabb8278e0d78f5fa71a59f82889d.tar.gz
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.c5
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)
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");