--- loncom/interface/lonnavmaps.pm 2009/10/26 10:16:56 1.437 +++ loncom/interface/lonnavmaps.pm 2009/12/07 03:25:16 1.440.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Navigate Maps Handler # -# $Id: lonnavmaps.pm,v 1.437 2009/10/26 10:16:56 foxr Exp $ +# $Id: lonnavmaps.pm,v 1.440.2.1 2009/12/07 03:25:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees @@ -49,7 +49,7 @@ described at http://www.lon-capa.org. =head1 OVERVIEW -X When a user enters a course, LON-CAPA examines the course structure and caches it in what is often referred to as the "big hash" X. You can see it if you are logged into LON-CAPA, in a course, by going to /adm/test. (You may need to @@ -505,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 = @@ -696,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); @@ -716,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'); + } } } @@ -1091,7 +1102,7 @@ sub render_quick_status { if ($icon) { my $location= &Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon"); - $result .= "$linkopen$alt$linkclose"; + $result .= $linkopen.''.&mt($alt).''.$linkclose; } else { $result .= " "; } @@ -1525,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 @@ -1760,7 +1770,6 @@ END # show them. foreach my $part (@parts) { $rownum ++; - my $backgroundColor = $backgroundColors[$rownum % scalar(@backgroundColors)]; $result .= &Apache::loncommon::start_data_table_row();