| author | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:17:52 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-02-01 18:17:52 (UTC) |
| commit | 0b3c746ba80738dbe0885a21406409390936537c (patch) (unidiff) | |
| tree | 405a9f959feafab650f53e17561a1d3a85cb8097 /ui-shared.c | |
| parent | d6174b7aab476c2b6a86e59d98cf978d603045f4 (diff) | |
| parent | b115955d71c50cd2d0065c45f3df6b02fa4730bd (diff) | |
| download | cgit-0b3c746ba80738dbe0885a21406409390936537c.zip cgit-0b3c746ba80738dbe0885a21406409390936537c.tar.gz cgit-0b3c746ba80738dbe0885a21406409390936537c.tar.bz2 | |
Merge branch 'lh/header'
| -rw-r--r-- | ui-shared.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index 4f28512..de77bbf 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -471,64 +471,66 @@ void cgit_print_http_headers(struct cgit_context *ctx) | |||
| 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'/>"); |
| 500 | } | 500 | } |
| 501 | html("</head>\n"); | 501 | html("</head>\n"); |
| 502 | html("<body>\n"); | 502 | html("<body>\n"); |
| 503 | if (ctx->cfg.header) | ||
| 504 | html_include(ctx->cfg.header); | ||
| 503 | } | 505 | } |
| 504 | 506 | ||
| 505 | void cgit_print_docend() | 507 | void cgit_print_docend() |
| 506 | { | 508 | { |
| 507 | html("</div>"); | 509 | html("</div>"); |
| 508 | if (ctx.cfg.footer) | 510 | if (ctx.cfg.footer) |
| 509 | html_include(ctx.cfg.footer); | 511 | html_include(ctx.cfg.footer); |
| 510 | else { | 512 | else { |
| 511 | htmlf("<div class='footer'>generated by cgit %s at ", | 513 | htmlf("<div class='footer'>generated by cgit %s at ", |
| 512 | cgit_version); | 514 | cgit_version); |
| 513 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
| 514 | html("</div>\n"); | 516 | html("</div>\n"); |
| 515 | } | 517 | } |
| 516 | html("</body>\n</html>\n"); | 518 | html("</body>\n</html>\n"); |
| 517 | } | 519 | } |
| 518 | 520 | ||
| 519 | int print_branch_option(const char *refname, const unsigned char *sha1, | 521 | int print_branch_option(const char *refname, const unsigned char *sha1, |
| 520 | int flags, void *cb_data) | 522 | int flags, void *cb_data) |
| 521 | { | 523 | { |
| 522 | char *name = (char *)refname; | 524 | char *name = (char *)refname; |
| 523 | html_option(name, name, ctx.qry.head); | 525 | html_option(name, name, ctx.qry.head); |
| 524 | return 0; | 526 | return 0; |
| 525 | } | 527 | } |
| 526 | 528 | ||
| 527 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 529 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
| 528 | int flags, void *cb_data) | 530 | int flags, void *cb_data) |
| 529 | { | 531 | { |
| 530 | struct tag *tag; | 532 | struct tag *tag; |
| 531 | struct taginfo *info; | 533 | struct taginfo *info; |
| 532 | struct object *obj; | 534 | struct object *obj; |
| 533 | char buf[256], *url; | 535 | char buf[256], *url; |
| 534 | unsigned char fileid[20]; | 536 | unsigned char fileid[20]; |