diff options
| author | Lars Hjemli | 2009-08-18 13:14:11 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2009-08-18 13:14:11 +0200 |
| commit | 73b54f7d7e21fbb15c50e21eafe1737df96b2073 (patch) | |
| tree | 50b27e54f940e4a3c645e48a73431d4014e18eed | |
| parent | Merge branch 'stable' (diff) | |
| parent | ui-shared: don't print header <img/> if there isn't a logo defined (diff) | |
| download | cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.gz cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.zip | |
Merge branch 'stable'
| -rw-r--r-- | ui-shared.c | 19 |
1 files changed, 11 insertions, 8 deletions
| diff --git a/ui-shared.c b/ui-shared.c index cf06511..07d5dd4 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -630,14 +630,17 @@ static void print_header(struct cgit_context *ctx) | |||
| 630 | { | 630 | { |
| 631 | html("<table id='header'>\n"); | 631 | html("<table id='header'>\n"); |
| 632 | html("<tr>\n"); | 632 | html("<tr>\n"); |
| 633 | html("<td class='logo' rowspan='2'><a href='"); | 633 | |
| 634 | if (ctx->cfg.logo_link) | 634 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { |
| 635 | html_attr(ctx->cfg.logo_link); | 635 | html("<td class='logo' rowspan='2'><a href='"); |
| 636 | else | 636 | if (ctx->cfg.logo_link) |
| 637 | html_attr(cgit_rooturl()); | 637 | html_attr(ctx->cfg.logo_link); |
| 638 | html("'><img src='"); | 638 | else |
| 639 | html_attr(ctx->cfg.logo); | 639 | html_attr(cgit_rooturl()); |
| 640 | html("' alt='cgit logo'/></a></td>\n"); | 640 | html("'><img src='"); |
| 641 | html_attr(ctx->cfg.logo); | ||
| 642 | html("' alt='cgit logo'/></a></td>\n"); | ||
| 643 | } | ||
| 641 | 644 | ||
| 642 | html("<td class='main'>"); | 645 | html("<td class='main'>"); |
| 643 | if (ctx->repo) { | 646 | if (ctx->repo) { |