--- loncom/interface/lonhtmlcommon.pm 2003/03/07 19:09:11 1.16 +++ loncom/interface/lonhtmlcommon.pm 2003/05/12 22:04:41 1.21 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common html routines # -# $Id: lonhtmlcommon.pm,v 1.16 2003/03/07 19:09:11 albertel Exp $ +# $Id: lonhtmlcommon.pm,v 1.21 2003/05/12 22:04:41 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -249,174 +249,97 @@ sub get_date_from_form { ############################################## ############################################## -sub AscendOrderOptions { - my ($order, $page, $formName)=@_; +=pod - my $OpSel1 = ''; - my $OpSel2 = ''; +=item &pjump_javascript_definition() - if($order eq 'Ascending') { - $OpSel1 = ' selected'; - } else { - $OpSel2 = ' selected'; - } +Returns javascript defining the 'pjump' function, which opens up a +parameter setting wizard. - my $Str = ''; - $Str .= ''."\n"; - - return $Str; -} - -sub MapOptions { - my ($data, $page, $formName)=@_; - my $Str = ''; - $Str .= ''."\n"; } @@ -690,11 +617,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(''); + ': '.$time_est.' remaining '.$lasttime.'";'.''); $$prog_state{'laststart'}=time; $r->rflush(); }