mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
gitweb: use out-of-line GIT logo.
Use the normal web server instead of the CGI to provide the git logo, just like the gitweb.css. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
5d043a3d85
commit
281f2f6b45
2
Makefile
2
Makefile
|
@ -122,6 +122,7 @@ GITWEB_PROJECTROOT = /pub/git
|
||||||
GITWEB_LIST =
|
GITWEB_LIST =
|
||||||
GITWEB_HOMETEXT = indextext.html
|
GITWEB_HOMETEXT = indextext.html
|
||||||
GITWEB_CSS = gitweb.css
|
GITWEB_CSS = gitweb.css
|
||||||
|
GITWEB_LOGO = git-logo.png
|
||||||
|
|
||||||
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
|
export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
|
||||||
|
|
||||||
|
@ -589,6 +590,7 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl
|
||||||
-e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \
|
-e 's|@@GITWEB_LIST@@|$(GITWEB_LIST)|g' \
|
||||||
-e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \
|
-e 's|@@GITWEB_HOMETEXT@@|$(GITWEB_HOMETEXT)|g' \
|
||||||
-e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \
|
-e 's|@@GITWEB_CSS@@|$(GITWEB_CSS)|g' \
|
||||||
|
-e 's|@@GITWEB_LOGO@@|$(GITWEB_LOGO)|g' \
|
||||||
$< >$@+
|
$< >$@+
|
||||||
chmod +x $@+
|
chmod +x $@+
|
||||||
mv $@+ $@
|
mv $@+ $@
|
||||||
|
|
|
@ -21,6 +21,8 @@ You can specify the following configuration variables when building GIT:
|
||||||
overview page.
|
overview page.
|
||||||
* GITWEB_CSS
|
* GITWEB_CSS
|
||||||
Points to the location where you put gitweb.css on your web server.
|
Points to the location where you put gitweb.css on your web server.
|
||||||
|
* GITWEB_LOGO
|
||||||
|
Points to the location where you put git-logo.png on your web server.
|
||||||
|
|
||||||
Any comment/question/concern to:
|
Any comment/question/concern to:
|
||||||
Kay Sievers <kay.sievers@vrfy.org>
|
Kay Sievers <kay.sievers@vrfy.org>
|
||||||
|
|
BIN
gitweb/git-logo.png
Normal file
BIN
gitweb/git-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 208 B |
|
@ -52,6 +52,8 @@
|
||||||
|
|
||||||
# URI of default stylesheet
|
# URI of default stylesheet
|
||||||
our $stylesheet = "@@GITWEB_CSS@@";
|
our $stylesheet = "@@GITWEB_CSS@@";
|
||||||
|
# URI of GIT logo
|
||||||
|
our $logo = "@@GITWEB_LOGO@@";
|
||||||
|
|
||||||
# source of projects list
|
# source of projects list
|
||||||
our $projects_list = "@@GITWEB_LIST@@" || "$projectroot";
|
our $projects_list = "@@GITWEB_LIST@@" || "$projectroot";
|
||||||
|
@ -71,10 +73,7 @@
|
||||||
undef $action;
|
undef $action;
|
||||||
die_error(undef, "Invalid action parameter.");
|
die_error(undef, "Invalid action parameter.");
|
||||||
}
|
}
|
||||||
if ($action eq "git-logo.png") {
|
if ($action eq "opml") {
|
||||||
git_logo();
|
|
||||||
exit;
|
|
||||||
} elsif ($action eq "opml") {
|
|
||||||
git_opml();
|
git_opml();
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
@ -873,7 +872,7 @@ sub git_header_html {
|
||||||
EOF
|
EOF
|
||||||
print "<div class=\"page_header\">\n" .
|
print "<div class=\"page_header\">\n" .
|
||||||
"<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
|
"<a href=\"http://www.kernel.org/pub/software/scm/git/docs/\" title=\"git documentation\">" .
|
||||||
"<img src=\"$my_uri?" . esc_param("a=git-logo.png") . "\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
|
"<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
|
||||||
"</a>\n";
|
"</a>\n";
|
||||||
print $cgi->a({-href => esc_param($home_link)}, "projects") . " / ";
|
print $cgi->a({-href => esc_param($home_link)}, "projects") . " / ";
|
||||||
if (defined $project) {
|
if (defined $project) {
|
||||||
|
@ -1267,26 +1266,6 @@ sub git_diff_print {
|
||||||
## ======================================================================
|
## ======================================================================
|
||||||
## actions
|
## actions
|
||||||
|
|
||||||
# git-logo (cached in browser for one day)
|
|
||||||
sub git_logo {
|
|
||||||
binmode STDOUT, ':raw';
|
|
||||||
print $cgi->header(-type => 'image/png', -expires => '+1d');
|
|
||||||
# cat git-logo.png | hexdump -e '16/1 " %02x" "\n"' | sed 's/ /\\x/g'
|
|
||||||
print "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52" .
|
|
||||||
"\x00\x00\x00\x48\x00\x00\x00\x1b\x04\x03\x00\x00\x00\x2d\xd9\xd4" .
|
|
||||||
"\x2d\x00\x00\x00\x18\x50\x4c\x54\x45\xff\xff\xff\x60\x60\x5d\xb0" .
|
|
||||||
"\xaf\xaa\x00\x80\x00\xce\xcd\xc7\xc0\x00\x00\xe8\xe8\xe6\xf7\xf7" .
|
|
||||||
"\xf6\x95\x0c\xa7\x47\x00\x00\x00\x73\x49\x44\x41\x54\x28\xcf\x63" .
|
|
||||||
"\x48\x67\x20\x04\x4a\x5c\x18\x0a\x08\x2a\x62\x53\x61\x20\x02\x08" .
|
|
||||||
"\x0d\x69\x45\xac\xa1\xa1\x01\x30\x0c\x93\x60\x36\x26\x52\x91\xb1" .
|
|
||||||
"\x01\x11\xd6\xe1\x55\x64\x6c\x6c\xcc\x6c\x6c\x0c\xa2\x0c\x70\x2a" .
|
|
||||||
"\x62\x06\x2a\xc1\x62\x1d\xb3\x01\x02\x53\xa4\x08\xe8\x00\x03\x18" .
|
|
||||||
"\x26\x56\x11\xd4\xe1\x20\x97\x1b\xe0\xb4\x0e\x35\x24\x71\x29\x82" .
|
|
||||||
"\x99\x30\xb8\x93\x0a\x11\xb9\x45\x88\xc1\x8d\xa0\xa2\x44\x21\x06" .
|
|
||||||
"\x27\x41\x82\x40\x85\xc1\x45\x89\x20\x70\x01\x00\xa4\x3d\x21\xc5" .
|
|
||||||
"\x12\x1c\x9a\xfe\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82";
|
|
||||||
}
|
|
||||||
|
|
||||||
sub git_project_list {
|
sub git_project_list {
|
||||||
my $order = $cgi->param('o');
|
my $order = $cgi->param('o');
|
||||||
if (defined $order && $order !~ m/project|descr|owner|age/) {
|
if (defined $order && $order !~ m/project|descr|owner|age/) {
|
||||||
|
|
Loading…
Reference in a new issue