Merge branch 'stable'

This commit is contained in:
Lars Hjemli 2009-08-18 13:14:11 +02:00
commit 73b54f7d7e

View File

@ -630,14 +630,17 @@ static void print_header(struct cgit_context *ctx)
{ {
html("<table id='header'>\n"); html("<table id='header'>\n");
html("<tr>\n"); html("<tr>\n");
html("<td class='logo' rowspan='2'><a href='");
if (ctx->cfg.logo_link) if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
html_attr(ctx->cfg.logo_link); html("<td class='logo' rowspan='2'><a href='");
else if (ctx->cfg.logo_link)
html_attr(cgit_rooturl()); html_attr(ctx->cfg.logo_link);
html("'><img src='"); else
html_attr(ctx->cfg.logo); html_attr(cgit_rooturl());
html("' alt='cgit logo'/></a></td>\n"); html("'><img src='");
html_attr(ctx->cfg.logo);
html("' alt='cgit logo'/></a></td>\n");
}
html("<td class='main'>"); html("<td class='main'>");
if (ctx->repo) { if (ctx->repo) {