--- loncom/publisher/londiff.pm 2008/11/20 14:37:30 1.25 +++ loncom/publisher/londiff.pm 2010/12/14 16:26:04 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.25 2008/11/20 14:37:30 jms Exp $ +# $Id: londiff.pm,v 1.28 2010/12/14 16:26:04 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -107,15 +107,19 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(&Apache::loncommon::start_page('Resource Differences')); - + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - $r->print('
' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($cuname,$cudom) + .' ('.$cuname.':'.$cudom.')') + .'
' + ); } @@ -176,28 +180,27 @@ sub handler { # Run diff my $diffs = diff(\@f1, \@f2); - -# Start page output - my $chunk; - my $line; - - $r->print('');
-
- foreach $chunk (@$diffs) {
-
- foreach $line (@$chunk) {
- my ($sign, $lineno, $text) = @$line;
- $text=&HTML::Entities::encode($text,'<>&"');
- $lineno=substr($lineno.' ',0,7);
- $r->print(''.
- $sign.' '.$lineno.' '.$text."\n");
- }
- $r->print("
\n"); - } - $r->print(''); - + if (@$diffs) { + # Start page output + my $chunk; + my $line; + $r->print('
');
+ foreach $chunk (@$diffs) {
+ foreach $line (@$chunk) {
+ my ($sign, $lineno, $text) = @$line;
+ $text=&HTML::Entities::encode($text,'<>&"');
+ $lineno=substr($lineno.' ',0,7);
+ $r->print(''.
+ $sign.' '.$lineno.' '.$text."\n");
+ }
+ $r->print("
\n"); + } + $r->print(''); + } else { + $r->print('
'.&mt('No differences found').'
'); + } } else { $r->print('