author | Lars Hjemli <hjemli@gmail.com> | 2009-08-11 08:12:35 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-11 08:12:35 (UTC) |
commit | 80550bbe028b551550395653d32a0ba50db540ef (patch) (unidiff) | |
tree | 9dbbe6dbdbb705a55ace4524cca1435290ce4d2a | |
parent | 8b2252b0b61617e9de9d9e9ba743881ad62523af (diff) | |
download | cgit-80550bbe028b551550395653d32a0ba50db540ef.zip cgit-80550bbe028b551550395653d32a0ba50db540ef.tar.gz cgit-80550bbe028b551550395653d32a0ba50db540ef.tar.bz2 |
ui-shared: add support for header/footer options when embedded=1
When embedded=1, cgit used to ignore the header and footer options.
But honoring these options when embedded=1 makes it possible to "frame"
the html fragment generated by cgit with any kind of static content,
i.e. it should become easier to integrate cgit with site-specfic
layouts.
Original-patch-by: Mark Constable <markc@renta.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/ui-shared.c b/ui-shared.c index 4175bd8..cf06511 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -480,10 +480,13 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
480 | } | 480 | } |
481 | 481 | ||
482 | void cgit_print_docstart(struct cgit_context *ctx) | 482 | void cgit_print_docstart(struct cgit_context *ctx) |
483 | { | 483 | { |
484 | if (ctx->cfg.embedded) | 484 | if (ctx->cfg.embedded) { |
485 | if (ctx->cfg.header) | ||
486 | html_include(ctx->cfg.header); | ||
485 | return; | 487 | return; |
488 | } | ||
486 | 489 | ||
487 | char *host = cgit_hosturl(); | 490 | char *host = cgit_hosturl(); |
488 | html(cgit_doctype); | 491 | html(cgit_doctype); |
489 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
@@ -519,20 +522,24 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
519 | } | 522 | } |
520 | 523 | ||
521 | void cgit_print_docend() | 524 | void cgit_print_docend() |
522 | { | 525 | { |
523 | html("</div>"); | 526 | html("</div> <!-- class=content -->\n"); |
527 | if (ctx.cfg.embedded) { | ||
528 | html("</div> <!-- id=cgit -->\n"); | ||
529 | if (ctx.cfg.footer) | ||
530 | html_include(ctx.cfg.footer); | ||
531 | return; | ||
532 | } | ||
524 | if (ctx.cfg.footer) | 533 | if (ctx.cfg.footer) |
525 | html_include(ctx.cfg.footer); | 534 | html_include(ctx.cfg.footer); |
526 | else { | 535 | else { |
527 | htmlf("<div class='footer'>generated by cgit %s at ", | 536 | htmlf("<div class='footer'>generated by cgit %s at ", |
528 | cgit_version); | 537 | cgit_version); |
529 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
530 | html("</div>\n"); | 539 | html("</div>\n"); |
531 | } | 540 | } |
532 | html("</div>"); | 541 | html("</div> <!-- id=cgit -->\n"); |
533 | if (ctx.cfg.embedded) | ||
534 | return; | ||
535 | html("</body>\n</html>\n"); | 542 | html("</body>\n</html>\n"); |
536 | } | 543 | } |
537 | 544 | ||
538 | int print_branch_option(const char *refname, const unsigned char *sha1, | 545 | int print_branch_option(const char *refname, const unsigned char *sha1, |