--- loncom/interface/lonnavmaps.pm	2006/02/14 15:58:47	1.360
+++ 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.360 2006/02/14 15:58:47 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.365 2006/03/02 19:45:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1095,7 +1095,7 @@ sub render_resource {
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon ='<img src="'.$location.'/problem.gif" alt="&nbsp;&nbsp;" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="'.&mt('Problem').'" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
@@ -1112,11 +1112,12 @@ sub render_resource {
         }
 
 	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
-
+        my $title=$resource->title;
+        $title=~s/\"/\&quot;/g;
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-	    $icon = "<img src='$location/$icon' alt='".
-		($nowOpen ? 'Open Folder' : 'Close Folder')."' 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=';
@@ -1134,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 ? 'Open Folder' : 'Close Folder')."' border='0' />";
+            $icon = "<img src='$location/$icon' alt=\"".
+		($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -1143,10 +1144,10 @@ sub render_resource {
     }
 
     if ($resource->randomout()) {
-        $nonLinkedText .= ' <i>(hidden)</i> ';
+        $nonLinkedText .= ' <i>('.&mt('hidden').')</i> ';
     }
     if (!$resource->condval()) {
-        $nonLinkedText .= ' <i>(conditionally hidden)</i> ';
+        $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
     }
     
     # We're done preparing and finally ready to start the rendering
@@ -1178,13 +1179,13 @@ sub render_resource {
     if ($resource->is_problem() && $part ne '0' && 
         !$params->{'condensed'}) {
 	my $displaypart=$resource->part_display($part);
-        $partLabel = " (Part: $displaypart)";
+        $partLabel = " (".&mt('Part: [_1]', $displaypart).")";
 	if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); }
         $title = "";
     }
 
     if ($params->{'condensed'} && $resource->countParts() > 1) {
-        $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
+        $nonLinkedText .= ' ('.&mt('[_1] parts', $resource->countParts()).')';
     }
 
     my $target;
@@ -1472,8 +1473,8 @@ sub render {
             $navmap = Apache::lonnavmaps::navmap->new();
 	    if (!defined($navmap)) {
 		# no londer in course
-		return '<font color="red">No course selected</font><br />
-                        <a href="/adm/roles">Select a course</a><br />';
+		return '<font color="red">'.&mt('No course selected').'</font><br />
+                        <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
 	    }
 	}
 
@@ -2755,7 +2756,7 @@ sub usedVersion {
 1;
 
 package Apache::lonnavmaps::iterator;
-use WeakRef;
+use Scalar::Util qw(weaken);
 use Apache::lonnet;
 
 =pod
@@ -3236,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
@@ -3420,7 +3421,7 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::resource;
-use WeakRef;
+use Scalar::Util qw(weaken);
 use Apache::lonnet;
 
 =pod
@@ -3730,10 +3731,21 @@ sub is_page {
     return $self->navHash("is_map_", 1) && 
 	$self->navHash("map_type_" . $self->map_pc()) eq 'page';
 }
+sub is_practice {
+    my $self=shift;
+    my ($part) = @_;
+    if ($self->parmval('type',$part) eq 'practice') {
+        return 1;
+    }
+    return 0;
+}
 sub is_problem {
     my $self=shift;
     my $src = $self->src();
-    return ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/)
+    if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+	return !($self->is_practice());
+    }
+    return 0;
 }
 sub contains_problem {
     my $self=shift;