Diff for /loncom/xml/scripttag.pm between versions 1.145 and 1.146

version 1.145, 2007/11/17 01:43:00 version 1.146, 2007/11/17 01:46:44
Line 333  sub start_window { Line 333  sub start_window {
  $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);   $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
  $result.=&Apache::edit::text_arg('Height:','height',$token,5);   $result.=&Apache::edit::text_arg('Height:','height',$token,5);
  $result.=&Apache::edit::text_arg('Width:','width',$token,5);   $result.=&Apache::edit::text_arg('Width:','width',$token,5);
    $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$token,5);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'linktext',       $safeeval,'linktext',
      'width','height');       'width','height',
        'mimetype');
  if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
     }      }
     return $result;        return $result;  
Line 357  sub end_window { Line 359  sub end_window {
     if (!$width) { $width='500'; }      if (!$width) { $width='500'; }
     my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);      my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
     if (!$height) { $height='200'; }      if (!$height) { $height='200'; }
       my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
             || 'text/html';
   
     my $start_page =      my ($start_page,$end_page);
  &Apache::loncommon::start_page($linktext, undef,      if ($mimetype eq 'text/html') {
        {'only_body' => 1,   $start_page =
  'bgcolor'   => '#FFFFFF',      &Apache::loncommon::start_page($linktext, undef,
  'js_ready'  => 1,});     {'only_body' => 1,
     my $end_page =      'bgcolor'   => '#FFFFFF',
  &Apache::loncommon::end_page({'js_ready' => 1,});      'js_ready'  => 1,});
    $end_page =
       &Apache::loncommon::end_page({'js_ready' => 1,});
       }
     $result = "<script type=\"text/javascript\">      $result = "<script type=\"text/javascript\">
 //<!--  //<!--
  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {   function LONCAPA_newwindow_$Apache::lonxml::curdepth() {
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');  newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');
 newWindow.".&Apache::lonhtmlcommon::javascript_docopen().";  newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";
 newWindow.document.writeln('$start_page $output $end_page');  newWindow.document.writeln('$start_page $output $end_page');
 newWindow.document.close();}  newWindow.document.close();}
 //-->  //-->

Removed from v.1.145  
changed lines
  Added in v.1.146


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