[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[matthew]

matthew		Thu Jun 19 11:02:37 2003 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  Progress window no longer bothers listing seconds in time estimate if
  minutes >= 10.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.24 loncom/interface/lonhtmlcommon.pm:1.25
--- loncom/interface/lonhtmlcommon.pm:1.24	Wed Jun 18 11:02:20 2003
+++ loncom/interface/lonhtmlcommon.pm	Thu Jun 19 11:02:37 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.24 2003/06/18 15:02:20 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.25 2003/06/19 15:02:37 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -720,11 +720,13 @@
 	my $min = int($time_est/60);
 	my $sec = $time_est % 60;
 	$time_est = $min.' minutes';
-	if ($sec > 1) {
-	    $time_est.= ', '.$sec.' seconds';
-	} elsif ($sec > 0) {
-	    $time_est.= ', '.$sec.' second';
-	}
+        if ($min < 10)  {
+            if ($sec > 1) {
+                $time_est.= ', '.$sec.' seconds';
+            } elsif ($sec > 0) {
+                $time_est.= ', '.$sec.' second';
+            }
+        }
     } else {
 	$time_est .= ' seconds';
     }