--- loncom/publisher/londiff.pm	2001/05/02 21:01:47	1.1
+++ loncom/publisher/londiff.pm	2001/05/02 23:00:05	1.3
@@ -49,6 +49,18 @@ sub handler {
   my @f1=();
   my @f2=();
 
+  $r->content_type('text/html');
+  $r->send_http_header;
+
+  $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
+
+  $r->print('<body bgcolor="#FFFFFF">');
+
+  
+  $r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');
+
+ if (&Apache::lonnet::fileembstyle(($ENV{'form.filename'}=~/\.(\w+)$/)) eq
+      'ssi') {
   if ($ENV{'form.versionone'} eq 'priv') {
       my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};
       if (-e $fn) {
@@ -100,39 +112,28 @@ sub handler {
 
 # Start page output
 
-  $r->content_type('text/html');
-  $r->send_http_header;
-
-  $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
-
-  $r->print('<body bgcolor="#FFFFFF">');
-
-  
-  $r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');
-
   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>');
+}
   $r->print('</body></html>');
   return OK;  
 }
@@ -143,3 +144,4 @@ __END__
 
 
 
+
