-rw-r--r-- | ui-shared.c | 19 |
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 | |||
@@ -598,40 +598,43 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
598 | const char *fallback_cmd = "repolist"; | 598 | const char *fallback_cmd = "repolist"; |
599 | 599 | ||
600 | char *hc(struct cgit_cmd *cmd, const char *page) | 600 | char *hc(struct cgit_cmd *cmd, const char *page) |
601 | { | 601 | { |
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 | ||
605 | void cgit_print_pageheader(struct cgit_context *ctx) | 605 | void 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> "); |
634 | html("<input type='submit' name='' value='switch'/>"); | 637 | html("<input type='submit' name='' value='switch'/>"); |
635 | html("</form>"); | 638 | html("</form>"); |
636 | } else | 639 | } else |
637 | html_txt(ctx->cfg.root_title); | 640 | html_txt(ctx->cfg.root_title); |