author | Lars Hjemli <hjemli@gmail.com> | 2008-04-12 17:59:41 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-12 18:01:41 (UTC) |
commit | 7c0d2d9fbd3a29d295c8067f7798507853759eae (patch) (unidiff) | |
tree | 0222feabc277488cb052b74be449b42a88ae42f4 | |
parent | 89aa3c0d0a4c6d9885272602005975b763ea1604 (diff) | |
download | cgit-7c0d2d9fbd3a29d295c8067f7798507853759eae.zip cgit-7c0d2d9fbd3a29d295c8067f7798507853759eae.tar.gz cgit-7c0d2d9fbd3a29d295c8067f7798507853759eae.tar.bz2 |
Add fixed link to index page from repo header
This makes it easier to get back to the index page, and also re-enables
the usage of logo-link in cgitrc.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-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 | |||
@@ -465,40 +465,46 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
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); |