all repos — cgit @ 4c9916043d6aabb8278e0d78f5fa71a59f82889d

a hyperfast web frontend for git written in c 

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>
Lars Hjemli hjemli@gmail.com
Tue, 29 Apr 2008 00:55:34 +0200
commit

4c9916043d6aabb8278e0d78f5fa71a59f82889d

parent

8062817885495b07cf70304c484e8f18c78ab2b5

3 files changed, 8 insertions(+), 1 deletions(-)

jump to
M cgit.c → cgit.c 
@@ -19,6 +19,8 @@ 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"))

@@ -159,6 +161,7 @@ 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;
M cgit.h → cgit.h 
@@ -132,6 +132,7 @@ char *module_link;
 	char *repo_group;
 	char *robots;
 	char *root_title;
+	char *root_desc;
 	char *script_name;
 	char *virtual_root;
 	int cache_dynamic_ttl;
M ui-shared.c → ui-shared.c 
@@ -510,7 +510,10 @@ 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");