summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-08-18 13:14:11 +0200
committerLars Hjemli <hjemli@gmail.com>2009-08-18 13:14:11 +0200
commit73b54f7d7e21fbb15c50e21eafe1737df96b2073 (patch)
tree50b27e54f940e4a3c645e48a73431d4014e18eed
parentcb92d05b6b729cd0e219b43d7a79aff832a9c1ac (diff)
parent6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff)
downloadcgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.gz
cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.bz2
cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.zip
Merge branch 'stable'
Diffstat (limited to '')
-rw-r--r--ui-shared.c19
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)
{
html("<table id='header'>\n");
html("<tr>\n");
- html("<td class='logo' rowspan='2'><a href='");
- if (ctx->cfg.logo_link)
- html_attr(ctx->cfg.logo_link);
- else
- html_attr(cgit_rooturl());
- html("'><img src='");
- html_attr(ctx->cfg.logo);
- html("' alt='cgit logo'/></a></td>\n");
+
+ if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+ html("<td class='logo' rowspan='2'><a href='");
+ if (ctx->cfg.logo_link)
+ html_attr(ctx->cfg.logo_link);
+ else
+ html_attr(cgit_rooturl());
+ html("'><img src='");
+ html_attr(ctx->cfg.logo);
+ html("' alt='cgit logo'/></a></td>\n");
+ }
html("<td class='main'>");
if (ctx->repo) {
;follow=1'>Wah - I'm tired ...necoro1-3/+3 2006-10-14and now another bug -.-necoro1-2/+2 2006-10-14forgot one returnnecoro1-0/+2 2006-10-14Set min height to 600 if maxHeight is smaller then 800necoro2-4/+7 2006-10-13Some more documentationnecoro2-82/+298 2006-10-13Documentation worknecoro2-154/+160 2006-10-12Enabled oneshotnecoro3-32/+103 2006-10-12Layout updatenecoro1-16/+38 2006-10-12Fixed bugsnecoro2-15/+16 2006-10-12Migrated to UIManagernecoro1-33/+64 2006-10-10Fixed bug not showing the use-flag-list in some casesnecoro1-3/+5 2006-10-09bla - prepared 0.4.0 ; added dialogs.py; extended some commentsnecoro9-125/+293 2006-10-08Made the testing stuff working too ... I hope ^^ ... removed obsolete-dirnecoro7-145/+113 2006-10-05Added first support for the masking stuff ... and hoping that it is going to ...necoro5-79/+135 2006-10-05Changed changelog / added config-filenecoro2-0/+10 2006-10-05Added preference windownecoro4-49/+155 2006-10-02Corrected comments, structure, bad algorithms etcnecoro4-176/+209 2006-10-02Corrected indention in commentnecoro1-8/+6 2006-10-010.3.3necoro1-0/+6 2006-10-01Implemented an internal db; removed unmerge-bugnecoro2-26/+43 2006-09-30Implemented some new backend functions which speed up the package-list-creati...necoro2-12/+37 2006-09-300.3.2 release; changed font in terminal; added new "masking"-dialognecoro3-11/+36 2006-09-29fixed bugsnecoro4-13/+23 2006-09-29Corrected setup.pynecoro1-1/+1