-rw-r--r-- | ui-shared.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/ui-shared.c b/ui-shared.c index 7d7fff0..137e469 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -647,7 +647,5 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, | |||
647 | 647 | ||
648 | const char *fallback_cmd = "repolist"; | 648 | static const char *hc(struct cgit_context *ctx, const char *page) |
649 | |||
650 | char *hc(struct cgit_cmd *cmd, const char *page) | ||
651 | { | 649 | { |
652 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 650 | return strcmp(ctx->qry.page, page) ? NULL : "active"; |
653 | } | 651 | } |
@@ -703,7 +701,2 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
703 | { | 701 | { |
704 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
705 | |||
706 | if (!cmd && ctx->repo) | ||
707 | fallback_cmd = "summary"; | ||
708 | |||
709 | html("<div id='cgit'>"); | 702 | html("<div id='cgit'>"); |
@@ -714,16 +707,16 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
714 | if (ctx->repo) { | 707 | if (ctx->repo) { |
715 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 708 | cgit_summary_link("summary", NULL, hc(ctx, "summary"), |
716 | ctx->qry.head); | 709 | ctx->qry.head); |
717 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 710 | cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, |
718 | ctx->qry.sha1, NULL); | 711 | ctx->qry.sha1, NULL); |
719 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 712 | cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, |
720 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 713 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
721 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 714 | cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, |
722 | ctx->qry.sha1, NULL); | 715 | ctx->qry.sha1, NULL); |
723 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 716 | cgit_commit_link("commit", NULL, hc(ctx, "commit"), |
724 | ctx->qry.head, ctx->qry.sha1, 0); | 717 | ctx->qry.head, ctx->qry.sha1, 0); |
725 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 718 | cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, |
726 | ctx->qry.sha1, ctx->qry.sha2, NULL, 0); | 719 | ctx->qry.sha1, ctx->qry.sha2, NULL, 0); |
727 | if (ctx->repo->max_stats) | 720 | if (ctx->repo->max_stats) |
728 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 721 | cgit_stats_link("stats", NULL, hc(ctx, "stats"), |
729 | ctx->qry.head, NULL); | 722 | ctx->qry.head, NULL); |
@@ -731,3 +724,3 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
731 | reporevlink("about", "about", NULL, | 724 | reporevlink("about", "about", NULL, |
732 | hc(cmd, "about"), ctx->qry.head, NULL, | 725 | hc(ctx, "about"), ctx->qry.head, NULL, |
733 | NULL); | 726 | NULL); |
@@ -751,5 +744,5 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
751 | } else { | 744 | } else { |
752 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 745 | site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); |
753 | if (ctx->cfg.root_readme) | 746 | if (ctx->cfg.root_readme) |
754 | site_link("about", "about", NULL, hc(cmd, "about"), | 747 | site_link("about", "about", NULL, hc(ctx, "about"), |
755 | NULL, 0); | 748 | NULL, 0); |