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>
16 years ago · 0cbb50841a
parent 8cc0287123
commit 0cbb50841a
3 changed files with 13 additions and 0 deletions
--- a/cgit.c
+++ b/cgit.c
@ -71,6 +71,8 @@ void config_cb(const char *name, const char *value)
 		ctx.cfg.cache_static_ttl = atoi(value);
 	else if (!strcmp(name, "cache-dynamic-ttl"))
 		ctx.cfg.cache_dynamic_ttl = atoi(value);
+	else if (!strcmp(name, "embedded"))
+		ctx.cfg.embedded = atoi(value);
 	else if (!strcmp(name, "max-message-length"))
 		ctx.cfg.max_msg_len = atoi(value);
 	else if (!strcmp(name, "max-repodesc-length"))
--- a/cgit.h
+++ b/cgit.h
@ -171,6 +171,7 @@ struct cgit_config {
 	int summary_branches;
 	int summary_log;
 	int summary_tags;
+	int embedded;
 };

 struct cgit_page {
--- 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)

 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+	if (ctx->cfg.embedded)
+		return;
+
 	if (ctx->page.mimetype && ctx->page.charset)
 		htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
 		      ctx->page.charset);
@ -473,6 +476,9 @@ void cgit_print_http_headers(struct cgit_context *ctx)

 void cgit_print_docstart(struct cgit_context *ctx)
 {
+	if (ctx->cfg.embedded)
+		return;
+
 	char *host = cgit_hosturl();
 	html(cgit_doctype);
 	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
@ -515,6 +521,9 @@ void cgit_print_docend()
 		cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
 		html("</div>\n");
 	}
+	html("</div>");
+	if (ctx.cfg.embedded)
+		return;
 	html("</body>\n</html>\n");
 }

@ -609,6 +618,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 	if (!cmd && ctx->repo)
 		fallback_cmd = "summary";

+	html("<div id='cgit'>");
 	html("<table id='header'>\n");
 	html("<tr>\n");
 	html("<td class='logo' rowspan='2'><a href='");