-rw-r--r-- | ui-shared.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a00099..6f83d2a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -408,64 +408,69 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) | |||
408 | secs * 1.0 / TM_YEAR); | 408 | secs * 1.0 / TM_YEAR); |
409 | } | 409 | } |
410 | 410 | ||
411 | void cgit_print_http_headers(struct cgit_context *ctx) | 411 | void cgit_print_http_headers(struct cgit_context *ctx) |
412 | { | 412 | { |
413 | if (ctx->page.mimetype && ctx->page.charset) | 413 | if (ctx->page.mimetype && ctx->page.charset) |
414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 414 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
415 | ctx->page.charset); | 415 | ctx->page.charset); |
416 | else if (ctx->page.mimetype) | 416 | else if (ctx->page.mimetype) |
417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 417 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
418 | if (ctx->page.filename) | 418 | if (ctx->page.filename) |
419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 419 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
420 | ctx->page.filename); | 420 | ctx->page.filename); |
421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 421 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 422 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
423 | html("\n"); | 423 | html("\n"); |
424 | } | 424 | } |
425 | 425 | ||
426 | void cgit_print_docstart(struct cgit_context *ctx) | 426 | void cgit_print_docstart(struct cgit_context *ctx) |
427 | { | 427 | { |
428 | html(cgit_doctype); | 428 | html(cgit_doctype); |
429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 429 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
430 | html("<head>\n"); | 430 | html("<head>\n"); |
431 | html("<title>"); | 431 | html("<title>"); |
432 | html_txt(ctx->page.title); | 432 | html_txt(ctx->page.title); |
433 | html("</title>\n"); | 433 | html("</title>\n"); |
434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 434 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
435 | if (ctx->cfg.robots && *ctx->cfg.robots) | 435 | if (ctx->cfg.robots && *ctx->cfg.robots) |
436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 436 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
437 | html("<link rel='stylesheet' type='text/css' href='"); | 437 | html("<link rel='stylesheet' type='text/css' href='"); |
438 | html_attr(ctx->cfg.css); | 438 | html_attr(ctx->cfg.css); |
439 | html("'/>\n"); | 439 | html("'/>\n"); |
440 | if (ctx->cfg.favicon) { | ||
441 | html("<link rel='shortcut icon' href='"); | ||
442 | html_attr(ctx->cfg.favicon); | ||
443 | html("'/>\n"); | ||
444 | } | ||
440 | html("</head>\n"); | 445 | html("</head>\n"); |
441 | html("<body>\n"); | 446 | html("<body>\n"); |
442 | } | 447 | } |
443 | 448 | ||
444 | void cgit_print_docend() | 449 | void cgit_print_docend() |
445 | { | 450 | { |
446 | html("</div>"); | 451 | html("</div>"); |
447 | if (ctx.cfg.footer) | 452 | if (ctx.cfg.footer) |
448 | html_include(ctx.cfg.footer); | 453 | html_include(ctx.cfg.footer); |
449 | else { | 454 | else { |
450 | html("<div class='footer'>generated "); | 455 | html("<div class='footer'>generated "); |
451 | cgit_print_date(time(NULL), FMT_LONGDATE); | 456 | cgit_print_date(time(NULL), FMT_LONGDATE); |
452 | htmlf(" by cgit %s", cgit_version); | 457 | htmlf(" by cgit %s", cgit_version); |
453 | html("</div>\n"); | 458 | html("</div>\n"); |
454 | } | 459 | } |
455 | html("</body>\n</html>\n"); | 460 | html("</body>\n</html>\n"); |
456 | } | 461 | } |
457 | 462 | ||
458 | int print_branch_option(const char *refname, const unsigned char *sha1, | 463 | int print_branch_option(const char *refname, const unsigned char *sha1, |
459 | int flags, void *cb_data) | 464 | int flags, void *cb_data) |
460 | { | 465 | { |
461 | char *name = (char *)refname; | 466 | char *name = (char *)refname; |
462 | html_option(name, name, ctx.qry.head); | 467 | html_option(name, name, ctx.qry.head); |
463 | return 0; | 468 | return 0; |
464 | } | 469 | } |
465 | 470 | ||
466 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 471 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
467 | int flags, void *cb_data) | 472 | int flags, void *cb_data) |
468 | { | 473 | { |
469 | struct tag *tag; | 474 | struct tag *tag; |
470 | struct taginfo *info; | 475 | struct taginfo *info; |
471 | struct object *obj; | 476 | struct object *obj; |