--- loncom/interface/lonnavmaps.pm	2009/03/27 11:33:19	1.433
+++ loncom/interface/lonnavmaps.pm	2009/12/07 03:25:16	1.440.2.1
@@ -1,7 +1,8 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.433 2009/03/27 11:33:19 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.440.2.1 2009/12/07 03:25:16 raeburn Exp $
+
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,7 +32,7 @@
 
 =head1 NAME
 
-Apache::lonnavmaps.pm
+Apache::lonnavmaps - Subroutines to handle and render the navigation
 
 =head1 SYNOPSIS
 
@@ -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');
+        }
     }
 }
 
@@ -880,11 +892,6 @@ sub render_resource {
     my $link = $params->{"resourceLink"};
 
     #  The URL part is not escaped at this point, but the symb is... 
-    #  The stuff to the left of the ? must have ' replaced by \' since
-    #  it will be quoted with ' in the href.
-
-    my ($left,$right) = split(/\?/, $link);
-    $link = $left.'?'.$right;
 
     my $src = $resource->src();
     my $it = $params->{"iterator"};
@@ -1095,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;";
         }
@@ -1419,15 +1426,15 @@ sub render {
 	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
+                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
@@ -1529,7 +1536,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
@@ -1764,7 +1770,6 @@ END
         # show them.
         foreach my $part (@parts) {
             $rownum ++;
-            my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)];
             
             $result .= &Apache::loncommon::start_data_table_row();