summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-19 16:26:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-19 16:26:47 (GMT)
commit14154ce3caaf572aed3c26fd52c389bd13a9c688 (patch)
tree38a8d8ad3d9776148bad3c7ea4de451d0a2a3f19
parentae830c211bfbf192bcefb821130fe4943daf4291 (diff)
parent6822052427353525fe7158398bc6cf4bbd5d1351 (diff)
downloadgit-14154ce3caaf572aed3c26fd52c389bd13a9c688.zip
git-14154ce3caaf572aed3c26fd52c389bd13a9c688.tar.gz
git-14154ce3caaf572aed3c26fd52c389bd13a9c688.tar.bz2
Merge branch 'jn/gitweb-no-logo' into maint
* jn/gitweb-no-logo: gitweb: make logo optional
-rwxr-xr-xgitweb/gitweb.perl13
1 files changed, 9 insertions, 4 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index fda9d30..aad9309 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3516,10 +3516,15 @@ EOF
insert_file($site_header);
}
- print "<div class=\"page_header\">\n" .
- $cgi->a({-href => esc_url($logo_url),
- -title => $logo_label},
- qq(<img src=").esc_url($logo).qq(" width="72" height="27" alt="git" class="logo"/>));
+ print "<div class=\"page_header\">\n";
+ if (defined $logo) {
+ print $cgi->a({-href => esc_url($logo_url),
+ -title => $logo_label},
+ $cgi->img({-src => esc_url($logo),
+ -width => 72, -height => 27,
+ -alt => "git",
+ -class => "logo"}));
+ }
print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
if (defined $project) {
print $cgi->a({-href => href(action=>"summary")}, esc_html($project));