Author: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/embedded' Conflicts: cgitrc.5.txt ui-shared.c
cgit.c | 4 ++++ cgit.h | 2 ++ cgitrc.5.txt | 9 +++++++++ ui-shared.c | 28 ++++++++++++++++++++++------
diff --git a/cgit.c b/cgit.c index 513ea125bb196a065a4b1cc24f24cae0f571de52..2039ab1de53699b6d29a23f1409461386589a227 100644 --- a/cgit.c +++ b/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")) diff --git a/cgit.h b/cgit.h index 78b30bace9327dc310dd646fa1ad86bdecd64ce6..8c64efeaa6e7f5698751e202b64765280e3985cf 100644 --- a/cgit.h +++ b/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; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 683f3b54853cd398c2159886ebc51dab22eb92a3..a207fe07aadb9eb2863b1c47165e804772a12e5b 100644 --- a/cgitrc.5.txt +++ b/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 diff --git a/ui-shared.c b/ui-shared.c index 66d5b8220de122d69a8398119592f09114c83731..015c52b6c044f2a280ca7259c68c6d6f5040711b 100644 --- a/ui-shared.c +++ b/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) {