diff options
| author | Lars Hjemli | 2009-01-22 23:33:56 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-02-02 08:11:29 +0100 |
| commit | 0cbb50841ac82e08e715bbff614f96c7d5ba22fa (patch) | |
| tree | 7a6a63ca69d161e4bf636c8676a8a845cad1083b | |
| parent | CGIT 0.8.2 (diff) | |
| download | cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.gz cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.zip | |
Add support for an 'embedded' option in cgitrc
When activated, cgit will neither generate http headers nor any 'framing' html elements (like <html> and <body>). Also, all page content is now wrapped in a <div id='cgit'> element to make it easier to select the correct cgit classes when embedded/themed. Suggested-by: Matt Sealey <matt@genesi-usa.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -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
| diff --git a/cgit.c b/cgit.c index 64d95f9..2aef44d 100644 --- a/cgit.c +++ b/cgit.c | |||
| @@ -71,6 +71,8 @@ void config_cb(const char *name, const char *value) | |||
| 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")) |
| diff --git a/cgit.h b/cgit.h index 5f7af51..73d7208 100644 --- a/cgit.h +++ b/cgit.h | |||
| @@ -171,6 +171,7 @@ struct cgit_config { | |||
| 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 { |
| diff --git a/ui-shared.c b/ui-shared.c index de77bbf..f18b2c7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -456,6 +456,9 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
| 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); |
| @@ -473,6 +476,9 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
| 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"); |
| @@ -515,6 +521,9 @@ void cgit_print_docend() | |||
| 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 | ||
| @@ -609,6 +618,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
| 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='"); |