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

Diff for /loncom/interface/lonhtmlcommon.pm between versions 1.46 and 1.47

version 1.46, 2004/02/12 22:23:30 version 1.47, 2004/02/13 21:12:12
Line 56  html. Line 56  html.
 package Apache::lonhtmlcommon;  package Apache::lonhtmlcommon;
   
 use Time::Local;  use Time::Local;
   use Time::HiRes;
 use Apache::lonlocal;  use Apache::lonlocal;
 use strict;  use strict;
   
Line 629  sub Create_PrgWin { Line 630  sub Create_PrgWin {
     my ($r, $title, $heading, $number_to_do)=@_;      my ($r, $title, $heading, $number_to_do)=@_;
     #the whole function called through timeout is due to issues      #the whole function called through timeout is due to issues
     #in mozilla Read BUG #2665 if you want to know the whole story      #in mozilla Read BUG #2665 if you want to know the whole story
     $r->print('<script>'.      if ($r ne '') {
     "var popwin;   $r->print('<script>'.
      function openpopwin () {          "var popwin;
      popwin=open(\'\',\'popwin\',\'width=400,height=100\');".           function openpopwin () {
     "popwin.document.writeln(\'<html><head><title>$title</title></head>".           popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
       "<body bgcolor=\"#88DDFF\">".          "popwin.document.writeln(\'<html><head><title>$title</title></head>".
               "<h4>$heading</h4>".            "<body bgcolor=\"#88DDFF\">".
               "<form name=popremain>".                    "<h4>$heading</h4>".
               '<input type="text" size="55" name="remaining" value="'.                    "<form name=popremain>".
       &mt('Starting').'"></form>'.                    '<input type="text" size="55" name="remaining" value="'.
               "</body></html>\');".            &mt('Starting').'"></form>'.
     "popwin.document.close();}".                    "</body></html>\');".
     "\nwindow.setTimeout(openpopwin,0)</script>");          "popwin.document.close();}".
           "\nwindow.setTimeout(openpopwin,0)</script>");
       } else {
    print('<script>'.
           "var popwin;
            function openpopwin () {
            popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
           "popwin.document.writeln(\'<html><head><title>$title</title></head>".
             "<body bgcolor=\"#88DDFF\">".
                     "<h4>$heading</h4>".
                     "<form name=popremain>".
                     '<input type="text" size="55" name="remaining" value="'.
             &mt('Starting').'"></form>'.
                     "</body></html>\');".
           "popwin.document.close();}".
         "\nwindow.setTimeout(openpopwin,0)</script>");
       }
   
     my %prog_state;      my %prog_state;
     $prog_state{'done'}=0;      $prog_state{'done'}=0;
Line 649  sub Create_PrgWin { Line 666  sub Create_PrgWin {
     $prog_state{'laststart'}=&Time::HiRes::time();      $prog_state{'laststart'}=&Time::HiRes::time();
     $prog_state{'max'}=$number_to_do;      $prog_state{'max'}=$number_to_do;
   
     $r->rflush();      if ($r ne '') {$r->rflush();}
     return %prog_state;      return %prog_state;
 }  }
   
 # update progress  # update progress
 sub Update_PrgWin {  sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;      my ($r,$prog_state,$displayString)=@_;
     $r->print('<script>popwin.document.popremain.remaining.value="'.      if ($r ne '') {
    $r->print('<script>popwin.document.popremain.remaining.value="'.
                     $displayString.'";</script>');
       } else {
    print('<script>popwin.document.popremain.remaining.value="'.
               $displayString.'";</script>');                $displayString.'";</script>');
       }
     $$prog_state{'laststart'}=&Time::HiRes::time();      $$prog_state{'laststart'}=&Time::HiRes::time();
     $r->rflush();      if ($r ne '') {$r->rflush();}
 }  }
   
 # increment progress state  # increment progress state
Line 707  sub Increment_PrgWin { Line 729  sub Increment_PrgWin {
     if ($user_browser eq 'explorer' && $user_os =~ 'mac') {      if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
         $lasttime = '';          $lasttime = '';
     }      }
     $r->print('<script>popwin.document.popremain.remaining.value="'.      if ($r ne '') {
    $r->print('<script>popwin.document.popremain.remaining.value="'.
             $$prog_state{'done'}.'/'.$$prog_state{'max'}.
             ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');
       } else {
    print('<script>popwin.document.popremain.remaining.value="'.
       $$prog_state{'done'}.'/'.$$prog_state{'max'}.        $$prog_state{'done'}.'/'.$$prog_state{'max'}.
       ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');        ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>');
       }
     $$prog_state{'laststart'}=&Time::HiRes::time();      $$prog_state{'laststart'}=&Time::HiRes::time();
     $r->rflush();      if ($r ne '') {$r->rflush();}
 }  }
   
 # close Progress Line  # close Progress Line
 sub Close_PrgWin {  sub Close_PrgWin {
     my ($r,$prog_state)=@_;      my ($r,$prog_state)=@_;
     $r->print('<script>popwin.close()</script>'."\n");      if ($r ne '') {
    $r->print('<script>popwin.close()</script>'."\n");
       } else {
    print('<script>popwin.close()</script>'."\n");
       }
     undef(%$prog_state);      undef(%$prog_state);
     $r->rflush();       if ($r ne '') {$r->rflush();} 
 }  }
   
   
Removed from v.1.46  
changed lines
  Added in v.1.47

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