--- loncom/interface/lonnavmaps.pm	2003/04/04 21:36:01	1.174
+++ loncom/interface/lonnavmaps.pm	2003/04/19 20:47:41	1.177
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.174 2003/04/04 21:36:01 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.177 2003/04/19 20:47:41 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -343,14 +343,9 @@ sub lastTry {
 }
 
 # This puts a human-readable name on the ENV variable.
-# FIXME: This needs better logic: Who gets the advanced view of navmaps?
-#   As of 3-13-03, it's an open question. Guy doesn't want to check
-#   roles directly because it should be a check of capabilities for future
-#   role compatibity. There is no capability that matches this one for
-#   now, so this is done. (A hack for 1.0 might be to simply check roles
-#   anyhow.)
+
 sub advancedUser {
-    return $ENV{'user.adv'};
+    return $ENV{'request.role.adv'};
 }
 
 
@@ -1000,8 +995,8 @@ sub render {
         # Step two: Locate what kind of here marker is necessary
         # Determine where the "here" marker is and where the screen jumps to.
 
-        if ($ENV{'form.symb'}) {
-            $here = $jump = $ENV{'form.symb'};
+        if ($ENV{'form.postsymb'}) {
+            $here = $jump = $ENV{'form.postsymb'};
         } elsif ($ENV{'form.postdata'}) {
             # couldn't find a symb, is there a URL?
             my $currenturl = $ENV{'form.postdata'};
@@ -1351,7 +1346,7 @@ sub render {
         $r->rflush();
     }
         
-    #if ($mustCloseNavMap) { $navmap->untieHashes(); } 
+    if ($mustCloseNavMap) { $navmap->untieHashes(); } 
 
     return $result;
 }
@@ -2690,6 +2685,7 @@ sub to { my $self=shift; return $self->n
 sub compTitle {
     my $self = shift;
     my $title = $self->title();
+    $title=~s/\&colon\;/\:/gs;
     if (!$title) {
         $title = $self->src();
         $title = substr($title, rindex($title, '/') + 1);