diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 |
| commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) | |
| tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /ui-shared.c | |
| parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
| parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
| download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip | |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
Diffstat (limited to '')
| -rw-r--r-- | ui-shared.c | 28 |
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 @@ -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_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"); @@ -537,6 +543,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"); } @@ -624,13 +633,8 @@ char *hc(struct cgit_cmd *cmd, const char *page) 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 @@ void cgit_print_pageheader(struct cgit_context *ctx) 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) { |