--- loncom/interface/lonnavmaps.pm	2002/09/03 01:23:35	1.41.2.1
+++ loncom/interface/lonnavmaps.pm	2002/09/02 18:25:55	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.41.2.1 2002/09/03 01:23:35 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.45 2002/09/02 18:25:55 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -339,7 +339,7 @@ sub tracetable {
     my ($sofar,$rid,$beenhere,$showtypes,$indent,$linkid)=@_;
     my $newshowtypes=$showtypes;
     my $further=$sofar;
-    #$Apache::lonxml::debug=1;
+# $Apache::lonxml::debug=1;
     &Apache::lonxml::debug("$rid ; $linkid ; $sofar ; $beenhere ; ".$hash{'src_'.$rid});
     if ($beenhere=~/\&$rid\&/) { return $further; }
     $beenhere.=$rid.'&';
@@ -434,8 +434,10 @@ sub handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
-    my $firstres=$hash{'map_start_/res/'.$ENV{'request.course.uri'}};
-    my $lastres=$hash{'map_finish_/res/'.$ENV{'request.course.uri'}};
+    my $firstres=$hash{'map_start_'.
+           &Apache::lonnet::clutter($ENV{'request.course.uri'})};
+    my $lastres=$hash{'map_finish_'.
+           &Apache::lonnet::clutter($ENV{'request.course.uri'})};
     if (!(($firstres) && ($lastres))) {
 	$r->print('<html><body>Coursemap undefined.</body></html>');
     } else {
@@ -561,15 +563,16 @@ sub handler {
 		}
 	    }
 # ----------------------------------------------------------- Start Page Output
-	    $r->print('<html><head><title>Navigate LON-CAPA Maps</title></head>');
-	    $r->print('<body bgcolor="#FFFFFF"');
+            my $bodytagadd='';
+	    $r->print(
+                   '<html><head><title>Navigate Course Map</title></head>');
 	    if (($currenturl=~/^\/res/) &&
 		($currenturl!~/^\/res\/adm/)) {
-		$r->print(' onLoad="window.location.hash='."'curloc'".'"');
+		$bodytagadd='onLoad="window.location.hash='."'curloc'".'"';
 	    }
-	    $r->print('><script>window.focus();</script>'.
-		      '<img align=right src=/adm/lonIcons/lonlogos.gif>'.
-		      '<h1>Navigate Course Map</h1>');
+	    $r->print(&Apache::loncommon::bodytag('Navigate Course Map','',
+                                                  $bodytagadd));
+	    $r->print('<script>window.focus();</script>');
 	    my $desc=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 	    if (defined($desc)) { $r->print("<h2>$desc</h2>\n"); }
 	    $r->print("<h3>$date</h3>\n");
@@ -604,10 +607,14 @@ sub handler {
 		    $r->print("\n<tr>");
 		    my @colcont=split(/\&/,$rows[$i]);
 		    my $avespan=$lcm/($#colcont+1);
+
+		    # for each item I wish to print on this row...
 		    for ($j=0;$j<=$#colcont;$j++) {
 			my $indent;my $indentstr;
 			my $linkid;
 			my $rid=$colcont[$j];
+
+			# bug? $rid can't accept a list of two elements
                         $rid=~/(\d+)\.(\d+)$/;
 			my $src=
 			   &Apache::lonnet::declutter($hash{'src_'.$1.'.'.$2});
@@ -645,7 +652,7 @@ sub handler {
 			    } elsif ($code eq '4') {
 				$add='<td bgcolor="#E0FFAA">';
 			    } else {
-				$add='<td bgcolor="#FFAAAA">';
+				$add='<td bgcolor="#CCCCFF">';
 				if ($tcode eq '2') {
 				    $add='<td bgcolor="#FFFFAA">';
 				}
