From 0cbb50841ac82e08e715bbff614f96c7d5ba22fa Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 22 Jan 2009 23:33:56 +0100
Subject: 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>
---
cgit.c | 2 ++
cgit.h | 1 +
ui-shared.c | 10 ++++++++++
3 files changed, 13 insertions(+)
diff --git a/cgit.c b/cgit.c
index 64d95f9..2aef44d 100644
--- 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 5f7af51..73d7208 100644
--- 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 de77bbf..f18b2c7 100644
--- 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='");
--
cgit v1.2.3
From ef0c6aadf70e33ef63f0a68ca16338a49d0a3f1f Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 12:19:31 +0200
Subject: Add support for 'noheader' option
This option can be used to disable the standard cgit page header, which
might be useful in combination with the 'embedded' option.
Suggested-by: Mark Constable <markc@renta.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
cgit.c | 2 ++
cgit.h | 1 +
ui-shared.c | 20 +++++++++++++-------
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/cgit.c b/cgit.c
index 2aef44d..38f0fdd 100644
--- a/cgit.c
+++ b/cgit.c
@@ -49,6 +49,8 @@ void config_cb(const char *name, const char *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"))
diff --git a/cgit.h b/cgit.h
index 73d7208..1056231 100644
--- a/cgit.h
+++ b/cgit.h
@@ -172,6 +172,7 @@ struct cgit_config {
int summary_log;
int summary_tags;
int embedded;
+ int noheader;
};
struct cgit_page {
diff --git a/ui-shared.c b/ui-shared.c
index f18b2c7..5e03a7a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -611,14 +611,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("<div id='cgit'>");
html("<table id='header'>\n");
html("<tr>\n");
html("<td class='logo' rowspan='2'><a href='");
@@ -659,6 +653,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) {
--
cgit v1.2.3
From 86b753cbc076855f06a7d44490b2ba9f2b07d879 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 12:23:30 +0200
Subject: cgitrc.5.txt: document 'embedded' and 'noheader'
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
cgitrc.5.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index fd299ae..771bb7d 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",
@@ -149,6 +154,10 @@ nocache
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
"-1" uses the compiletime value in git (for further info, look at
--
cgit v1.2.3
From 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 12:25:06 +0200
Subject: cgit.h: keep config flags sorted
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
cgit.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cgit.h b/cgit.h
index 1056231..ca01705 100644
--- a/cgit.h
+++ b/cgit.h
@@ -155,6 +155,7 @@ struct cgit_config {
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;
@@ -166,13 +167,12 @@ struct cgit_config {
int max_repodesc_len;
int max_stats;
int nocache;
+ int noheader;
int renamelimit;
int snapshots;
int summary_branches;
int summary_log;
int summary_tags;
- int embedded;
- int noheader;
};
struct cgit_page {
--
cgit v1.2.3