--- loncom/interface/lonnavmaps.pm	2005/12/20 16:43:27	1.355
+++ loncom/interface/lonnavmaps.pm	2006/02/24 23:19:54	1.364
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.355 2005/12/20 16:43:27 www Exp $
+# $Id: lonnavmaps.pm,v 1.364 2006/02/24 23:19:54 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -530,7 +530,8 @@ sub getDescription {
     if ($status == $res->PAST_DUE_NO_ANSWER) {
         return &mt("Was due")." " . timeToHumanString($res->duedate($part),'end');
     }
-    if ($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) {
+    if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
+	&& $res->handgrade($part) ne 'yes') {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -1094,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'};
         }
@@ -1111,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=';
@@ -1133,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 = "";
@@ -1142,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
@@ -1177,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;
@@ -1471,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 />';
 	    }
 	}
 
@@ -2065,15 +2067,16 @@ In order of increasing complexity and po
 
 =over 4
 
-=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb>, B<Url> or B<MapPc>. This provides
+=item * C<$navmap-E<gt>getByX>, where X is B<Id>, B<Symb> or B<MapPc> and getResourceByUrl. This provides
     various ways to obtain resource objects, based on various identifiers.
     Use this when you want to request information about one object or 
     a handful of resources you already know the identities of, from some
     other source. For more about Ids, Symbs, and MapPcs, see the
     Resource documentation. Note that Url should be a B<last resort>,
-    not your first choice; it only works when there is only one
+    not your first choice; it only really works when there is only one
     instance of the resource in the course, which only applies to
-    maps, and even that may change in the future.
+    maps, and even that may change in the future (see the B<getResourceByUrl>
+    documentation for more details.)
 
 =item * C<my @resources = $navmap-E<gt>retrieveResources(args)>. This
     retrieves resources matching some criterion and returns them
@@ -3656,9 +3659,8 @@ sub condition {
 }
 sub condval {
     my $self=shift;
-    my $uri=&Apache::lonnet::deversion(&Apache::lonnet::declutter($self->src()));
-    my ($pathname,$filename)=($uri=~m|(.*)/([^/]*)|);
-    $pathname=~s/^adm\/wrapper\///;    
+    my ($pathname,$filename) = 
+	&Apache::lonnet::split_uri_for_cond($self->src());
 
     my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
 	       /\&\Q$filename\E\:([\d\|]+)\&/);
@@ -3729,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;
@@ -3759,6 +3772,11 @@ sub is_survey {
     }
     return 0;
 }
+sub is_task {
+    my $self=shift;
+    my $src = $self->src();
+    return ($src =~ /\.(task)$/)
+}
 
 sub is_empty_sequence {
     my $self=shift;
@@ -4272,7 +4290,8 @@ sub extractParts {
         # where the part names begin and end, and even then, it is possible
         # to construct ambiguous situations.
         foreach (split /,/, $metadata) {
-            if ($_ =~ /^([a-zA-Z]+)response_(.*)/) {
+            if ($_ =~ /^([a-zA-Z]+)response_(.*)/
+		|| $_ =~ /^(Task)_(.*)/) {
                 my $responseType = $1;
                 my $partStuff = $2;
                 my $partIdSoFar = '';