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>
19 years ago · 0b5deba132
3 changed files with 7 additions and 0 deletions
--- a/2
+++ b/2
@ -131,6 +131,7 @@ GITWEB_LIST =
				@@ -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
				@@ -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 $@+ $@
--- a/gitweb/git-favicon.png
+++ b/gitweb/git-favicon.png
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@ -48,6 +48,8 @@ our $home_text = "++GITWEB_HOMETEXT++";
				@@ -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
				@@ -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" .