version 1.163, 2011/12/23 18:34:11
|
version 1.165, 2012/02/05 23:00:06
|
Line 126 sub start_script {
|
Line 126 sub start_script {
|
if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { |
if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { |
$result = $token->[4]; |
$result = $token->[4]; |
$result.=$bodytext; |
$result.=$bodytext; |
|
if ($type eq "text/javascript") { |
|
my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1); |
|
if (($src =~ /\.js$/) && ($src !~ m{^(/|https?://)})) { |
|
my ($path,$scriptname) = ($src =~ m{^(.+)/([^/]*)$}); |
|
my $docuri = |
|
$Apache::lonnet::env{'request.noversionuri'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum\E)/(docs/.*/)[^/]+$}) { |
|
my $prefix = $1; |
|
my $relpath = $2; |
|
my $cleanrelpath; |
|
foreach my $dir (split(/\//,$relpath.$path)) { |
|
next if ($dir eq '.'); |
|
if ($dir eq '..') { |
|
$cleanrelpath =~ s{([^/]+/)$}{}; |
|
} else { |
|
$cleanrelpath .= $dir.'/'; |
|
} |
|
} |
|
$cleanrelpath =~ s{/$}{}; |
|
if ($cleanrelpath ne '') { |
|
$src = $prefix.'/'.$cleanrelpath.'/'.$scriptname; |
|
} else { |
|
$src = $prefix.'/'.$scriptname; |
|
} |
|
if ($src ne '') { |
|
&Apache::lonxml::extlink($src); |
|
} |
|
} |
|
} |
|
} |
} |
} |
} |
} |
return $result; |
return $result; |
Line 287 sub start_window {
|
Line 319 sub start_window {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result = '\unskip\footnote{'; |
my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval); |
|
if ($printtext=~/\w/) { |
|
# If printtext is given, do not output any intervening information |
|
&Apache::lonxml::startredirection; |
|
} else { |
|
$result = '\unskip\footnote{'; |
|
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$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('Printed text (optional):','printtext',$token,20); |
$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 317 sub end_window {
|
Line 356 sub end_window {
|
$result=&Apache::loncommon::modal_adhoc_window |
$result=&Apache::loncommon::modal_adhoc_window |
("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext); |
("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result = '}'; |
my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval); |
|
if ($printtext=~/\w/) { |
|
# If a "printtext" is given, proceed to retrieve all intervening information and trash it |
|
my $output=&Apache::lonxml::endredirection; |
|
# Use printtext instead |
|
$result=$printtext; |
|
} else { |
|
$result='}'; |
|
} |
} else { |
} else { |
$result = ''; |
$result = ''; |
} |
} |