--- loncom/interface/lonhtmlcommon.pm 2004/07/16 19:29:26 1.80 +++ loncom/interface/lonhtmlcommon.pm 2004/07/19 21:14:15 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.80 2004/07/16 19:29:26 matthew Exp $ +# $Id: lonhtmlcommon.pm,v 1.83 2004/07/19 21:14:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -783,7 +783,7 @@ sub Increment_PrgWin { $str = '1 minute'; } elsif ($min < 10 && $sec > 1) { $str = '[_1] minutes, [_2] seconds'; - } elsif ($min > 10 || $sec < 2) { + } elsif ($min >= 10 || $sec < 2) { $str = '[_1] minutes'; } $time_est = &mt($str,$min,$sec); @@ -1057,7 +1057,7 @@ returns: nothing } @Crumbs ); $links .= '->' if ($links ne ''); - $links .= ''.$last->{'text'}.''; + $links .= ''.&mt($last->{'text'}).''; # my $icons = ''; $faq = $last->{'faq'} if (exists($last->{'faq'})); @@ -1068,6 +1068,10 @@ returns: nothing # if ($bug ne '') { # $icons .= &Apache::loncommon::help_open_bug($bug); # } + if (defined($component_help)) { + $icons .= + &Apache::loncommon::help_open_topic($component_help); + } $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug); if ($icons ne '') { $Str .= $icons.' '; @@ -1077,12 +1081,7 @@ returns: nothing # if (defined($component)) { $Str .= ''. - ''.&mt($component).''; - if (defined($component_help)) { - $Str .= - &Apache::loncommon::help_open_topic($component_help); - } - $Str.= ''; + ''.&mt($component).''; } $Str .= ''."\n"; #