diff options
| author |  Lars Hjemli <hjemli@gmail.com> | 2009-07-25 19:29:22 (JST) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 19:29:22 (JST) |
| commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) | |
| tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /ui-shared.c | |
| parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
| parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
| download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz | |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
Diffstat (limited to 'ui-shared.c')
| -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 | |||
| @@ -469,6 +469,9 @@ 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) |
| @@ -492,6 +495,9 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
| 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"); |
| @@ -537,6 +543,9 @@ void cgit_print_docend() | |||
| 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 | ||
| @@ -624,13 +633,8 @@ char *hc(struct cgit_cmd *cmd, const char *page) | |||
| 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='"); |
| @@ -671,6 +675,18 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
| 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) { |