Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c

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
@@ -471,2 +471,5 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 
+        if (ctx->cfg.embedded)
+                return;
+
         if (ctx->page.status)
@@ -494,2 +497,5 @@ void cgit_print_docstart(struct cgit_context *ctx)
 {
+        if (ctx->cfg.embedded)
+                return;
+
         char *host = cgit_hosturl();
@@ -539,2 +545,5 @@ void cgit_print_docend()
         }
+        html("</div>");
+        if (ctx.cfg.embedded)
+                return;
         html("</body>\n</html>\n");
@@ -626,9 +635,4 @@ char *hc(struct cgit_cmd *cmd, const char *page)
 
-void cgit_print_pageheader(struct cgit_context *ctx)
+static void print_header(struct cgit_context *ctx)
 {
-        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
-
-        if (!cmd && ctx->repo)
-                fallback_cmd = "summary";
-
         html("<table id='header'>\n");
@@ -673,2 +677,14 @@ void cgit_print_pageheader(struct cgit_context *ctx)
         html("</td></tr></table>\n");
+}
+
+void cgit_print_pageheader(struct cgit_context *ctx)
+{
+        struct cgit_cmd *cmd = cgit_get_cmd(ctx);
+
+        if (!cmd && ctx->repo)
+                fallback_cmd = "summary";
+
+        html("<div id='cgit'>");
+        if (!ctx->cfg.noheader)
+                print_header(ctx);