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

Diff for /loncom/xml/scripttag.pm between versions 1.159 and 1.160

version 1.159, 2011/12/10 18:11:05 version 1.160, 2011/12/19 01:49:32
Line 293  sub start_window { Line 293  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,
Line 310  sub end_window { Line 309  sub end_window {
   my $result;    my $result;
   if ($target eq 'web' || $target eq 'webgrade') {    if ($target eq 'web' || $target eq 'webgrade') {
     my $output=&Apache::lonxml::endredirection;      my $output=&Apache::lonxml::endredirection;
     $output =~ s/[\n\r]/ /g;  
 #    $output = &HTML::Entities::encode($output,'<>&"\'');  
     $output =~ s/\'/\\\'/g;  
     my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);      my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval);
     if (!$linktext) { $linktext='<sup>*</sup>'; }      if (!$linktext) { $linktext='<sup>*</sup>'; }
     my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);      my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
     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,$end_page);      my ($start_page,$end_page);
     if ($mimetype eq 'text/html') {      $result=&Apache::loncommon::modal_adhoc_window
  $start_page =             ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext);
     &Apache::loncommon::start_page($linktext, undef,  
    {'only_body' => 1,  
     'bgcolor'   => '#FFFFFF',  
     'js_ready'  => 1,});  
  $end_page =  
     &Apache::loncommon::end_page({'js_ready' => 1,});  
     }  
     $result = "<script type=\"text/javascript\">  
 //<!--  
  function LONCAPA_newwindow_$Apache::lonxml::curdepth() {  
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W');  
 newWindow.close();  
 newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1');  
 newWindow.".&Apache::lonhtmlcommon::javascript_docopen($mimetype).";  
 newWindow.document.writeln('$start_page $output $end_page');  
 newWindow.document.close();}  
 //-->  
 </script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>";  
   } elsif ($target eq 'tex') {    } elsif ($target eq 'tex') {
       $result = '}';        $result = '}';
   } else {    } else {
Removed from v.1.159  
changed lines
  Added in v.1.160

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