--- loncom/interface/lonhtmlcommon.pm	2004/07/16 19:29:26	1.80
+++ loncom/interface/lonhtmlcommon.pm	2004/08/17 19:09:33	1.84.2.1
@@ -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.84.2.1 2004/08/17 19:09:33 albertel 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);
@@ -1005,8 +1005,8 @@ returns: nothing
     my @Crumbs;
     
     sub breadcrumbs {
-        my ($color,$component,$component_help,$function,$domain,$menulink) =
-	    @_;
+        my ($color,$component,$component_help,$function,$domain,$menulink,
+	    $helplink) = @_;
         if (! defined($color)) {
             if (! defined($function)) {
                 $function = &Apache::loncommon::get_users_function();
@@ -1057,7 +1057,7 @@ returns: nothing
                      } @Crumbs
                  );
         $links .= '-&gt;' if ($links ne '');
-        $links .= '<b>'.$last->{'text'}.'</b>';
+        $links .= '<b>'.&mt($last->{'text'}).'</b>';
         #
         my $icons = '';
         $faq = $last->{'faq'} if (exists($last->{'faq'}));
@@ -1068,7 +1068,9 @@ returns: nothing
 #        if ($bug ne '') {
 #            $icons .= &Apache::loncommon::help_open_bug($bug);
 #        }
-        $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+	if ($helplink ne 'nohelp') {
+	    $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
+	}
         if ($icons ne '') {
             $Str .= $icons.'&nbsp;';
         }
@@ -1077,12 +1079,7 @@ returns: nothing
         #
         if (defined($component)) {
             $Str .= '<td align="right" bgcolor="'.$color.'">'.
-                '<font size="+1">'.&mt($component).'</font>';
-            if (defined($component_help)) {
-                $Str .= 
-                    &Apache::loncommon::help_open_topic($component_help);
-            }
-            $Str.= '</td>';
+                '<font size="+1">'.&mt($component).'</font></td>';
         }
         $Str .= '</tr></table>'."\n";
         #