--- loncom/interface/lonnavmaps.pm	2001/01/11 16:25:40	1.6
+++ loncom/interface/lonnavmaps.pm	2001/01/16 22:19:18	1.7
@@ -45,14 +45,20 @@ sub tracetable {
        $beenhere.=$rid.'&';  
 
        if (defined($hash{'is_map_'.$rid})) {
-           $sofar++;      
+           $sofar++;
+           my $tprefix='';
+           if ($hash{'map_type_'.$hash{'map_pc_'.$hash{'src_'.$rid}}} 
+            eq 'sequence') { 
+               $tprefix='h'; 
+           }
            if (defined($rows[$sofar])) {
-              $rows[$sofar].='&h'.$rid;
+              $rows[$sofar].='&'.$tprefix.$rid;
            } else {
-              $rows[$sofar]='h'.$rid;
+              $rows[$sofar]=$tprefix.$rid;
            }
            if ((defined($hash{'map_start_'.$hash{'src_'.$rid}})) &&
-               (defined($hash{'map_finish_'.$hash{'src_'.$rid}}))) {
+               (defined($hash{'map_finish_'.$hash{'src_'.$rid}})) &&
+               ($tprefix eq 'h')) {
               my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}};
 	      $sofar=
                 &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}},
@@ -61,10 +67,14 @@ sub tracetable {
               if ($hash{'src_'.$frid}) {
                my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid});
                if (($brepriv eq '2') || ($brepriv eq 'F')) {
+		 my $pprefix='';
+                 if ($hash{'src_'.$frid}=~/\.problem$/) {
+		     $pprefix='p1';
+                 }
                  if (defined($rows[$sofar])) {
-                   $rows[$sofar].='&'.$frid;
+                   $rows[$sofar].='&'.$pprefix.$frid;
                  } else {
-                   $rows[$sofar]=$frid;
+                   $rows[$sofar]=$pprefix.$frid;
                  }
 	       }
 	      }
@@ -74,10 +84,14 @@ sub tracetable {
           if ($hash{'src_'.$rid}) {
            my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$rid});
            if (($brepriv eq '2') || ($brepriv eq 'F')) {
+	     my $pprefix='';
+             if ($hash{'src_'.$rid}=~/\.problem$/) {
+	         $pprefix='p1';
+             }
              if (defined($rows[$sofar])) {
-               $rows[$sofar].='&'.$rid;
+                $rows[$sofar].='&'.$pprefix.$rid;
              } else {
-               $rows[$sofar]=$rid;
+               $rows[$sofar]=$pprefix.$rid;
              }
 	   }
           }
@@ -198,14 +212,31 @@ sub handler {
                           for ($j=0;$j<=$#colcont;$j++) {
                               my $rid=$colcont[$j];
                               my $add='<td>&nbsp;&nbsp;';
+                              my $adde='</td>';
+                              my $hwk='<font color="#223322">';
+                              my $hwke='</font>';
                               if ($rid=~/^h(.+)/) {
 				  $rid=$1;
                                   $add='<th bgcolor="#AAFF55">';
+                                  $adde='</th>';
+                              }
+                              if ($rid=~/^p(\d)(.+)/) {
+                                  my $code=$1;
+                                  $rid=$2;
+                                  $hwk='<font color="#999911">';
+                                  if ($code eq '2') {
+                                     $hwk='<font color="#999911"><b>';
+                                     $hwke='</b></font>';
+                                  }
+                                  if ($code eq '3') {
+                                     $hwk='<font color="#229922">';
+                                  } elsif ($code eq '4') {
+                                     $hwk='<font color="#992222">';
+                                  }
                               }
-                              $r->print($add.'<a href="'.
-                                $hash{'src_'.$rid}.'">'.
-                                $hash{'title_'.$rid}.'</a>');
-                              $r->print('</td>');
+                              $r->print($add.'<a href="'.$hash{'src_'.$rid}.
+                                '">'.$hwk.
+                                $hash{'title_'.$rid}.$hwke.'</a>'.$adde);
                           }
                           $r->print('</tr>');
 		        }