--- loncom/interface/lonhtmlcommon.pm	2004/06/17 18:22:13	1.78
+++ loncom/interface/lonhtmlcommon.pm	2004/07/16 19:54:51	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.78 2004/06/17 18:22:13 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.81 2004/07/16 19:54:51 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -772,20 +772,22 @@ sub Increment_PrgWin {
         $$prog_state{'done'} *
 	($$prog_state{'max'}-$$prog_state{'done'});
     $time_est = int($time_est);
-    if (int ($time_est/60) > 0) {
-	my $min = int($time_est/60);
-	my $sec = $time_est % 60;
-	$time_est = $min.' '.&mt('minutes');
-        if ($min < 10)  {
-            if ($sec > 1) {
-                $time_est.= ', '.$sec.' '.&mt('seconds');
-            } elsif ($sec > 0) {
-                $time_est.= ', '.$sec.' '.&mt('second');
-            }
-        }
-    } else {
-	$time_est .= ' '.&mt('seconds');
+    #
+    my $min = int($time_est/60);
+    my $sec = $time_est % 60;
+    # 
+    my $str;
+    if ($min == 1 && $sec > 1) {
+        $str = '[_2] seconds';
+    } elsif ($min == 1 && $sec < 2) {
+        $str = '1 minute';
+    } elsif ($min < 10 && $sec > 1) {
+        $str = '[_1] minutes, [_2] seconds';
+    } elsif ($min >= 10 || $sec < 2) {
+        $str = '[_1] minutes';
     }
+    $time_est = &mt($str,$min,$sec);
+    #
     my $lasttime = &Time::HiRes::time()-$$prog_state{'laststart'};
     if ($lasttime > 9) {
         $lasttime = int($lasttime);
@@ -1060,12 +1062,13 @@ returns: nothing
         my $icons = '';
         $faq = $last->{'faq'} if (exists($last->{'faq'}));
         $bug = $last->{'bug'} if (exists($last->{'bug'}));
-        if ($faq ne '') {
-            $icons .= &Apache::loncommon::help_open_faq($faq);
-        }
-        if ($bug ne '') {
-            $icons .= &Apache::loncommon::help_open_bug($bug);
-        }
+#        if ($faq ne '') {
+#            $icons .= &Apache::loncommon::help_open_faq($faq);
+#        }
+#        if ($bug ne '') {
+#            $icons .= &Apache::loncommon::help_open_bug($bug);
+#        }
+        $icons .= &Apache::loncommon::help_open_menu($color,$component,$component_help,$function,$faq,$bug);
         if ($icons ne '') {
             $Str .= $icons.'&nbsp;';
         }