version 1.17, 2003/03/10 20:21:45
|
version 1.19, 2003/03/21 15:59:14
|
Line 272 sub javascript_nothing {
|
Line 272 sub javascript_nothing {
|
(undef,$user_browser,undef,undef,undef,$user_os) = |
(undef,$user_browser,undef,undef,undef,$user_os) = |
&Apache::loncommon::decode_user_agent(); |
&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') { |
if ($user_browser eq 'explorer' && $user_os =~ 'mac') { |
$nothing = "'javascript:void(0);'"; |
$nothing = "'javascript:void(0);'"; |
} |
} |
Line 726 sub Increment_PrgWin {
|
Line 724 sub Increment_PrgWin {
|
} else { |
} else { |
$time_est .= ' seconds'; |
$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="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}). |
': '.$time_est.' remaining '.$lasttime.'";'.'</script>'); |
' seconds for '.$extraInfo.')";'.'</script>'); |
|
$$prog_state{'laststart'}=time; |
$$prog_state{'laststart'}=time; |
$r->rflush(); |
$r->rflush(); |
} |
} |