-rw-r--r-- | ui-shared.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..f18b2c7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -453,12 +453,15 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
453 | htmlf("<span class='age-years'>%.0f years</span>", | 453 | htmlf("<span class='age-years'>%.0f years</span>", |
454 | secs * 1.0 / TM_YEAR); | 454 | secs * 1.0 / TM_YEAR); |
455 | } | 455 | } |
456 | 456 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void cgit_print_http_headers(struct cgit_context *ctx) |
458 | { | 458 | { |
459 | if (ctx->cfg.embedded) | ||
460 | return; | ||
461 | |||
459 | if (ctx->page.mimetype && ctx->page.charset) | 462 | if (ctx->page.mimetype && ctx->page.charset) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 463 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 464 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 465 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 466 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 467 | if (ctx->page.size) |
@@ -470,12 +473,15 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 473 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
471 | html("\n"); | 474 | html("\n"); |
472 | } | 475 | } |
473 | 476 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 477 | void cgit_print_docstart(struct cgit_context *ctx) |
475 | { | 478 | { |
479 | if (ctx->cfg.embedded) | ||
480 | return; | ||
481 | |||
476 | char *host = cgit_hosturl(); | 482 | char *host = cgit_hosturl(); |
477 | html(cgit_doctype); | 483 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 484 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 485 | html("<head>\n"); |
480 | html("<title>"); | 486 | html("<title>"); |
481 | html_txt(ctx->page.title); | 487 | html_txt(ctx->page.title); |
@@ -512,12 +518,15 @@ void cgit_print_docend() | |||
512 | else { | 518 | else { |
513 | htmlf("<div class='footer'>generated by cgit %s at ", | 519 | htmlf("<div class='footer'>generated by cgit %s at ", |
514 | cgit_version); | 520 | cgit_version); |
515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 521 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
516 | html("</div>\n"); | 522 | html("</div>\n"); |
517 | } | 523 | } |
524 | html("</div>"); | ||
525 | if (ctx.cfg.embedded) | ||
526 | return; | ||
518 | html("</body>\n</html>\n"); | 527 | html("</body>\n</html>\n"); |
519 | } | 528 | } |
520 | 529 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 530 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 531 | int flags, void *cb_data) |
523 | { | 532 | { |
@@ -606,12 +615,13 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
606 | { | 615 | { |
607 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 616 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
608 | 617 | ||
609 | if (!cmd && ctx->repo) | 618 | if (!cmd && ctx->repo) |
610 | fallback_cmd = "summary"; | 619 | fallback_cmd = "summary"; |
611 | 620 | ||
621 | html("<div id='cgit'>"); | ||
612 | html("<table id='header'>\n"); | 622 | html("<table id='header'>\n"); |
613 | html("<tr>\n"); | 623 | html("<tr>\n"); |
614 | html("<td class='logo' rowspan='2'><a href='"); | 624 | html("<td class='logo' rowspan='2'><a href='"); |
615 | if (ctx->cfg.logo_link) | 625 | if (ctx->cfg.logo_link) |
616 | html_attr(ctx->cfg.logo_link); | 626 | html_attr(ctx->cfg.logo_link); |
617 | else | 627 | else |