-rw-r--r-- | ui-shared.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/ui-shared.c b/ui-shared.c index 66d5b82..015c52b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -466,12 +466,15 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
466 | } | 466 | } |
467 | 467 | ||
468 | void cgit_print_http_headers(struct cgit_context *ctx) | 468 | void cgit_print_http_headers(struct cgit_context *ctx) |
469 | { | 469 | { |
470 | const char *method = getenv("REQUEST_METHOD"); | 470 | const char *method = getenv("REQUEST_METHOD"); |
471 | 471 | ||
472 | if (ctx->cfg.embedded) | ||
473 | return; | ||
474 | |||
472 | if (ctx->page.status) | 475 | if (ctx->page.status) |
473 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 476 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
474 | if (ctx->page.mimetype && ctx->page.charset) | 477 | if (ctx->page.mimetype && ctx->page.charset) |
475 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 478 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
476 | ctx->page.charset); | 479 | ctx->page.charset); |
477 | else if (ctx->page.mimetype) | 480 | else if (ctx->page.mimetype) |
@@ -489,12 +492,15 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
489 | if (method && !strcmp(method, "HEAD")) | 492 | if (method && !strcmp(method, "HEAD")) |
490 | exit(0); | 493 | exit(0); |
491 | } | 494 | } |
492 | 495 | ||
493 | void cgit_print_docstart(struct cgit_context *ctx) | 496 | void cgit_print_docstart(struct cgit_context *ctx) |
494 | { | 497 | { |
498 | if (ctx->cfg.embedded) | ||
499 | return; | ||
500 | |||
495 | char *host = cgit_hosturl(); | 501 | char *host = cgit_hosturl(); |
496 | html(cgit_doctype); | 502 | html(cgit_doctype); |
497 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 503 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
498 | html("<head>\n"); | 504 | html("<head>\n"); |
499 | html("<title>"); | 505 | html("<title>"); |
500 | html_txt(ctx->page.title); | 506 | html_txt(ctx->page.title); |
@@ -534,12 +540,15 @@ void cgit_print_docend() | |||
534 | else { | 540 | else { |
535 | htmlf("<div class='footer'>generated by cgit %s at ", | 541 | htmlf("<div class='footer'>generated by cgit %s at ", |
536 | cgit_version); | 542 | cgit_version); |
537 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 543 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
538 | html("</div>\n"); | 544 | html("</div>\n"); |
539 | } | 545 | } |
546 | html("</div>"); | ||
547 | if (ctx.cfg.embedded) | ||
548 | return; | ||
540 | html("</body>\n</html>\n"); | 549 | html("</body>\n</html>\n"); |
541 | } | 550 | } |
542 | 551 | ||
543 | int print_branch_option(const char *refname, const unsigned char *sha1, | 552 | int print_branch_option(const char *refname, const unsigned char *sha1, |
544 | int flags, void *cb_data) | 553 | int flags, void *cb_data) |
545 | { | 554 | { |
@@ -621,19 +630,14 @@ const char *fallback_cmd = "repolist"; | |||
621 | 630 | ||
622 | char *hc(struct cgit_cmd *cmd, const char *page) | 631 | char *hc(struct cgit_cmd *cmd, const char *page) |
623 | { | 632 | { |
624 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 633 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
625 | } | 634 | } |
626 | 635 | ||
627 | void cgit_print_pageheader(struct cgit_context *ctx) | 636 | static void print_header(struct cgit_context *ctx) |
628 | { | 637 | { |
629 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
630 | |||
631 | if (!cmd && ctx->repo) | ||
632 | fallback_cmd = "summary"; | ||
633 | |||
634 | html("<table id='header'>\n"); | 638 | html("<table id='header'>\n"); |
635 | html("<tr>\n"); | 639 | html("<tr>\n"); |
636 | html("<td class='logo' rowspan='2'><a href='"); | 640 | html("<td class='logo' rowspan='2'><a href='"); |
637 | if (ctx->cfg.logo_link) | 641 | if (ctx->cfg.logo_link) |
638 | html_attr(ctx->cfg.logo_link); | 642 | html_attr(ctx->cfg.logo_link); |
639 | else | 643 | else |
@@ -668,12 +672,24 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
668 | if (ctx->cfg.root_desc) | 672 | if (ctx->cfg.root_desc) |
669 | html_txt(ctx->cfg.root_desc); | 673 | html_txt(ctx->cfg.root_desc); |
670 | else if (ctx->cfg.index_info) | 674 | else if (ctx->cfg.index_info) |
671 | html_include(ctx->cfg.index_info); | 675 | html_include(ctx->cfg.index_info); |
672 | } | 676 | } |
673 | html("</td></tr></table>\n"); | 677 | html("</td></tr></table>\n"); |
678 | } | ||
679 | |||
680 | void cgit_print_pageheader(struct cgit_context *ctx) | ||
681 | { | ||
682 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | ||
683 | |||
684 | if (!cmd && ctx->repo) | ||
685 | fallback_cmd = "summary"; | ||
686 | |||
687 | html("<div id='cgit'>"); | ||
688 | if (!ctx->cfg.noheader) | ||
689 | print_header(ctx); | ||
674 | 690 | ||
675 | html("<table class='tabs'><tr><td>\n"); | 691 | html("<table class='tabs'><tr><td>\n"); |
676 | if (ctx->repo) { | 692 | if (ctx->repo) { |
677 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 693 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
678 | ctx->qry.head); | 694 | ctx->qry.head); |
679 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 695 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |