--- loncom/interface/lonnavmaps.pm	2008/01/20 01:52:47	1.410
+++ loncom/interface/lonnavmaps.pm	2008/12/21 16:27:26	1.415.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.410 2008/01/20 01:52:47 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.415.2.3 2008/12/21 16:27:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -198,7 +198,7 @@ sub getDescription {
         return &mt("Not currently assigned.");
     }
     if ($status == $res->OPEN_LATER) {
-        return "Open " .timeToHumanString($open,'start');
+        return &mt("Open ") .timeToHumanString($open,'start');
     }
     if ($status == $res->OPEN) {
         if ($due) {
@@ -236,7 +236,7 @@ sub getDescription {
         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>";
             }
@@ -854,7 +854,10 @@ sub render_resource {
     if (!$resource->condval()) {
         $nonLinkedText .= ' <i>('.&mt('conditionally hidden').')</i> ';
     }
-    
+    if (($resource->is_practice()) && ($resource->is_raw_problem())) {
+        $nonLinkedText .=' <font color="green"><b>'.&mt('not graded').'</b></font>';
+    }
+ 
     # We're done preparing and finally ready to start the rendering
     my $result = "<td align='left' valign='middle'>";
 
@@ -1179,7 +1182,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 />';
 	    }
@@ -1247,6 +1250,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
@@ -1738,7 +1746,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 '') {
@@ -1749,7 +1757,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;
 }
@@ -2299,17 +2307,22 @@ sub parmval {
     my $hashkey = $what."|||".$symb;
 
     if (defined($self->{PARM_CACHE}->{$hashkey})) {
-       if (wantarray) {
-           return @{$self->{PARM_CACHE}->{$hashkey}};
-       } else {
-           return $self->{PARM_CACHE}->{$hashkey}->[0];
-       }
+        if (ref($self->{PARM_CACHE}->{$hashkey}) eq 'ARRAY') { 
+            if (defined($self->{PARM_CACHE}->{$hashkey}->[0])) {
+                if (wantarray) {
+                    return @{$self->{PARM_CACHE}->{$hashkey}};
+                } else {
+                    return $self->{PARM_CACHE}->{$hashkey}->[0];
+                }
+            }
+        } else {
+            return $self->{PARM_CACHE}->{$hashkey};
+        }
     }
-
     my $result = $self->parmval_real($what, $symb, $recurse);
     $self->{PARM_CACHE}->{$hashkey} = $result;
     if (wantarray) {
-       return @{$result};
+        return @{$result};
     }
     return $result->[0];
 }
@@ -3605,6 +3618,15 @@ sub is_problem {
     }
     return 0;
 }
+sub is_raw_problem {
+    my $self=shift;
+    my $src = $self->src();
+    if ($src =~ /\.(problem|exam|quiz|assess|survey|form|library|task)$/) {
+        return 1;
+    }
+    return 0;
+}
+
 sub contains_problem {
     my $self=shift;
     if ($self->is_page()) {