--- loncom/interface/lonhtmlcommon.pm	2003/03/10 20:21:45	1.17
+++ loncom/interface/lonhtmlcommon.pm	2003/03/21 15:59:14	1.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.17 2003/03/10 20:21:45 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.19 2003/03/21 15:59:14 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,8 +272,6 @@ sub javascript_nothing {
         (undef,$user_browser,undef,undef,undef,$user_os) = 
                            &Apache::loncommon::decode_user_agent();
     }
-    &Apache::lonnet::logthis(" os      = :".$user_os.":");
-    &Apache::lonnet::logthis(" browser = :".$user_browser.":");
     if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
         $nothing = "'javascript:void(0);'";
     }
@@ -726,11 +724,15 @@ sub Increment_PrgWin {
     } else {
 	$time_est .= ' seconds';
     }
-
+    my $lasttime = time-$$prog_state{'laststart'};
+    if ($lasttime == 1) {
+        $lasttime = '('.$lasttime.' second for '.$extraInfo.')';
+    } else {
+        $lasttime = '('.$lasttime.' seconds for '.$extraInfo.')';
+    }
     $r->print('<script>popwin.document.popremain.remaining.value="'.
 	      $$prog_state{'done'}.'/'.$$prog_state{'max'}.
-	      ': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}).
-	      ' seconds for '.$extraInfo.')";'.'</script>');
+	      ': '.$time_est.' remaining '.$lasttime.'";'.'</script>');
     $$prog_state{'laststart'}=time;
     $r->rflush();
 }