--- loncom/publisher/londiff.pm	2001/05/02 21:35:15	1.2
+++ loncom/publisher/londiff.pm	2001/05/03 11:04:07	1.4
@@ -71,18 +71,22 @@ sub handler {
              $f1[$#f1+1]=$line;
 	 }
       }
+      $r->print('<h3>Construction Space Version</h3>');
   } else {
       my $fn=
        '/home/httpd/html//res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';
       if ($ENV{'form.versionone'}) {
          my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
+	 $r->print('<h3>Version '.$ENV{'form.versionone'}.'</h3>');
       } else {
          $fn.=$ENV{'form.filename'};
+	 $r->print('<h3>Current Version</h3>');
       }
       @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
   }
 
+  $r->print('versus');
 
   if ($ENV{'form.versiontwo'} eq 'priv') {
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};
@@ -94,14 +98,17 @@ sub handler {
              $f2[$#f2+1]=$line;
 	 }
       }
+      $r->print('<h3>Construction Space Version</h3>');
   } else {
       my $fn=
        '/home/httpd/html/res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';
       if ($ENV{'form.versiontwo'}) {
          my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
+	 $r->print('<h3>Version '.$ENV{'form.versiontwo'}.'</h3>');
       } else {
          $fn.=$ENV{'form.filename'};
+	 $r->print('<h3>Current Version</h3>');
       }
       @f2=split(/\n/,&Apache::lonnet::getfile($fn));      
   }
@@ -115,25 +122,22 @@ sub handler {
   my $chunk;
   my $line;
 
-  $r->print('<table border=2><tr><th>Version '.$ENV{'form.versionone'}.
-                    '</th><th>Version '.$ENV{'form.versiontwo'}.'</th>');
+  $r->print('<pre>');
+
   foreach $chunk (@$diffs) {
-    $r->print('</pre></tr><tr><td><pre>');
-    my $presign='-';  
+
     foreach $line (@$chunk) {
       my ($sign, $lineno, $text) = @$line;
-      if ($sign ne $presign) {
-	  $r->print('</pre></td><td><pre>');
-          $presign=$sign;
-      }
       $text=~s/\</\&lt\;/g;
       $text=~s/\>/\&gt\;/g;
-      $lineno=substr($lineno.'        ',0,8);
-      $r->print($lineno.' '.$text."\n");
+      $lineno=substr($lineno.'        ',0,7);
+      $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
+                $sign.' '.$lineno.' '.$text."</font>\n");
     }
+    $r->print("<hr>\n");
   }
+  $r->print('</pre>');
 
-  $r->print('</tr></table>');
 } else {
     $r->print('<h1><font color=red>Binary File</font></h1>');
 }