From: Kay Sievers Date: Sun, 7 Aug 2005 18:18:44 +0000 (+0200) Subject: v080 X-Git-Tag: v1.4.0~1^2~105 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=927dcec4805b32b1f7252e0c4dea341df166deb0;p=git.git v080 --- diff --git a/gitweb.cgi b/gitweb.cgi index fdc018533..fa2ba70aa 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -14,7 +14,7 @@ use CGI::Carp qw(fatalsToBrowser); my $cgi = new CGI; -my $version = "078"; +my $version = "080"; my $projectroot = "/pub/scm"; my $home_link = "/git"; my $gitbin = "/usr/bin"; @@ -97,28 +97,29 @@ sub git_header_html { display:block; margin:0px 25px; padding:8px; font-weight:bold; background-color:#d9d8d1; color:#000000; } - a.log_title { - display:block; margin:0px 25px; padding:6px; - font-weight:bold; background-color:#d9d8d1; text-decoration:none; color:#000000; + a.title { + display:block; margin:0px 25px; padding:6px 8px; + font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000; } - a.log_title:hover { background-color: #c9c8c1; } - div.log_head { - margin:0px 25px; padding:8px; - border: solid #d9d8d1; border-width:0px 1px; font-family:monospace; - background-color: #edece6; + a.title:hover { background-color: #d9d8d1; } + div.title2 { + margin:0px 25px; padding:6px 8px; + border: solid #d9d8d1; border-width:0px 1px 1px; } div.log_body { margin:0px 25px; padding:8px; padding-left:150px; border:solid #d9d8d1; border-width:0px 1px; } - span.log_age { position:relative; float:left; width:142px; } - div.log_link { font-size:10px; font-family:sans-serif; position:relative; float:left; width:142px; } - a.list { - display:block; margin:0px 25px; padding:4px; border:solid #d9d8d1; border-width:0px 1px; - font-weight:bold; background-color: #edece6; text-decoration:none; color:#000000; + span.log_age { position:relative; float:left; width:142px; font-style:italic; } + div.log_link { font-size:10px; font-family:sans-serif; font-style:normal; position:relative; float:left; width:142px; } + div.list { + display:block; margin:0px 25px; padding:4px 6px 0px; border:solid #d9d8d1; border-width:1px 1px 0px; + font-weight:bold; } - a.list:hover { background-color: #d9d8d1; } - div.link { margin:0px 25px; padding:4px 8px; border:solid #d9d8d1; border-width:0px 1px; font-family:sans-serif; font-size:10px; } + div.list a { text-decoration:none; color:#000000; } + div.list a:hover { color:#880000; } + div.link { margin:0px 25px; padding:0px 6px; border:solid #d9d8d1; border-width:0px 1px; font-family:sans-serif; font-size:10px; } + td.key { padding-right:10px; } a.xml_logo { float:right; border:1px solid; line-height:15px; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e; width:35px; @@ -413,7 +414,7 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; } else { print "
\n"; @@ -477,15 +478,15 @@ if ($action eq "blob") { last; } print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "log_title"}, + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit", -class => "title"}, "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n" . + print "
\n" . "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$commit"}, "commit") . " | " . $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$commit"}, "diff") . "
\n" . "
\n" . - escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . + "" . escapeHTML($co{'author_name'}) . " [" . $ad{'rfc2822'} . "]
\n" . "
\n" . "
\n"; my $comment = $co{'comment'}; @@ -532,37 +533,41 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commitdiff;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; - print "
\n"; - print "author      " . escapeHTML($co{'author'}) . "
\n"; - print "author-time " . $ad{'rfc2822'}; - if ($ad{'hour_local'} < 6) { print ""; } + print "
\n" . + ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { - print "parent      " . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; + print "\n"; } - print "\n"; + print "
author" . escapeHTML($co{'author'}) . "
" . + " " . $ad{'rfc2822'}; + if ($ad{'hour_local'} < 6) { + print ""; + } printf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}); - if ($ad{'hour_local'} < 6 ) { print ""; } - print "
\n"; - print "committer   " . escapeHTML($co{'committer'}) . "
\n"; - print "commit-time " . $cd{'rfc2822'}; - printf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}); - print "
\n"; - print "commit      $hash
\n"; - print "tree        " . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
\n"; + if ($ad{'hour_local'} < 6 ) { + print ""; + } + print "\n" . + "
committer" . escapeHTML($co{'committer'}) . "
" . + " " . $cd{'rfc2822'} . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "\n" . + "
commit$hash
tree" . $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, $co{'tree'}) . "
parent" . $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$par"}, $par) . "
\n"; print "
\n"; my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/(signed-off|acked)-by:/i) { - print "" . escapeHTML($line) . "
\n"; + print "" . escapeHTML($line) . "
\n"; } else { print escapeHTML($line) . "
\n"; } } - print "

\n" . - "
\n"; + print "
\n"; foreach my $line (@difftree) { # '*100644->100644 blob 9f91a116d91926df3ba936a80f020a6ab1084d2b->bb90a0c3a91eb52020d0db0e8b4f94d30e02d596 net/ipv4/route.c' # '+100644 blob 4a83ab6cd565d21ab0385bac6643826b83c2fcd4 arch/arm/lib/bitops.h' @@ -577,18 +582,18 @@ if ($action eq "blob") { my $mode_chng = ""; if ($type eq "blob") { if ($op eq "+") { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id", -class => "list"}, - escapeHTML($file) . " [new]") . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, + escapeHTML($file) . " [new]") . "\n" . "
"; print "
\n" . "view " . $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, "file") . "

\n" . "
\n"; } elsif ($op eq "-") { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id", -class => "list"}, - escapeHTML($file) . " [removed]") . "\n" . + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blob;h=$id"}, + escapeHTML($file) . " [removed]") . "\n" . "
"; print "
\n" . "view " . @@ -604,10 +609,10 @@ if ($action eq "blob") { my $to_mode = $2; my $mode_chnge = ""; if ($from_mode != $to_mode) { - $mode_chnge = " [chmod $mode]\n"; + $mode_chnge = " [chmod $mode]\n"; } - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id", -class => "list"}, + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=blobdiff;h=$to_id"}, escapeHTML($file) . $mode_chnge) . "\n" . "
\n"; print "
\n" . @@ -649,7 +654,7 @@ if ($action eq "blob") { $cgi->a({-href => "$my_uri?p=$project;a=tree;h=$hash"}, "tree") . "\n" . "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($co{'title'})) . "\n" . "
\n"; print "
\n" . "
\n";
@@ -689,10 +694,7 @@ if ($action eq "blob") {
 	print "
\n"; print "

\n"; print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "log_title"}, escapeHTML($file_name)) . "\n" . - "
\n"; - print "
\n" . - "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$hash", -class => "title"}, escapeHTML($file_name)) . "\n" . "
\n"; foreach my $rev (@revlist) { my %co = git_commit($rev); @@ -713,8 +715,8 @@ if ($action eq "blob") { } } if ($found) { - print "
\n" . - $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev", -class => "list"}, + print "
\n" . + $cgi->a({-href => "$my_uri?p=$project;a=commit;h=$rev"}, "" . $co{'age_string'} . "" . escapeHTML($co{'title'})) . "\n" . "
\n"; print "
\n" .