--- loncom/interface/lonhtmlcommon.pm	2003/03/10 20:25:00	1.18
+++ loncom/interface/lonhtmlcommon.pm	2003/04/30 15:49:45	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.18 2003/03/10 20:25:00 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.20 2003/04/30 15:49:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -251,6 +251,33 @@ sub get_date_from_form {
 
 =pod
 
+=item &pjump_javascript_definition()
+
+Returns javascript defining the 'pjump' function, which opens up a
+parameter setting wizard.
+
+=cut
+
+##############################################
+##############################################
+sub pjump_javascript_definition {
+    my $Str = <<END;
+    function pjump(type,dis,value,marker,ret,call) {
+        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
+                 +"&value="+escape(value)+"&marker="+escape(marker)
+                 +"&return="+escape(ret)
+                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
+                 "height=350,width=350,scrollbars=no,menubar=no");
+    }
+END
+    return $Str;
+}
+
+##############################################
+##############################################
+
+=pod
+
 =item &javascript_nothing()
 
 Return an appropriate null for the users browser.  This is used
@@ -724,11 +751,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();
 }