| version 1.24, 2003/04/25 03:44:14 |
version 1.25, 2003/04/25 04:29:44 |
|
|
| # $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ |
# $Idaemons: /home/cvs/cvsweb/cvsweb.cgi,v 1.84 2001/10/07 20:50:10 knu Exp $ |
| # |
# |
| # DONT'T delete lines between '$''Idaemons' and '$''Platon' -- patches from FreeBSD failed then |
# DONT'T delete lines between '$''Idaemons' and '$''Platon' -- patches from FreeBSD failed then |
| # $Platon: scripts/cgi/cvsweb/cvsweb.cgi,v 1.23 2003/02/20 13:55:46 rajo Exp $ |
# $Platon: scripts/cgi/cvsweb/cvsweb.cgi,v 1.24 2003/04/25 03:44:14 rajo Exp $ |
| # |
# |
| ### |
### |
| |
|
| Line 2632 sub printLog($;$) |
|
| Line 2632 sub printLog($;$) |
|
| $diffrev{$curr_rev} = 1; |
$diffrev{$curr_rev} = 1; |
| $diffrev{""} = 1; |
$diffrev{""} = 1; |
| print '<br>'; |
print '<br>'; |
| my $diff = 'Diff'; |
my $diff = _('Diff'); |
| |
|
| # |
# |
| # Offer diff to previous revision |
# Offer diff to previous revision |
| Line 2642 sub printLog($;$) |
|
| Line 2642 sub printLog($;$) |
|
| my $url = |
my $url = |
| sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $prev, $curr_rev, $barequery); |
sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $prev, $curr_rev, $barequery); |
| |
|
| print $diff, " to previous "; |
print $diff, _(' to previous '); |
| $diff = ''; |
$diff = ''; |
| printDiffLinks($prev, $url); |
printDiffLinks($prev, $url); |
| } |
} |
| Line 2657 sub printLog($;$) |
|
| Line 2657 sub printLog($;$) |
|
| my $url = |
my $url = |
| sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $brp, $curr_rev, $barequery); |
sprintf('%s.diff?r1=%s&r2=%s%s', $scriptwhere, $brp, $curr_rev, $barequery); |
| |
|
| print $diff, " to branchpoint "; |
print $diff, _(' to branchpoint '); |
| $diff = ''; |
$diff = ''; |
| printDiffLinks($brp, $url); |
printDiffLinks($brp, $url); |
| } |
} |
| Line 2710 sub printLog($;$) |
|
| Line 2710 sub printLog($;$) |
|
| my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
my $url = sprintf('%s.diff?r1=%s&r2=%s%s', |
| $scriptwhere, $input{'r1'}, $curr_rev, $barequery); |
$scriptwhere, $input{'r1'}, $curr_rev, $barequery); |
| |
|
| print $diff, " to selected "; |
print $diff, _(' to selected '); |
| $diff = ''; |
$diff = ''; |
| printDiffLinks($input{'r1'}, $url); |
printDiffLinks($input{'r1'}, $url); |
| } |
} |
| Line 2976 sub human_readable_diff($) |
|
| Line 2976 sub human_readable_diff($) |
|
| my ($fh, $rev) = @_; |
my ($fh, $rev) = @_; |
| my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2); |
my ($date1, $date2, $r1d, $r2d, $r1r, $r2r, $rev1, $rev2, $sym1, $sym2); |
| my (@rightCol, @leftCol); |
my (@rightCol, @leftCol); |
| |
my $tmp_str = ""; |
| |
|
| ($where_nd = $where) =~ s/.diff$//; |
($where_nd = $where) =~ s/.diff$//; |
| ($filename = $where_nd) =~ s/^.*\///; |
($filename = $where_nd) =~ s/^.*\///; |
| Line 3000 sub human_readable_diff($) |
|
| Line 3001 sub human_readable_diff($) |
|
| $date2 = $r2d; |
$date2 = $r2d; |
| } |
} |
| |
|
| print "<h3 style=\"text-align: center\">", |
$tmp_str = sprintf _('Diff for %s between version %s and %s'), $where_nd, $rev1, $rev2; |
| _("Diff for %s between version %s and %s"), $where_nd, $rev1, $rev2, "</h3>\n", |
print "<h3 style=\"text-align: center\">", $tmp_str, "</h3>\n", |
| |
|
| # Using style=\"border: none\" here breaks NS 4.x badly... |
# Using style=\"border: none\" here breaks NS 4.x badly... |
| "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n", |
"<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%\">\n", |