-rw-r--r-- | ui-shared.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..f18b2c7 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -443,49 +443,55 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
443 | if (secs < TM_MONTH * 2) { | 443 | if (secs < TM_MONTH * 2) { |
444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
445 | secs * 1.0 / TM_WEEK); | 445 | secs * 1.0 / TM_WEEK); |
446 | return; | 446 | return; |
447 | } | 447 | } |
448 | if (secs < TM_YEAR * 2) { | 448 | if (secs < TM_YEAR * 2) { |
449 | htmlf("<span class='age-months'>%.0f months</span>", | 449 | htmlf("<span class='age-months'>%.0f months</span>", |
450 | secs * 1.0 / TM_MONTH); | 450 | secs * 1.0 / TM_MONTH); |
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->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) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 470 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
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 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 477 | void 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); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 490 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 491 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 492 | html("<link rel='stylesheet' type='text/css' href='"); |
487 | html_attr(ctx->cfg.css); | 493 | html_attr(ctx->cfg.css); |
488 | html("'/>\n"); | 494 | html("'/>\n"); |
489 | if (ctx->cfg.favicon) { | 495 | if (ctx->cfg.favicon) { |
490 | html("<link rel='shortcut icon' href='"); | 496 | html("<link rel='shortcut icon' href='"); |
491 | html_attr(ctx->cfg.favicon); | 497 | html_attr(ctx->cfg.favicon); |
@@ -502,32 +508,35 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
502 | html("<body>\n"); | 508 | html("<body>\n"); |
503 | if (ctx->cfg.header) | 509 | if (ctx->cfg.header) |
504 | html_include(ctx->cfg.header); | 510 | html_include(ctx->cfg.header); |
505 | } | 511 | } |
506 | 512 | ||
507 | void cgit_print_docend() | 513 | void cgit_print_docend() |
508 | { | 514 | { |
509 | html("</div>"); | 515 | html("</div>"); |
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 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 530 | int 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); |
526 | return 0; | 535 | return 0; |
527 | } | 536 | } |
528 | 537 | ||
529 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 538 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
530 | int flags, void *cb_data) | 539 | int flags, void *cb_data) |
531 | { | 540 | { |
532 | struct tag *tag; | 541 | struct tag *tag; |
533 | struct taginfo *info; | 542 | struct taginfo *info; |
@@ -596,32 +605,33 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | |||
596 | } | 605 | } |
597 | 606 | ||
598 | const char *fallback_cmd = "repolist"; | 607 | const char *fallback_cmd = "repolist"; |
599 | 608 | ||
600 | char *hc(struct cgit_cmd *cmd, const char *page) | 609 | char *hc(struct cgit_cmd *cmd, const char *page) |
601 | { | 610 | { |
602 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 611 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
603 | } | 612 | } |
604 | 613 | ||
605 | void cgit_print_pageheader(struct cgit_context *ctx) | 614 | void 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='"); |
620 | html_attr(ctx->cfg.logo); | 630 | html_attr(ctx->cfg.logo); |
621 | html("' alt='cgit logo'/></a></td>\n"); | 631 | html("' alt='cgit logo'/></a></td>\n"); |
622 | 632 | ||
623 | html("<td class='main'>"); | 633 | html("<td class='main'>"); |
624 | if (ctx->repo) { | 634 | if (ctx->repo) { |
625 | cgit_index_link("index", NULL, NULL, NULL, 0); | 635 | cgit_index_link("index", NULL, NULL, NULL, 0); |
626 | html(" : "); | 636 | html(" : "); |
627 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 637 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |