--- loncom/interface/lonnavmaps.pm	2008/09/11 17:09:48	1.414
+++ loncom/interface/lonnavmaps.pm	2009/09/15 01:02:13	1.415.4.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.414 2008/09/11 17:09:48 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.415.4.2 2009/09/15 01:02:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -229,14 +229,18 @@ 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);
         my $maxtries = $res->maxtries($part);
         my $triesString = "";
         if ($tries && $maxtries) {
-            $triesString = "<font size=\"-1\"><i>($tries of $maxtries tries used)</i></font>";
+            $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] used',$tries,$maxtries).')</i></font>';
             if ($maxtries > 1 && $maxtries - $tries == 1) {
                 $triesString = "<b>$triesString</b>";
             }
@@ -249,7 +253,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');
+        }
     }
 }
 
@@ -1182,7 +1190,7 @@ sub render {
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
 	    if (!defined($navmap)) {
-		# no londer in course
+		# no longer in course
 		return '<span class="LC_error">'.&mt('No course selected').'</span><br />
                         <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
 	    }
@@ -1250,6 +1258,11 @@ sub render {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
+            if (!defined($navmap)) {
+                # no longer in course
+                return '<span class="LC_error">'.&mt('No course selected').'</span><br />
+                        <a href="/adm/roles">'.&mt('Select a course').'</a><br />';
+            }
         }
 
         # See if we're being passed a specific map
@@ -1741,7 +1754,7 @@ ENDBLOCK
     $result.='}
               </script>
                    <form name="linkitems" method="post">
-                       <nobr><select name="toplink">'."\n";
+                       <span class="LC_nobreak"><select name="toplink">'."\n";
     foreach my $link (@linkorder) {
 	if (defined($linkitems->{$link})) {
 	    if ($linkitems->{$link}{'text'} ne '') {
@@ -1752,7 +1765,7 @@ ENDBLOCK
     }
     $result .= '</select>&nbsp;<input type="button" name="chgnav"
                    value="Go" onClick="javascript:changeNavDisplay()" />
-                </nobr></form></td>'."\n";
+                </span></form></td>'."\n";
 	
     return $result;
 }