summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-22 22:33:56 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-02 07:11:29 (UTC)
commit0cbb50841ac82e08e715bbff614f96c7d5ba22fa (patch) (unidiff)
tree7a6a63ca69d161e4bf636c8676a8a845cad1083b
parent8cc02871230aef457006ac775dd1cca5623516a9 (diff)
downloadcgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.zip
cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.gz
cgit-0cbb50841ac82e08e715bbff614f96c7d5ba22fa.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--ui-shared.c10
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
@@ -66,16 +66,18 @@ void config_cb(const char *name, const char *value)
66 else if (!strcmp(name, "cache-root-ttl")) 66 else if (!strcmp(name, "cache-root-ttl"))
67 ctx.cfg.cache_root_ttl = atoi(value); 67 ctx.cfg.cache_root_ttl = atoi(value);
68 else if (!strcmp(name, "cache-repo-ttl")) 68 else if (!strcmp(name, "cache-repo-ttl"))
69 ctx.cfg.cache_repo_ttl = atoi(value); 69 ctx.cfg.cache_repo_ttl = atoi(value);
70 else if (!strcmp(name, "cache-static-ttl")) 70 else if (!strcmp(name, "cache-static-ttl"))
71 ctx.cfg.cache_static_ttl = atoi(value); 71 ctx.cfg.cache_static_ttl = atoi(value);
72 else if (!strcmp(name, "cache-dynamic-ttl")) 72 else if (!strcmp(name, "cache-dynamic-ttl"))
73 ctx.cfg.cache_dynamic_ttl = atoi(value); 73 ctx.cfg.cache_dynamic_ttl = atoi(value);
74 else if (!strcmp(name, "embedded"))
75 ctx.cfg.embedded = atoi(value);
74 else if (!strcmp(name, "max-message-length")) 76 else if (!strcmp(name, "max-message-length"))
75 ctx.cfg.max_msg_len = atoi(value); 77 ctx.cfg.max_msg_len = atoi(value);
76 else if (!strcmp(name, "max-repodesc-length")) 78 else if (!strcmp(name, "max-repodesc-length"))
77 ctx.cfg.max_repodesc_len = atoi(value); 79 ctx.cfg.max_repodesc_len = atoi(value);
78 else if (!strcmp(name, "max-repo-count")) 80 else if (!strcmp(name, "max-repo-count"))
79 ctx.cfg.max_repo_count = atoi(value); 81 ctx.cfg.max_repo_count = atoi(value);
80 else if (!strcmp(name, "max-commit-count")) 82 else if (!strcmp(name, "max-commit-count"))
81 ctx.cfg.max_commit_count = atoi(value); 83 ctx.cfg.max_commit_count = atoi(value);
diff --git a/cgit.h b/cgit.h
index 5f7af51..73d7208 100644
--- a/cgit.h
+++ b/cgit.h
@@ -166,16 +166,17 @@ struct cgit_config {
166 int max_repodesc_len; 166 int max_repodesc_len;
167 int max_stats; 167 int max_stats;
168 int nocache; 168 int nocache;
169 int renamelimit; 169 int renamelimit;
170 int snapshots; 170 int snapshots;
171 int summary_branches; 171 int summary_branches;
172 int summary_log; 172 int summary_log;
173 int summary_tags; 173 int summary_tags;
174 int embedded;
174}; 175};
175 176
176struct cgit_page { 177struct cgit_page {
177 time_t modified; 178 time_t modified;
178 time_t expires; 179 time_t expires;
179 size_t size; 180 size_t size;
180 char *mimetype; 181 char *mimetype;
181 char *charset; 182 char *charset;
diff --git a/ui-shared.c b/ui-shared.c
index de77bbf..f18b2c7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -451,16 +451,19 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
451 return; 451 return;
452 } 452 }
453 htmlf("<span class='age-years'>%.0f years</span>", 453 htmlf("<span class='age-years'>%.0f years</span>",
454 secs * 1.0 / TM_YEAR); 454 secs * 1.0 / TM_YEAR);
455} 455}
456 456
457void cgit_print_http_headers(struct cgit_context *ctx) 457void cgit_print_http_headers(struct cgit_context *ctx)
458{ 458{
459 if (ctx->cfg.embedded)
460 return;
461
459 if (ctx->page.mimetype && ctx->page.charset) 462 if (ctx->page.mimetype && ctx->page.charset)
460 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 463 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
461 ctx->page.charset); 464 ctx->page.charset);
462 else if (ctx->page.mimetype) 465 else if (ctx->page.mimetype)
463 htmlf("Content-Type: %s\n", ctx->page.mimetype); 466 htmlf("Content-Type: %s\n", ctx->page.mimetype);
464 if (ctx->page.size) 467 if (ctx->page.size)
465 htmlf("Content-Length: %ld\n", ctx->page.size); 468 htmlf("Content-Length: %ld\n", ctx->page.size);
466 if (ctx->page.filename) 469 if (ctx->page.filename)
@@ -468,16 +471,19 @@ void cgit_print_http_headers(struct cgit_context *ctx)
468 ctx->page.filename); 471 ctx->page.filename);
469 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 472 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
470 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 473 htmlf("Expires: %s\n", http_date(ctx->page.expires));
471 html("\n"); 474 html("\n");
472} 475}
473 476
474void cgit_print_docstart(struct cgit_context *ctx) 477void cgit_print_docstart(struct cgit_context *ctx)
475{ 478{
479 if (ctx->cfg.embedded)
480 return;
481
476 char *host = cgit_hosturl(); 482 char *host = cgit_hosturl();
477 html(cgit_doctype); 483 html(cgit_doctype);
478 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 484 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
479 html("<head>\n"); 485 html("<head>\n");
480 html("<title>"); 486 html("<title>");
481 html_txt(ctx->page.title); 487 html_txt(ctx->page.title);
482 html("</title>\n"); 488 html("</title>\n");
483 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 489 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
@@ -510,16 +516,19 @@ void cgit_print_docend()
510 if (ctx.cfg.footer) 516 if (ctx.cfg.footer)
511 html_include(ctx.cfg.footer); 517 html_include(ctx.cfg.footer);
512 else { 518 else {
513 htmlf("<div class='footer'>generated by cgit %s at ", 519 htmlf("<div class='footer'>generated by cgit %s at ",
514 cgit_version); 520 cgit_version);
515 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 521 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
516 html("</div>\n"); 522 html("</div>\n");
517 } 523 }
524 html("</div>");
525 if (ctx.cfg.embedded)
526 return;
518 html("</body>\n</html>\n"); 527 html("</body>\n</html>\n");
519} 528}
520 529
521int print_branch_option(const char *refname, const unsigned char *sha1, 530int print_branch_option(const char *refname, const unsigned char *sha1,
522 int flags, void *cb_data) 531 int flags, void *cb_data)
523{ 532{
524 char *name = (char *)refname; 533 char *name = (char *)refname;
525 html_option(name, name, ctx.qry.head); 534 html_option(name, name, ctx.qry.head);
@@ -604,16 +613,17 @@ char *hc(struct cgit_cmd *cmd, const char *page)
604 613
605void cgit_print_pageheader(struct cgit_context *ctx) 614void cgit_print_pageheader(struct cgit_context *ctx)
606{ 615{
607 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 616 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
608 617
609 if (!cmd && ctx->repo) 618 if (!cmd && ctx->repo)
610 fallback_cmd = "summary"; 619 fallback_cmd = "summary";
611 620
621 html("<div id='cgit'>");
612 html("<table id='header'>\n"); 622 html("<table id='header'>\n");
613 html("<tr>\n"); 623 html("<tr>\n");
614 html("<td class='logo' rowspan='2'><a href='"); 624 html("<td class='logo' rowspan='2'><a href='");
615 if (ctx->cfg.logo_link) 625 if (ctx->cfg.logo_link)
616 html_attr(ctx->cfg.logo_link); 626 html_attr(ctx->cfg.logo_link);
617 else 627 else
618 html_attr(cgit_rooturl()); 628 html_attr(cgit_rooturl());
619 html("'><img src='"); 629 html("'><img src='");