--- loncom/interface/lonhtmlcommon.pm 2003/03/03 22:00:03 1.15
+++ loncom/interface/lonhtmlcommon.pm 2003/03/10 20:25:00 1.18
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.15 2003/03/03 22:00:03 albertel Exp $
+# $Id: lonhtmlcommon.pm,v 1.18 2003/03/10 20:25:00 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -249,6 +249,40 @@ sub get_date_from_form {
##############################################
##############################################
+=pod
+
+=item &javascript_nothing()
+
+Return an appropriate null for the users browser. This is used
+as the first arguement for window.open calls when you want a blank
+window that you can then write to.
+
+=cut
+
+##############################################
+##############################################
+sub javascript_nothing {
+ # mozilla and other browsers work with "''", but IE on mac does not.
+ my $nothing = "''";
+ my $user_browser;
+ my $user_os;
+ $user_browser = $ENV{'browser.type'} if (exists($ENV{'browser.type'}));
+ $user_os = $ENV{'browser.os'} if (exists($ENV{'browser.os'}));
+ if (! defined($user_browser) || ! defined($user_os)) {
+ (undef,$user_browser,undef,undef,undef,$user_os) =
+ &Apache::loncommon::decode_user_agent();
+ }
+ if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
+ $nothing = "'javascript:void(0);'";
+ }
+ return $nothing;
+}
+
+##############################################
+##############################################
+
+
+
sub AscendOrderOptions {
my ($order, $page, $formName)=@_;
@@ -653,10 +687,10 @@ sub Create_PrgWin {
"");
my %prog_state;
- $prog_state{'now'}=0;
- $prog_state{'since'}=time;
- $prog_state{'started'}=time;
- $prog_state{'total'}=$number_to_do;
+ $prog_state{'done'}=0;
+ $prog_state{'firststart'}=time;
+ $prog_state{'laststart'}=time;
+ $prog_state{'max'}=$number_to_do;
$r->rflush();
return %prog_state;
@@ -667,21 +701,35 @@ sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;
$r->print('');
- $$prog_state{'started'}=time;
+ $$prog_state{'laststart'}=time;
$r->rflush();
}
# increment progress state
sub Increment_PrgWin {
my ($r,$prog_state,$extraInfo)=@_;
- $$prog_state{'now'}++;
+ $$prog_state{'done'}++;
+ my $time_est= (time - $$prog_state{'firststart'})/$$prog_state{'done'} *
+ ($$prog_state{'max'}-$$prog_state{'done'});
+ $time_est = int($time_est);
+ if (int ($time_est/60) > 0) {
+ 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';
+ }
+ } else {
+ $time_est .= ' seconds';
+ }
+
$r->print('');
- $$prog_state{'started'}=time;
+ $$prog_state{'laststart'}=time;
$r->rflush();
}