[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface lonnavmaps.pm

[raeburn]

raeburn		Fri Dec 12 21:24:59 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - Backport 1.421, 1.422.
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.415 loncom/interface/lonnavmaps.pm:1.415.2.1
--- loncom/interface/lonnavmaps.pm:1.415	Fri Oct 10 16:07:16 2008
+++ loncom/interface/lonnavmaps.pm	Fri Dec 12 21:24:58 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.415 2008/10/10 16:07:16 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.415.2.1 2008/12/12 21:24:58 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,7 +236,7 @@
         my $maxtries = $res->maxtries($part);
         my $triesString = "";
         if ($tries && $maxtries) {
-            $triesString = '<font size="-1"><i>('.&mt('[_1] of [_2] tries used',$tries,$maxtries).')</i></font>';
+            $triesString = '<font size="-1"><i>('.&mt('[_1] of [quant,_2,try,tries] tries used',$tries,$maxtries).')</i></font>';
             if ($maxtries > 1 && $maxtries - $tries == 1) {
                 $triesString = "<b>$triesString</b>";
             }
@@ -1741,7 +1741,7 @@
     $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 +1752,7 @@
     }
     $result .= '</select>&nbsp;<input type="button" name="chgnav"
                    value="Go" onClick="javascript:changeNavDisplay()" />
-                </nobr></form></td>'."\n";
+                </span></form></td>'."\n";
 	
     return $result;
 }