--- loncom/interface/lonnavmaps.pm	2009/10/22 03:04:21	1.436
+++ loncom/interface/lonnavmaps.pm	2010/11/15 22:46:47	1.440.2.3
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.436 2009/10/22 03:04:21 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.440.2.3 2010/11/15 22:46:47 raeburn Exp $
+
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -504,10 +505,13 @@ my %statusIconMap =
      $resObj->ERROR        => ''
      );
 
-my %iconAltTags = 
-    ( 'navmap.correct.gif' => 'Correct',
-      'navmap.wrong.gif'   => 'Incorrect',
-      'navmap.open.gif'    => 'Open' );
+my %iconAltTags =   #texthash does not work here
+    ( 'navmap.correct.gif'  => 'Correct',
+      'navmap.wrong.gif'    => 'Incorrect',
+      'navmap.open.gif'     => 'Open',
+      'navmap.partial.gif'  => 'Partially Correct',
+      'navmap.ellipsis.gif' => 'Attempted',
+     );
 
 # Defines a status->color mapping, null string means don't color
 my %colormap = 
@@ -597,7 +601,7 @@ sub getLinkForResource {
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
 		my $url=&Apache::lonnet::clutter($map);
-		$anchor=&escape($src->shown_symb());
+		$anchor=&escape($res->shown_symb());
 		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
@@ -695,7 +699,11 @@ sub getDescription {
         return &mt("Excused by instructor");
     }
     if ($status == $res->ATTEMPTED) {
-        return &mt("Answer submitted, not yet graded");
+        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
+            return &mt('Question(s) submitted for review');
+        } else {
+            return &mt("Answer submitted, not yet graded");
+        }
     }
     if ($status == $res->TRIES_LEFT) {
         my $tries = $res->tries($part);
@@ -715,7 +723,11 @@ sub getDescription {
         }
     }
     if ($status == $res->ANSWER_SUBMITTED) {
-        return &mt('Answer submitted');
+        if ($res->src() eq '/res/gci/gci/internal/submission.problem') {
+            return &mt('Question(s) submitted for review');
+        } else {
+            return &mt('Answer submitted');
+        }
     }
 }
 
@@ -1090,7 +1102,7 @@ sub render_quick_status {
         if ($icon) {
 	    my $location=
 		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
-            $result .= "$linkopen<img src='$location' alt='$alt' />$linkclose";
+		$result .= $linkopen.'<img src="'.$location.'" alt="'.&mt($alt).'" title="'.&mt($alt).'" />'.$linkclose;            
         } else {
             $result .= "&nbsp;";
         }
@@ -1484,12 +1496,7 @@ END
    
     if ($args->{'caller'} eq 'navmapsdisplay') {
         $result .= '<table><tr><td>'.
-                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td>';
-	if ($env{'environment.remotenavmap'} ne 'on') {
-	    $result .= '<td>&nbsp;</td>'; 
-        } else {
-	    $result .= '</tr><tr>'; 
-        }
+                   &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',undef,'RAT').'</td><td>&nbsp;</td>';
 	$result.="<td class=\"LC_middle\">".mt('Tools:')."</td>";
 	$result.=&show_linkitems_toolbar($args->{'linkitems'});
         if ($args->{'sort_html'}) {
@@ -1497,7 +1504,7 @@ END
 		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
 		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
 	    } else {
-		$result.='</tr><tr><td align="left"><br />'.
+		$result.='</tr><tr><td align="left" colspan="4"><br />'.
 		    $args->{'sort_html'}.'</td></tr>';
 	    }
 	}
@@ -1524,7 +1531,6 @@ END
         ( $res->NETWORK_FAILURE    => 1,
           $res->NOTHING_SET        => 1,
           $res->CORRECT            => 1 );
-    my @backgroundColors = ("LC_trEven", "LC_trOdd");
 
     # Shared variables
     $args->{'counter'} = 0; # counts the rows
@@ -1759,7 +1765,6 @@ END
         # show them.
         foreach my $part (@parts) {
             $rownum ++;
-            my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
             
             $result .= &Apache::loncommon::start_data_table_row();
 
@@ -1882,7 +1887,7 @@ sub show_linkitems_toolbar {
     my $result .=' 
               <td align="left">
                        <span class="LC_nobreak">'."\n<ul id=\"LC_toolbar\">";
-	foreach my $link (@linkorder) {
+    foreach my $link (@linkorder) {
         my $link_id = "LC_content_toolbar_".$link;
 	if (defined($linkitems->{$link})) {
 	    if ($linkitems->{$link}{'text'} ne '') {
@@ -1902,6 +1907,14 @@ sub show_linkitems_toolbar {
 	    }
 	}
     }
+    if ($env{'environment.remotenavmap'} eq 'on') {
+        if (&Apache::loncommon::needs_gci_custom()) {
+            if ($env{'request.course.id'} &&
+                &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                $result .= '<li><a target="loncapaclient" href="/adm/menu" id="LC_content_toolbar_management" class="LC_toolbarItem" title="'.&mt('Test Management').'" /></a></li>';
+            }
+        }
+    }
     $result .= '</ul>';
     $result .= ' </span></td>'."\n";
 	
@@ -2375,7 +2388,7 @@ resource object.
 Based on the symb of the resource, get a resource object for that
 resource. This is one of the proper ways to get a resource object.
 
-=item * B<getMapByMapPc>(map_pc):
+=item * B<getByMapPc>(map_pc):
 
 Based on the map_pc of the resource, get a resource object for
 the given map. This is one of the proper ways to get a resource object.
@@ -3869,6 +3882,12 @@ resource of the map.
 
 Returns a string with the type of the map in it.
 
+=item *B<map_hierarchy>:
+
+Returns a string with a comma-separated ordered list of map_pc IDs
+for the hierarchy of maps containing a map, with the top level
+map first, then descending to deeper levels, with the enclosing map last.
+
 =back
 
 =cut
@@ -3899,6 +3918,11 @@ sub map_type {
     my $pc = $self->map_pc();
     return $self->navHash("map_type_$pc", 0);
 }
+sub map_hierarchy {
+    my $self = shift;
+    my $pc = $self->map_pc();
+    return $self->navHash("map_hierarchy_$pc", 0);
+}
 
 #####
 # Property queries