-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 10 |
3 files changed, 13 insertions, 0 deletions
@@ -70,8 +70,10 @@ void config_cb(const char *name, const char *value) | |||
70 | else if (!strcmp(name, "cache-static-ttl")) | 70 | else if (!strcmp(name, "cache-static-ttl")) |
71 | ctx.cfg.cache_static_ttl = atoi(value); | 71 | ctx.cfg.cache_static_ttl = atoi(value); |
72 | else if (!strcmp(name, "cache-dynamic-ttl")) | 72 | else if (!strcmp(name, "cache-dynamic-ttl")) |
73 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 73 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
74 | else if (!strcmp(name, "embedded")) | ||
75 | ctx.cfg.embedded = atoi(value); | ||
74 | else if (!strcmp(name, "max-message-length")) | 76 | else if (!strcmp(name, "max-message-length")) |
75 | ctx.cfg.max_msg_len = atoi(value); | 77 | ctx.cfg.max_msg_len = atoi(value); |
76 | else if (!strcmp(name, "max-repodesc-length")) | 78 | else if (!strcmp(name, "max-repodesc-length")) |
77 | ctx.cfg.max_repodesc_len = atoi(value); | 79 | ctx.cfg.max_repodesc_len = atoi(value); |
@@ -170,8 +170,9 @@ struct cgit_config { | |||
170 | int snapshots; | 170 | int snapshots; |
171 | int summary_branches; | 171 | int summary_branches; |
172 | int summary_log; | 172 | int summary_log; |
173 | int summary_tags; | 173 | int summary_tags; |
174 | int embedded; | ||
174 | }; | 175 | }; |
175 | 176 | ||
176 | struct cgit_page { | 177 | struct cgit_page { |
177 | time_t modified; | 178 | time_t modified; |
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..f18b2c7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -455,8 +455,11 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
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) |
@@ -472,8 +475,11 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
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"); |
@@ -514,8 +520,11 @@ void cgit_print_docend() | |||
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, |
@@ -608,8 +617,9 @@ void cgit_print_pageheader(struct cgit_context *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) |