summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jakub Narebski <jnareb@gmail.com>2006-09-04 20:32:13 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-09-04 15:33:04 -0700
commit0b5deba13268a196a8b302255453a8c2194c876d (patch)
treea0fabc4249b352a555c4291e768cfac832648de0
parentFix git-fsck-objects SIGSEGV/divide-by-zero (diff)
downloadtgif-0b5deba13268a196a8b302255453a8c2194c876d.tar.xz
gitweb: Add GIT favicon, assuming image/png type
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile2
-rw-r--r--gitweb/git-favicon.pngbin0 -> 164 bytes
-rwxr-xr-xgitweb/gitweb.perl5
3 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a639cdfcfb..7b3114f3aa 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,7 @@ GITWEB_LIST =
GITWEB_HOMETEXT = indextext.html
GITWEB_CSS = gitweb.css
GITWEB_LOGO = git-logo.png
+GITWEB_FAVICON = git-favicon.png
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
@@ -635,6 +636,7 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl
-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
+ -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
$< >$@+
chmod +x $@+
mv $@+ $@
diff --git a/gitweb/git-favicon.png b/gitweb/git-favicon.png
new file mode 100644
index 0000000000..de637c0608
--- /dev/null
+++ b/gitweb/git-favicon.png
Binary files differ
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 2b40aa11e7..313e842952 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -48,6 +48,8 @@ our $home_text = "++GITWEB_HOMETEXT++";
our $stylesheet = "++GITWEB_CSS++";
# URI of GIT logo
our $logo = "++GITWEB_LOGO++";
+# URI of GIT favicon, assumed to be image/png type
+our $favicon = "++GITWEB_FAVICON++";
# source of projects list
our $projects_list = "++GITWEB_LIST++";
@@ -1222,6 +1224,9 @@ EOF
'href="%s" type="application/rss+xml"/>'."\n",
esc_param($project), href(action=>"rss"));
}
+ if (defined $favicon) {
+ print qq(<link rel="shortcut icon" href="$favicon" type="image/png"/>\n);
+ }
print "</head>\n" .
"<body>\n" .