[BACK]Return to lonhtmlcommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.14 and 1.18

version 1.14, 2003/03/03 21:52:24 version 1.18, 2003/03/10 20:25:00
Line 249  sub get_date_from_form { Line 249  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 {  sub AscendOrderOptions {
     my ($order, $page, $formName)=@_;      my ($order, $page, $formName)=@_;
   
Line 653  sub Create_PrgWin { Line 687  sub Create_PrgWin {
     "</script>");      "</script>");
   
     my %prog_state;      my %prog_state;
     $prog_state{'now'}=0;      $prog_state{'done'}=0;
     $prog_state{'since'}=time;      $prog_state{'firststart'}=time;
     $prog_state{'started'}=time;      $prog_state{'laststart'}=time;
     $prog_state{'total'}=$number_to_do;      $prog_state{'max'}=$number_to_do;
   
     $r->rflush();      $r->rflush();
     return %prog_state;      return %prog_state;
Line 667  sub Update_PrgWin { Line 701  sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;      my ($r,$prog_state,$displayString)=@_;
     $r->print('<script>popwin.document.popremain.remaining.value="'.      $r->print('<script>popwin.document.popremain.remaining.value="'.
               $displayString.'";</script>');                $displayString.'";</script>');
     $$prog_state{'started'}=time;      $$prog_state{'laststart'}=time;
     $r->rflush();      $r->rflush();
 }  }
   
 # increment progress state  # increment progress state
 sub Increment_PrgWin {  sub Increment_PrgWin {
     my ($r,$prog_state,$extraInfo)=@_;      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('<script>popwin.document.popremain.remaining.value="'.      $r->print('<script>popwin.document.popremain.remaining.value="'.
       $$prog_state{'now'}.'/'.$$prog_state{'total'}.        $$prog_state{'done'}.'/'.$$prog_state{'max'}.
       ': '.int((time-$$prog_state{'since'})/        ': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}).
       $$prog_state{'now'}*($$prog_state{'total'}-$$prog_state{'now'})).  
       ' secs remaining ('.(time-$$prog_state{'started'}).  
       ' seconds for '.$extraInfo.')";'.'</script>');        ' seconds for '.$extraInfo.')";'.'</script>');
     $$prog_state{'started'}=time;      $$prog_state{'laststart'}=time;
     sleep 1;  
     $r->rflush();      $r->rflush();
 }  }
   
Removed from v.1.14  
changed lines
  Added in v.1.18

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>