-rw-r--r-- | ui-shared.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ui-shared.c b/ui-shared.c index 7287956..03d147f 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -449,72 +449,78 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
449 | url = fmt("%s/%s", url, ctx.qry.path); | 449 | url = fmt("%s/%s", url, ctx.qry.path); |
450 | html_hidden("url", url); | 450 | html_hidden("url", url); |
451 | } | 451 | } |
452 | 452 | ||
453 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) | 453 | if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) |
454 | html_hidden("h", ctx.qry.head); | 454 | html_hidden("h", ctx.qry.head); |
455 | 455 | ||
456 | if (ctx.qry.sha1) | 456 | if (ctx.qry.sha1) |
457 | html_hidden("id", ctx.qry.sha1); | 457 | html_hidden("id", ctx.qry.sha1); |
458 | if (ctx.qry.sha2) | 458 | if (ctx.qry.sha2) |
459 | html_hidden("id2", ctx.qry.sha2); | 459 | html_hidden("id2", ctx.qry.sha2); |
460 | 460 | ||
461 | if (incl_search) { | 461 | if (incl_search) { |
462 | if (ctx.qry.grep) | 462 | if (ctx.qry.grep) |
463 | html_hidden("qt", ctx.qry.grep); | 463 | html_hidden("qt", ctx.qry.grep); |
464 | if (ctx.qry.search) | 464 | if (ctx.qry.search) |
465 | html_hidden("q", ctx.qry.search); | 465 | html_hidden("q", ctx.qry.search); |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | char *hc(struct cgit_cmd *cmd, const char *page) | 469 | char *hc(struct cgit_cmd *cmd, const char *page) |
470 | { | 470 | { |
471 | return (strcmp(cmd->name, page) ? NULL : "active"); | 471 | return (strcmp(cmd->name, page) ? NULL : "active"); |
472 | } | 472 | } |
473 | 473 | ||
474 | void cgit_print_pageheader(struct cgit_context *ctx) | 474 | void cgit_print_pageheader(struct cgit_context *ctx) |
475 | { | 475 | { |
476 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 476 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
477 | 477 | ||
478 | html("<table id='header'>\n"); | 478 | html("<table id='header'>\n"); |
479 | html("<tr>\n"); | 479 | html("<tr>\n"); |
480 | html("<td class='logo' rowspan='2'><a href='"); | 480 | html("<td class='logo' rowspan='2'><a href='"); |
481 | html_attr(cgit_rooturl()); | 481 | if (ctx->cfg.logo_link) |
482 | html_attr(ctx->cfg.logo_link); | ||
483 | else | ||
484 | html_attr(cgit_rooturl()); | ||
482 | html("'><img src='"); | 485 | html("'><img src='"); |
483 | html_attr(ctx->cfg.logo); | 486 | html_attr(ctx->cfg.logo); |
484 | html("'/></a></td>\n"); | 487 | html("'/></a></td>\n"); |
485 | html("<td class='main'>"); | 488 | html("<td class='main'>"); |
486 | if (ctx->repo) | 489 | if (ctx->repo) { |
490 | html("<a href='"); | ||
491 | html_attr(cgit_rooturl()); | ||
492 | html("'>index</a> / "); | ||
487 | html_txt(ctx->repo->name); | 493 | html_txt(ctx->repo->name); |
488 | else | 494 | } else |
489 | html_txt(ctx->cfg.root_title); | 495 | html_txt(ctx->cfg.root_title); |
490 | html("</td></tr>\n"); | 496 | html("</td></tr>\n"); |
491 | html("<tr><td class='sub'>"); | 497 | html("<tr><td class='sub'>"); |
492 | if (ctx->repo) | 498 | if (ctx->repo) |
493 | html_txt(ctx->repo->desc); | 499 | html_txt(ctx->repo->desc); |
494 | else | 500 | else |
495 | html_txt(ctx->cfg.index_info); | 501 | html_txt(ctx->cfg.index_info); |
496 | html("</td></tr>\n"); | 502 | html("</td></tr>\n"); |
497 | html("</table>\n"); | 503 | html("</table>\n"); |
498 | 504 | ||
499 | html("<table class='tabs'><tr><td>\n"); | 505 | html("<table class='tabs'><tr><td>\n"); |
500 | if (ctx->repo) { | 506 | if (ctx->repo) { |
501 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), | 507 | reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), |
502 | ctx->qry.head, NULL, NULL); | 508 | ctx->qry.head, NULL, NULL); |
503 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 509 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
504 | ctx->qry.sha1, NULL); | 510 | ctx->qry.sha1, NULL); |
505 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 511 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
506 | NULL, NULL, 0, NULL, NULL); | 512 | NULL, NULL, 0, NULL, NULL); |
507 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 513 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
508 | ctx->qry.sha1, NULL); | 514 | ctx->qry.sha1, NULL); |
509 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 515 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
510 | ctx->qry.head, ctx->qry.sha1); | 516 | ctx->qry.head, ctx->qry.sha1); |
511 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 517 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
512 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 518 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
513 | cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head, | 519 | cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head, |
514 | ctx->qry.sha1); | 520 | ctx->qry.sha1); |
515 | } else { | 521 | } else { |
516 | html("<a class='active' href='"); | 522 | html("<a class='active' href='"); |
517 | html_attr(cgit_rooturl()); | 523 | html_attr(cgit_rooturl()); |
518 | html("'>index</a>\n"); | 524 | html("'>index</a>\n"); |
519 | } | 525 | } |
520 | html("</td></tr></table>\n"); | 526 | html("</td></tr></table>\n"); |