author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 21:00:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 21:00:25 (UTC) |
commit | 31665579c2779669c0cc56b8eb63f162b7e165df (patch) (side-by-side diff) | |
tree | b1d7ed4cd04699d3f978950e09c1218944926175 /ui-shared.c | |
parent | 372b4041bd117cf073082559e1f0160d75f57374 (diff) | |
parent | eb14609dc46461728a065c0a243b338fc32fd762 (diff) | |
download | cgit-31665579c2779669c0cc56b8eb63f162b7e165df.zip cgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar.gz cgit-31665579c2779669c0cc56b8eb63f162b7e165df.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | ui-shared.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 95dfeb4..fba1ba6 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -566,57 +566,62 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) if (ctx.qry.path) url = fmt("%s/%s", url, ctx.qry.path); html_hidden("url", url); } if (incl_head && ctx.qry.head && ctx.repo->defbranch && strcmp(ctx.qry.head, ctx.repo->defbranch)) html_hidden("h", ctx.qry.head); if (ctx.qry.sha1) html_hidden("id", ctx.qry.sha1); if (ctx.qry.sha2) html_hidden("id2", ctx.qry.sha2); if (ctx.qry.showmsg) html_hidden("showmsg", "1"); if (incl_search) { if (ctx.qry.grep) html_hidden("qt", ctx.qry.grep); if (ctx.qry.search) html_hidden("q", ctx.qry.search); } } +const char *fallback_cmd = "repolist"; + char *hc(struct cgit_cmd *cmd, const char *page) { - return (strcmp(cmd->name, page) ? NULL : "active"); + return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); } void cgit_print_pageheader(struct cgit_context *ctx) { struct cgit_cmd *cmd = cgit_get_cmd(ctx); + if (!cmd && ctx->repo) + fallback_cmd = "summary"; + html("<table id='header'>\n"); html("<tr>\n"); html("<td class='logo' rowspan='2'><a href='"); if (ctx->cfg.logo_link) html_attr(ctx->cfg.logo_link); else html_attr(cgit_rooturl()); html("'><img src='"); html_attr(ctx->cfg.logo); html("' alt='cgit logo'/></a></td>\n"); html("<td class='main'>"); if (ctx->repo) { cgit_index_link("index", NULL, NULL, NULL, 0); html(" : "); cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); html("</td><td class='form'>"); html("<form method='get' action=''>\n"); add_hidden_formfields(0, 1, ctx->qry.page); html("<select name='h' onchange='this.form.submit();'>\n"); for_each_branch_ref(print_branch_option, ctx->qry.head); html("</select> "); html("<input type='submit' name='' value='switch'/>"); html("</form>"); |