--- loncom/interface/lonnavmaps.pm	2006/02/24 22:35:12	1.362
+++ loncom/interface/lonnavmaps.pm	2006/03/02 19:45:22	1.365
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.362 2006/02/24 22:35:12 www Exp $
+# $Id: lonnavmaps.pm,v 1.365 2006/03/02 19:45:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1113,11 +1113,11 @@ sub render_resource {
 
 	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
         my $title=$resource->title;
-        $title=~s/\'/ /g;
+        $title=~s/\"/\"/g;
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-	    $icon = "<img src='$location/$icon' alt='".
-		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."' border='0' />";
+	    $icon = "<img src='$location/$icon' alt=\"".
+		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
             $linkopen = "<a href=\"" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -1135,8 +1135,8 @@ sub render_resource {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='$location/$icon' alt='".
-		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."' border='0' />";
+            $icon = "<img src='$location/$icon' alt=\"".
+		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1179,13 +1179,13 @@ sub render_resource {
     if ($resource->is_problem() && $part ne '0' && 
         !$params->{'condensed'}) {
 	my $displaypart=$resource->part_display($part);
-        $partLabel = " (".&mt('Part').": $displaypart)";
+        $partLabel = " (".&mt('Part: [_1]', $displaypart).")";
 	if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); }
         $title = "";
     }
 
     if ($params->{'condensed'} && $resource->countParts() > 1) {
-        $nonLinkedText .= ' (' . $resource->countParts() . ' '.&mt('parts').')';
+        $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
     }
 
     my $target;
@@ -2756,7 +2756,7 @@ sub usedVersion {
 1;
 
 package Apache::lonnavmaps::iterator;
-use WeakRef;
+use Scalar::Util qw(weaken);
 use Apache::lonnet;
 
 =pod
@@ -3237,7 +3237,7 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::DFSiterator;
-use WeakRef;
+use Scalar::Util qw(weaken);
 use Apache::lonnet;
 
 # Not documented in the perldoc: This is a simple iterator that just walks
@@ -3421,7 +3421,7 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::resource;
-use WeakRef;
+use Scalar::Util qw(weaken);
 use Apache::lonnet;
 
 =pod