--- loncom/interface/lonnavmaps.pm	2010/06/16 23:42:55	1.448
+++ loncom/interface/lonnavmaps.pm	2010/06/24 14:21:39	1.449
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.448 2010/06/16 23:42:55 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.449 2010/06/24 14:21:39 bisitz Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1401,11 +1401,11 @@ sub render {
 	my ($link,$text);
         if ($condition) {
 	    $link='navmaps?condition=0&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Close all folders';
         } else {
 	    $link='navmaps?condition=1&filter=&'.$queryString.
-		'&here='.&escape($here);
+		'&here='.&escape($here);
 	    $text='Open all folders';
         }
         if ($env{'form.register'}) {
@@ -1715,7 +1715,7 @@ END
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
 	    my $srcHasQuestion = $src =~ /\?/;
 	    $args->{"resourceLink"} = $src.
-		($srcHasQuestion?'&':'?') .
+		($srcHasQuestion?'&':'?') .
 		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
@@ -1777,12 +1777,11 @@ END
     # it's quite likely this might fix other browsers, too, and 
     # certainly won't hurt anything.
     if ($displayedJumpMarker) {
-        $result .= "
-<script>
+        $result .= &Apache::lonhtmlcommon::scripttag("
 if (location.href.indexOf('#curloc')==-1) {
     setTimeout(\"location += '#curloc';\", 0)
 }
-</script>";
+");
     }
 
     $result.=&Apache::loncommon::end_data_table();