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
@@ -436,147 +436,154 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
436 } 436 }
437 if (secs < TM_WEEK * 2) { 437 if (secs < TM_WEEK * 2) {
438 htmlf("<span class='age-days'>%.0f days</span>", 438 htmlf("<span class='age-days'>%.0f days</span>",
439 secs * 1.0 / TM_DAY); 439 secs * 1.0 / TM_DAY);
440 return; 440 return;
441 } 441 }
442 if (secs < TM_MONTH * 2) { 442 if (secs < TM_MONTH * 2) {
443 htmlf("<span class='age-weeks'>%.0f weeks</span>", 443 htmlf("<span class='age-weeks'>%.0f weeks</span>",
444 secs * 1.0 / TM_WEEK); 444 secs * 1.0 / TM_WEEK);
445 return; 445 return;
446 } 446 }
447 if (secs < TM_YEAR * 2) { 447 if (secs < TM_YEAR * 2) {
448 htmlf("<span class='age-months'>%.0f months</span>", 448 htmlf("<span class='age-months'>%.0f months</span>",
449 secs * 1.0 / TM_MONTH); 449 secs * 1.0 / TM_MONTH);
450 return; 450 return;
451 } 451 }
452 htmlf("<span class='age-years'>%.0f years</span>", 452 htmlf("<span class='age-years'>%.0f years</span>",
453 secs * 1.0 / TM_YEAR); 453 secs * 1.0 / TM_YEAR);
454} 454}
455 455
456void cgit_print_http_headers(struct cgit_context *ctx) 456void cgit_print_http_headers(struct cgit_context *ctx)
457{ 457{
458 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) 458 if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
459 return; 459 return;
460 460
461 if (ctx->page.status) 461 if (ctx->page.status)
462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); 462 htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
463 if (ctx->page.mimetype && ctx->page.charset) 463 if (ctx->page.mimetype && ctx->page.charset)
464 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 464 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
465 ctx->page.charset); 465 ctx->page.charset);
466 else if (ctx->page.mimetype) 466 else if (ctx->page.mimetype)
467 htmlf("Content-Type: %s\n", ctx->page.mimetype); 467 htmlf("Content-Type: %s\n", ctx->page.mimetype);
468 if (ctx->page.size) 468 if (ctx->page.size)
469 htmlf("Content-Length: %ld\n", ctx->page.size); 469 htmlf("Content-Length: %ld\n", ctx->page.size);
470 if (ctx->page.filename) 470 if (ctx->page.filename)
471 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 471 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
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='");
498 html_attr(ctx->cfg.css); 501 html_attr(ctx->cfg.css);
499 html("'/>\n"); 502 html("'/>\n");
500 if (ctx->cfg.favicon) { 503 if (ctx->cfg.favicon) {
501 html("<link rel='shortcut icon' href='"); 504 html("<link rel='shortcut icon' href='");
502 html_attr(ctx->cfg.favicon); 505 html_attr(ctx->cfg.favicon);
503 html("'/>\n"); 506 html("'/>\n");
504 } 507 }
505 if (host && ctx->repo) { 508 if (host && ctx->repo) {
506 html("<link rel='alternate' title='Atom feed' href='"); 509 html("<link rel='alternate' title='Atom feed' href='");
507 html(cgit_httpscheme()); 510 html(cgit_httpscheme());
508 html_attr(cgit_hosturl()); 511 html_attr(cgit_hosturl());
509 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, 512 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
510 fmt("h=%s", ctx->qry.head))); 513 fmt("h=%s", ctx->qry.head)));
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,
547 int flags, void *cb_data) 554 int flags, void *cb_data)
548{ 555{
549 struct tag *tag; 556 struct tag *tag;
550 struct taginfo *info; 557 struct taginfo *info;
551 struct object *obj; 558 struct object *obj;
552 char buf[256], *url; 559 char buf[256], *url;
553 unsigned char fileid[20]; 560 unsigned char fileid[20];
554 int *header = (int *)cb_data; 561 int *header = (int *)cb_data;
555 562
556 if (prefixcmp(refname, "refs/archives")) 563 if (prefixcmp(refname, "refs/archives"))
557 return 0; 564 return 0;
558 strncpy(buf, refname+14, sizeof(buf)); 565 strncpy(buf, refname+14, sizeof(buf));
559 obj = parse_object(sha1); 566 obj = parse_object(sha1);
560 if (!obj) 567 if (!obj)
561 return 1; 568 return 1;
562 if (obj->type == OBJ_TAG) { 569 if (obj->type == OBJ_TAG) {
563 tag = lookup_tag(sha1); 570 tag = lookup_tag(sha1);
564 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 571 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
565 return 0; 572 return 0;
566 hashcpy(fileid, tag->tagged->sha1); 573 hashcpy(fileid, tag->tagged->sha1);
567 } else if (obj->type != OBJ_BLOB) { 574 } else if (obj->type != OBJ_BLOB) {
568 return 0; 575 return 0;
569 } else { 576 } else {
570 hashcpy(fileid, sha1); 577 hashcpy(fileid, sha1);
571 } 578 }
572 if (!*header) { 579 if (!*header) {
573 html("<h1>download</h1>\n"); 580 html("<h1>download</h1>\n");
574 *header = 1; 581 *header = 1;
575 } 582 }
576 url = cgit_pageurl(ctx.qry.repo, "blob", 583 url = cgit_pageurl(ctx.qry.repo, "blob",
577 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 584 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
578 buf)); 585 buf));
579 html_link_open(url, NULL, "menu"); 586 html_link_open(url, NULL, "menu");
580 html_txt(strlpart(buf, 20)); 587 html_txt(strlpart(buf, 20));
581 html_link_close(); 588 html_link_close();
582 return 0; 589 return 0;