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>
author: Lars Hjemli <hjemli@gmail.com> 2009-01-22 22:33:56 (UTC)
committer: Lars Hjemli <hjemli@gmail.com> 2009-02-02 07:11:29 (UTC)
commit: 0cbb50841ac82e08e715bbff614f96c7d5ba22fa (patch) (unidiff)
tree: 7a6a63ca69d161e4bf636c8676a8a845cad1083b
parent: 8cc02871230aef457006ac775dd1cca5623516a9 (diff)
download: cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.zip
cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.gz
cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.bz2
3 files changed, 13 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 64d95f9..2aef44d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -42,64 +42,66 @@ void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "logo-link"))
                ctx.cfg.logo_link = xstrdup(value);
        else if (!strcmp(name, "module-link"))
                ctx.cfg.module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root")) {
                ctx.cfg.virtual_root = trim_end(value, '/');
                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, "snapshots"))
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-index-links"))
                ctx.cfg.enable_index_links = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);
        else if (!strcmp(name, "max-stats"))
                ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
        else if (!strcmp(name, "cache-size"))
                ctx.cfg.cache_size = atoi(value);
        else if (!strcmp(name, "cache-root"))
                ctx.cfg.cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
                ctx.cfg.cache_root_ttl = atoi(value);
        else if (!strcmp(name, "cache-repo-ttl"))
                ctx.cfg.cache_repo_ttl = atoi(value);
        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"))
                ctx.cfg.max_repodesc_len = atoi(value);
        else if (!strcmp(name, "max-repo-count"))
                ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))
                ctx.cfg.summary_branches = atoi(value);
        else if (!strcmp(name, "summary-tags"))
                ctx.cfg.summary_tags = atoi(value);
        else if (!strcmp(name, "agefile"))
                ctx.cfg.agefile = xstrdup(value);
        else if (!strcmp(name, "renamelimit"))
                ctx.cfg.renamelimit = atoi(value);
        else if (!strcmp(name, "robots"))
                ctx.cfg.robots = xstrdup(value);
        else if (!strcmp(name, "clone-prefix"))
                ctx.cfg.clone_prefix = xstrdup(value);
        else if (!strcmp(name, "local-time"))
                ctx.cfg.local_time = atoi(value);
        else if (!strcmp(name, "repo.group"))
                ctx.cfg.repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
                ctx.repo = cgit_add_repo(value);
        else if (!strcmp(name, "repo.name"))
                ctx.repo->name = xstrdup(value);
        else if (ctx.repo && !strcmp(name, "repo.path"))
                ctx.repo->path = trim_end(value, '/');
diff --git a/cgit.h b/cgit.h
index 5f7af51..73d7208 100644
--- a/cgit.h
+++ b/cgit.h
@@ -142,64 +142,65 @@ struct cgit_config {
        char *logo;
        char *logo_link;
        char *module_link;
        char *repo_group;
        char *robots;
        char *root_title;
        char *root_desc;
        char *root_readme;
        char *script_name;
        char *virtual_root;
        int cache_size;
        int cache_dynamic_ttl;
        int cache_max_create_time;
        int cache_repo_ttl;
        int cache_root_ttl;
        int cache_static_ttl;
        int enable_index_links;
        int enable_log_filecount;
        int enable_log_linecount;
        int local_time;
        int max_repo_count;
        int max_commit_count;
        int max_lock_attempts;
        int max_msg_len;
        int max_repodesc_len;
        int max_stats;
        int nocache;
        int renamelimit;
        int snapshots;
        int summary_branches;
        int summary_log;
        int summary_tags;
+        int embedded;
 };
 struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;
        char *mimetype;
        char *charset;
        char *filename;
        char *title;
 };
 struct cgit_context {
        struct cgit_query qry;
        struct cgit_config cfg;
        struct cgit_repo *repo;
        struct cgit_page page;
 };
 struct cgit_snapshot_format {
        const char *suffix;
        const char *mimetype;
        write_archive_fn_t write_func;
        int bit;
 };
 extern const char *cgit_version;
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..f18b2c7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -427,123 +427,132 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 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);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
                htmlf("Content-Length: %ld\n", ctx->page.size);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        html("\n");
 }
 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");
        html("<head>\n");
        html("<title>");
        html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        if (ctx->cfg.robots && *ctx->cfg.robots)
                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");
        if (ctx->cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("<link rel='alternate' title='Atom feed' href='http://");
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>");
        }
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div>");
        if (ctx.cfg.footer)
                html_include(ctx.cfg.footer);
        else {
                htmlf("<div class='footer'>generated  by cgit %s at ",
                        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");
 }
 int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                       int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
        unsigned char fileid[20];
        int *header = (int *)cb_data;
        if (prefixcmp(refname, "refs/archives"))
                return 0;
        strncpy(buf, refname+14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
@@ -580,64 +589,65 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page)
            strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
        if (ctx.qry.sha1)
                html_hidden("id", ctx.qry.sha1);
        if (ctx.qry.sha2)
                html_hidden("id2", ctx.qry.sha2);
        if (ctx.qry.showmsg)
                html_hidden("showmsg", "1");
        if (incl_search) {
                if (ctx.qry.grep)
                        html_hidden("qt", ctx.qry.grep);
                if (ctx.qry.search)
                        html_hidden("q", ctx.qry.search);
        }
 }
 const char *fallback_cmd = "repolist";
 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)
 {
        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='");
        if (ctx->cfg.logo_link)
                html_attr(ctx->cfg.logo_link);
        else
                html_attr(cgit_rooturl());
        html("'><img src='");
        html_attr(ctx->cfg.logo);
        html("' alt='cgit logo'/></a></td>\n");
        html("<td class='main'>");
        if (ctx->repo) {
                cgit_index_link("index", NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html("<form method='get' action=''>\n");
                cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                html("<select name='h' onchange='this.form.submit();'>\n");
                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select> ");
                html("<input type='submit' name='' value='switch'/>");
                html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
        html("</td></tr>\n");
        html("<tr><td class='sub'>");
        if (ctx->repo) {
                html_txt(ctx->repo->desc);
                html("</td><td class='sub right'>");
author	Lars Hjemli <hjemli@gmail.com>	2009-01-22 22:33:56 (UTC)
committer	Lars Hjemli <hjemli@gmail.com>	2009-02-02 07:11:29 (UTC)
commit	0cbb50841ac82e08e715bbff614f96c7d5ba22fa (patch) (unidiff)
tree	7a6a63ca69d161e4bf636c8676a8a845cad1083b
parent	8cc02871230aef457006ac775dd1cca5623516a9 (diff)
download	cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.zip cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.gz cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.bz2