author | Mark Lodato <lodatom@gmail.com> | 2009-03-15 04:11:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-06-07 16:55:44 (UTC) |
commit | b5a3a2049648415e86d518a8bf2229b3e463b10f (patch) (unidiff) | |
tree | 37c44671e4557d38ba3d5905f0b595376aece5d6 /ui-shared.c | |
parent | 45e7fcecc1117440e6274ce3c6ab7d893c4986ee (diff) | |
download | cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.zip cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.gz cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.bz2 |
Add head-include configuration option.
This patch adds an option to the configuration file, "head-include",
which works just like "header" or "footer", except the content is put
into the HTML's <head> tag.
-rw-r--r-- | ui-shared.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..fea2c40 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -451,98 +451,100 @@ 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 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void cgit_print_http_headers(struct cgit_context *ctx) |
458 | { | 458 | { |
459 | if (ctx->page.mimetype && ctx->page.charset) | 459 | if (ctx->page.mimetype && ctx->page.charset) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 461 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 462 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 464 | if (ctx->page.size) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 465 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 466 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
468 | ctx->page.filename); | 468 | ctx->page.filename); |
469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
471 | html("\n"); | 471 | html("\n"); |
472 | } | 472 | } |
473 | 473 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 474 | void cgit_print_docstart(struct cgit_context *ctx) |
475 | { | 475 | { |
476 | char *host = cgit_hosturl(); | 476 | char *host = cgit_hosturl(); |
477 | html(cgit_doctype); | 477 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 479 | html("<head>\n"); |
480 | html("<title>"); | 480 | html("<title>"); |
481 | html_txt(ctx->page.title); | 481 | html_txt(ctx->page.title); |
482 | html("</title>\n"); | 482 | html("</title>\n"); |
483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 484 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 486 | html("<link rel='stylesheet' type='text/css' href='"); |
487 | html_attr(ctx->cfg.css); | 487 | html_attr(ctx->cfg.css); |
488 | html("'/>\n"); | 488 | html("'/>\n"); |
489 | if (ctx->cfg.favicon) { | 489 | if (ctx->cfg.favicon) { |
490 | html("<link rel='shortcut icon' href='"); | 490 | html("<link rel='shortcut icon' href='"); |
491 | html_attr(ctx->cfg.favicon); | 491 | html_attr(ctx->cfg.favicon); |
492 | html("'/>\n"); | 492 | html("'/>\n"); |
493 | } | 493 | } |
494 | if (host && ctx->repo) { | 494 | if (host && ctx->repo) { |
495 | html("<link rel='alternate' title='Atom feed' href='http://"); | 495 | html("<link rel='alternate' title='Atom feed' href='http://"); |
496 | html_attr(cgit_hosturl()); | 496 | html_attr(cgit_hosturl()); |
497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
498 | fmt("h=%s", ctx->qry.head))); | 498 | fmt("h=%s", ctx->qry.head))); |
499 | html("' type='application/atom+xml'/>"); | 499 | html("' type='application/atom+xml'/>\n"); |
500 | } | 500 | } |
501 | if (ctx->cfg.head_include) | ||
502 | html_include(ctx->cfg.head_include); | ||
501 | html("</head>\n"); | 503 | html("</head>\n"); |
502 | html("<body>\n"); | 504 | html("<body>\n"); |
503 | if (ctx->cfg.header) | 505 | if (ctx->cfg.header) |
504 | html_include(ctx->cfg.header); | 506 | html_include(ctx->cfg.header); |
505 | } | 507 | } |
506 | 508 | ||
507 | void cgit_print_docend() | 509 | void cgit_print_docend() |
508 | { | 510 | { |
509 | html("</div>"); | 511 | html("</div>"); |
510 | if (ctx.cfg.footer) | 512 | if (ctx.cfg.footer) |
511 | html_include(ctx.cfg.footer); | 513 | html_include(ctx.cfg.footer); |
512 | else { | 514 | else { |
513 | htmlf("<div class='footer'>generated by cgit %s at ", | 515 | htmlf("<div class='footer'>generated by cgit %s at ", |
514 | cgit_version); | 516 | cgit_version); |
515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 517 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
516 | html("</div>\n"); | 518 | html("</div>\n"); |
517 | } | 519 | } |
518 | html("</body>\n</html>\n"); | 520 | html("</body>\n</html>\n"); |
519 | } | 521 | } |
520 | 522 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 523 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 524 | int flags, void *cb_data) |
523 | { | 525 | { |
524 | char *name = (char *)refname; | 526 | char *name = (char *)refname; |
525 | html_option(name, name, ctx.qry.head); | 527 | html_option(name, name, ctx.qry.head); |
526 | return 0; | 528 | return 0; |
527 | } | 529 | } |
528 | 530 | ||
529 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 531 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
530 | int flags, void *cb_data) | 532 | int flags, void *cb_data) |
531 | { | 533 | { |
532 | struct tag *tag; | 534 | struct tag *tag; |
533 | struct taginfo *info; | 535 | struct taginfo *info; |
534 | struct object *obj; | 536 | struct object *obj; |
535 | char buf[256], *url; | 537 | char buf[256], *url; |
536 | unsigned char fileid[20]; | 538 | unsigned char fileid[20]; |
537 | int *header = (int *)cb_data; | 539 | int *header = (int *)cb_data; |
538 | 540 | ||
539 | if (prefixcmp(refname, "refs/archives")) | 541 | if (prefixcmp(refname, "refs/archives")) |
540 | return 0; | 542 | return 0; |
541 | strncpy(buf, refname+14, sizeof(buf)); | 543 | strncpy(buf, refname+14, sizeof(buf)); |
542 | obj = parse_object(sha1); | 544 | obj = parse_object(sha1); |
543 | if (!obj) | 545 | if (!obj) |
544 | return 1; | 546 | return 1; |
545 | if (obj->type == OBJ_TAG) { | 547 | if (obj->type == OBJ_TAG) { |
546 | tag = lookup_tag(sha1); | 548 | tag = lookup_tag(sha1); |
547 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 549 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
548 | return 0; | 550 | return 0; |