--- loncom/interface/lonnavmaps.pm	2002/07/08 20:27:10	1.38
+++ loncom/interface/lonnavmaps.pm	2002/08/21 17:18:08	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.38 2002/07/08 20:27:10 www Exp $
+# $Id: lonnavmaps.pm,v 1.43 2002/08/21 17:18:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -411,10 +411,10 @@ sub handler {
     if ($ENV{'request.course.fn'}) {
 	$fn=$ENV{'request.course.fn'};
 	if (-e "$fn.db") {
-	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) &&
+	    if ((tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640)) &&
 		(tie(%parmhash,'GDBM_File',
 		     $ENV{'request.course.fn'}.'_parms.db',
-		     &GDBM_READER,0640))) {
+		     &GDBM_READER(),0640))) {
 		$hashtied=1;
 	    }
 	}
@@ -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 {
@@ -567,16 +569,19 @@ 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>'.
-		      "<h3>$date</h3>");
+	    $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");
 	    $r->rflush();
 	    $r->print('<img src="/adm/lonMisc/chat.gif"> New discussion since '.
 		      localtime($lastcheck).
@@ -716,7 +721,8 @@ sub handler {
 			$r->print($add.$indentstr);
 			if ($rid) {
 			    $r->print('<a href="'.$hash{'src_'.$linkid}.
-                                      '?symb='.&Apache::lonnet::escape($symb)
+                                      (($hash{'src_'.$linkid}=~/\?/)?'&':'?').
+                                      'symb='.&Apache::lonnet::escape($symb)
                                        .'">'.
 				      $hwk.$hash{'title_'.$rid}.$hwke.'</a>');
 			}
