summaryrefslogtreecommitdiffabout
authorMatthew Metnetsky <mimetnet@vidu.us>2009-06-30 01:27:51 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-18 11:13:51 (UTC)
commit6421dc38db02eff8d3ada93e87a2f7e5292af131 (patch) (unidiff)
tree90828ea6f44b6d59f29b2e589a5552ba50a0aa5d
parent435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
downloadcgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.zip
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.gz
cgit-6421dc38db02eff8d3ada93e87a2f7e5292af131.tar.bz2
ui-shared: don't print header <img/> if there isn't a logo defined
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..40060ba 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -602,32 +602,35 @@ char *hc(struct cgit_cmd *cmd, const char *page)
602 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); 602 return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
603} 603}
604 604
605void cgit_print_pageheader(struct cgit_context *ctx) 605void cgit_print_pageheader(struct cgit_context *ctx)
606{ 606{
607 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 607 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
608 608
609 if (!cmd && ctx->repo) 609 if (!cmd && ctx->repo)
610 fallback_cmd = "summary"; 610 fallback_cmd = "summary";
611 611
612 html("<table id='header'>\n"); 612 html("<table id='header'>\n");
613 html("<tr>\n"); 613 html("<tr>\n");
614 html("<td class='logo' rowspan='2'><a href='"); 614
615 if (ctx->cfg.logo_link) 615 if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
616 html_attr(ctx->cfg.logo_link); 616 html("<td class='logo' rowspan='2'><a href='");
617 else 617 if (ctx->cfg.logo_link)
618 html_attr(cgit_rooturl()); 618 html_attr(ctx->cfg.logo_link);
619 html("'><img src='"); 619 else
620 html_attr(ctx->cfg.logo); 620 html_attr(cgit_rooturl());
621 html("' alt='cgit logo'/></a></td>\n"); 621 html("'><img src='");
622 html_attr(ctx->cfg.logo);
623 html("' alt='cgit logo'/></a></td>\n");
624 }
622 625
623 html("<td class='main'>"); 626 html("<td class='main'>");
624 if (ctx->repo) { 627 if (ctx->repo) {
625 cgit_index_link("index", NULL, NULL, NULL, 0); 628 cgit_index_link("index", NULL, NULL, NULL, 0);
626 html(" : "); 629 html(" : ");
627 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); 630 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
628 html("</td><td class='form'>"); 631 html("</td><td class='form'>");
629 html("<form method='get' action=''>\n"); 632 html("<form method='get' action=''>\n");
630 cgit_add_hidden_formfields(0, 1, ctx->qry.page); 633 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
631 html("<select name='h' onchange='this.form.submit();'>\n"); 634 html("<select name='h' onchange='this.form.submit();'>\n");
632 for_each_branch_ref(print_branch_option, ctx->qry.head); 635 for_each_branch_ref(print_branch_option, ctx->qry.head);
633 html("</select> "); 636 html("</select> ");