| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:04:08 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:04:08 (UTC) |
| commit | 542f6a433034935a1aa895f7ef3273968915a5d1 (patch) (unidiff) | |
| tree | 8fc123b3d9f014f31b5b160a9456c85b6c19aa0d /ui-shared.c | |
| parent | 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 (diff) | |
| parent | f618e8f7174011e1e793df2c67fb9d1341652054 (diff) | |
| download | cgit-542f6a433034935a1aa895f7ef3273968915a5d1.zip cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.gz cgit-542f6a433034935a1aa895f7ef3273968915a5d1.tar.bz2 | |
Merge branch 'ml/head-include'
| -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 10be3c0..66d5b82 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -507,26 +507,28 @@ void cgit_print_docstart(struct cgit_context *ctx) | |||
| 507 | html("'/>\n"); | 507 | html("'/>\n"); |
| 508 | if (ctx->cfg.favicon) { | 508 | if (ctx->cfg.favicon) { |
| 509 | html("<link rel='shortcut icon' href='"); | 509 | html("<link rel='shortcut icon' href='"); |
| 510 | html_attr(ctx->cfg.favicon); | 510 | html_attr(ctx->cfg.favicon); |
| 511 | html("'/>\n"); | 511 | html("'/>\n"); |
| 512 | } | 512 | } |
| 513 | if (host && ctx->repo) { | 513 | if (host && ctx->repo) { |
| 514 | html("<link rel='alternate' title='Atom feed' href='"); | 514 | html("<link rel='alternate' title='Atom feed' href='"); |
| 515 | html(cgit_httpscheme()); | 515 | html(cgit_httpscheme()); |
| 516 | html_attr(cgit_hosturl()); | 516 | html_attr(cgit_hosturl()); |
| 517 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 517 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
| 518 | fmt("h=%s", ctx->qry.head))); | 518 | fmt("h=%s", ctx->qry.head))); |
| 519 | html("' type='application/atom+xml'/>"); | 519 | html("' type='application/atom+xml'/>\n"); |
| 520 | } | 520 | } |
| 521 | if (ctx->cfg.head_include) | ||
| 522 | html_include(ctx->cfg.head_include); | ||
| 521 | html("</head>\n"); | 523 | html("</head>\n"); |
| 522 | html("<body>\n"); | 524 | html("<body>\n"); |
| 523 | if (ctx->cfg.header) | 525 | if (ctx->cfg.header) |
| 524 | html_include(ctx->cfg.header); | 526 | html_include(ctx->cfg.header); |
| 525 | } | 527 | } |
| 526 | 528 | ||
| 527 | void cgit_print_docend() | 529 | void cgit_print_docend() |
| 528 | { | 530 | { |
| 529 | html("</div>"); | 531 | html("</div>"); |
| 530 | if (ctx.cfg.footer) | 532 | if (ctx.cfg.footer) |
| 531 | html_include(ctx.cfg.footer); | 533 | html_include(ctx.cfg.footer); |
| 532 | else { | 534 | else { |