]> git.cameronkatri.com Git - cgit.git/commitdiff
git.ckatri.com / cgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8cc0287)
Add support for an 'embedded' option in cgitrc
authorLars Hjemli <hjemli@gmail.com>
Thu, 22 Jan 2009 22:33:56 +0000 (23:33 +0100)
committerLars Hjemli <hjemli@gmail.com>
Mon, 2 Feb 2009 07:11:29 +0000 (08:11 +0100)
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>
cgit.c patch | blob | history
cgit.h patch | blob | history
ui-shared.c patch | blob | history

diff --git a/cgit.c b/cgit.c
index 64d95f9a3a7bb56197988e6730c4576173811db0..2aef44dbd1da27b62326d3dabfa7023a541095de 100644 (file)
--- 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"))
diff --git a/cgit.h b/cgit.h
index 5f7af51a68e0a773cac9c2758df51d5f0af90ff6..73d7208a2c7d24a8dd627da6321809521a5f2b48 100644 (file)
--- 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 {
diff --git a/ui-shared.c b/ui-shared.c
index de77bbfadf86dd08e794145395ca1e20e1f63e9c..f18b2c74f661ce2ec1fbb5365ca9204fdaab8bfe 100644 (file)
--- 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='");
A hyperfast web frontend for git repositories written in C.