From 80550bbe028b551550395653d32a0ba50db540ef Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 11 Aug 2009 10:12:35 +0200 Subject: 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 Signed-off-by: Lars Hjemli --- ui-shared.c | 17 ++++++++++++----- 1 file 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 @@ -481,8 +481,11 @@ void cgit_print_http_headers(struct cgit_context *ctx) void cgit_print_docstart(struct cgit_context *ctx) { - if (ctx->cfg.embedded) + if (ctx->cfg.embedded) { + if (ctx->cfg.header) + html_include(ctx->cfg.header); return; + } char *host = cgit_hosturl(); html(cgit_doctype); @@ -520,7 +523,13 @@ void cgit_print_docstart(struct cgit_context *ctx) void cgit_print_docend() { - html(""); + html(" \n"); + if (ctx.cfg.embedded) { + html(" \n"); + if (ctx.cfg.footer) + html_include(ctx.cfg.footer); + return; + } if (ctx.cfg.footer) html_include(ctx.cfg.footer); else { @@ -529,9 +538,7 @@ void cgit_print_docend() cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); html("\n"); } - html(""); - if (ctx.cfg.embedded) - return; + html(" \n"); html("\n\n"); } -- cgit v1.2.3-57-g22cb