all repos — cgit @ 286a905842dc0bec6d21a614ec4a97c5f19d5bc4

a hyperfast web frontend for git written in c 

Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c
Lars Hjemli hjemli@gmail.com
Sat, 25 Jul 2009 12:29:22 +0200
commit

286a905842dc0bec6d21a614ec4a97c5f19d5bc4

parent

542f6a433034935a1aa895f7ef3273968915a5d1

4 files changed, 37 insertions(+), 6 deletions(-)

jump to
M cgit.c → cgit.c 
@@ -51,6 +51,8 @@ if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
 			ctx.cfg.virtual_root = "";
 	} else if (!strcmp(name, "nocache"))
 		ctx.cfg.nocache = atoi(value);
+	else if (!strcmp(name, "noheader"))
+		ctx.cfg.noheader = atoi(value);
 	else if (!strcmp(name, "snapshots"))
 		ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
 	else if (!strcmp(name, "enable-index-links"))

@@ -73,6 +75,8 @@ else if (!strcmp(name, "cache-static-ttl"))
 		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"))
M cgit.h → cgit.h 
@@ -156,6 +156,7 @@ int cache_max_create_time;
 	int cache_repo_ttl;
 	int cache_root_ttl;
 	int cache_static_ttl;
+	int embedded;
 	int enable_index_links;
 	int enable_log_filecount;
 	int enable_log_linecount;

@@ -167,6 +168,7 @@ int max_msg_len;
 	int max_repodesc_len;
 	int max_stats;
 	int nocache;
+	int noheader;
 	int renamelimit;
 	int snapshots;
 	int summary_branches;
M cgitrc.5.txt → cgitrc.5.txt 
@@ -59,6 +59,11 @@ css::
 	Url which specifies the css document to include in all cgit pages.
 	Default value: "/cgit.css".
 
+embedded::
+	Flag which, when set to "1", will make cgit generate a html fragment
+	suitable for embedding in other html pages. Default value: none. See
+	also: "noheader".
+	
 enable-index-links::
 	Flag which, when set to "1", will make cgit generate extra links for
 	each repo in the repository index (specifically, to the "summary",

@@ -152,6 +157,10 @@ nocache::
 	If set to the value "1" caching will be disabled. This settings is
 	deprecated, and will not be honored starting with cgit-1.0. Default
 	value: "0".
+
+noheader::
+	Flag which, when set to "1", will make cgit omit the standard header
+	on all pages. Default value: none. See also: "embedded".
 
 renamelimit::
 	Maximum number of files to consider when detecting renames. The value
M ui-shared.c → ui-shared.c 
@@ -469,6 +469,9 @@ void cgit_print_http_headers(struct cgit_context *ctx)
 {
 	const char *method = getenv("REQUEST_METHOD");
 
+	if (ctx->cfg.embedded)
+		return;
+
 	if (ctx->page.status)
 		htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
 	if (ctx->page.mimetype && ctx->page.charset)

@@ -492,6 +495,9 @@ }
 
 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");

@@ -537,6 +543,9 @@ cgit_version);
 		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");
 }
 

@@ -624,13 +633,8 @@ {
 	return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active");
 }
 
-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");
 	html("<tr>\n");
 	html("<td class='logo' rowspan='2'><a href='");

@@ -671,6 +675,18 @@ else if (ctx->cfg.index_info)
 			html_include(ctx->cfg.index_info);
 	}
 	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);
 
 	html("<table class='tabs'><tr><td>\n");
 	if (ctx->repo) {