summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-11 08:12:35 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-11 08:12:35 (UTC)
commit80550bbe028b551550395653d32a0ba50db540ef (patch) (unidiff)
tree9dbbe6dbdbb705a55ace4524cca1435290ce4d2a
parent8b2252b0b61617e9de9d9e9ba743881ad62523af (diff)
downloadcgit-80550bbe028b551550395653d32a0ba50db540ef.zip
cgit-80550bbe028b551550395653d32a0ba50db540ef.tar.gz
cgit-80550bbe028b551550395653d32a0ba50db540ef.tar.bz2
ui-shared: add support for header/footer options when embedded=1
When embedded=1, cgit used to ignore the header and footer options. But honoring these options when embedded=1 makes it possible to "frame" the html fragment generated by cgit with any kind of static content, i.e. it should become easier to integrate cgit with site-specfic layouts. Original-patch-by: Mark Constable <markc@renta.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-shared.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 4175bd8..cf06511 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -472,26 +472,29 @@ void cgit_print_http_headers(struct cgit_context *ctx)
472 ctx->page.filename); 472 ctx->page.filename);
473 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 473 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
474 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 474 htmlf("Expires: %s\n", http_date(ctx->page.expires));
475 if (ctx->page.etag) 475 if (ctx->page.etag)
476 htmlf("ETag: \"%s\"\n", ctx->page.etag); 476 htmlf("ETag: \"%s\"\n", ctx->page.etag);
477 html("\n"); 477 html("\n");
478 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) 478 if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
479 exit(0); 479 exit(0);
480} 480}
481 481
482void cgit_print_docstart(struct cgit_context *ctx) 482void cgit_print_docstart(struct cgit_context *ctx)
483{ 483{
484 if (ctx->cfg.embedded) 484 if (ctx->cfg.embedded) {
485 if (ctx->cfg.header)
486 html_include(ctx->cfg.header);
485 return; 487 return;
488 }
486 489
487 char *host = cgit_hosturl(); 490 char *host = cgit_hosturl();
488 html(cgit_doctype); 491 html(cgit_doctype);
489 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 492 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
490 html("<head>\n"); 493 html("<head>\n");
491 html("<title>"); 494 html("<title>");
492 html_txt(ctx->page.title); 495 html_txt(ctx->page.title);
493 html("</title>\n"); 496 html("</title>\n");
494 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 497 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
495 if (ctx->cfg.robots && *ctx->cfg.robots) 498 if (ctx->cfg.robots && *ctx->cfg.robots)
496 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 499 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
497 html("<link rel='stylesheet' type='text/css' href='"); 500 html("<link rel='stylesheet' type='text/css' href='");
@@ -511,36 +514,40 @@ void cgit_print_docstart(struct cgit_context *ctx)
511 html("' type='application/atom+xml'/>\n"); 514 html("' type='application/atom+xml'/>\n");
512 } 515 }
513 if (ctx->cfg.head_include) 516 if (ctx->cfg.head_include)
514 html_include(ctx->cfg.head_include); 517 html_include(ctx->cfg.head_include);
515 html("</head>\n"); 518 html("</head>\n");
516 html("<body>\n"); 519 html("<body>\n");
517 if (ctx->cfg.header) 520 if (ctx->cfg.header)
518 html_include(ctx->cfg.header); 521 html_include(ctx->cfg.header);
519} 522}
520 523
521void cgit_print_docend() 524void cgit_print_docend()
522{ 525{
523 html("</div>"); 526 html("</div> <!-- class=content -->\n");
527 if (ctx.cfg.embedded) {
528 html("</div> <!-- id=cgit -->\n");
529 if (ctx.cfg.footer)
530 html_include(ctx.cfg.footer);
531 return;
532 }
524 if (ctx.cfg.footer) 533 if (ctx.cfg.footer)
525 html_include(ctx.cfg.footer); 534 html_include(ctx.cfg.footer);
526 else { 535 else {
527 htmlf("<div class='footer'>generated by cgit %s at ", 536 htmlf("<div class='footer'>generated by cgit %s at ",
528 cgit_version); 537 cgit_version);
529 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); 538 cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
530 html("</div>\n"); 539 html("</div>\n");
531 } 540 }
532 html("</div>"); 541 html("</div> <!-- id=cgit -->\n");
533 if (ctx.cfg.embedded)
534 return;
535 html("</body>\n</html>\n"); 542 html("</body>\n</html>\n");
536} 543}
537 544
538int print_branch_option(const char *refname, const unsigned char *sha1, 545int print_branch_option(const char *refname, const unsigned char *sha1,
539 int flags, void *cb_data) 546 int flags, void *cb_data)
540{ 547{
541 char *name = (char *)refname; 548 char *name = (char *)refname;
542 html_option(name, name, ctx.qry.head); 549 html_option(name, name, ctx.qry.head);
543 return 0; 550 return 0;
544} 551}
545 552
546int print_archive_ref(const char *refname, const unsigned char *sha1, 553int print_archive_ref(const char *refname, const unsigned char *sha1,