version 1.162, 2011/12/19 18:18:32
|
version 1.166, 2012/08/07 14:50:17
|
Line 41 use Apache::style();
|
Line 41 use Apache::style();
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::scripttag', |
&Apache::lonxml::register('Apache::scripttag', |
('script','scriptlib','parserlib','import', |
('script','scriptlib','parserlib','import', |
'window','togglebox','display','storetc','physnet', |
'window','windowlink','togglebox','display','storetc','physnet', |
'standalone','comment','num','parse','algebra', |
'standalone','comment','num','parse','algebra', |
'LONCAPA_INTERNAL_TURN_STYLE_ON', |
'LONCAPA_INTERNAL_TURN_STYLE_ON', |
'LONCAPA_INTERNAL_TURN_STYLE_OFF')); |
'LONCAPA_INTERNAL_TURN_STYLE_OFF')); |
Line 109 sub start_script {
|
Line 109 sub start_script {
|
$env{'form.counter'},$Apache::lonxml::curdepth); |
$env{'form.counter'},$Apache::lonxml::curdepth); |
&Apache::lonxml::add_script_result( |
&Apache::lonxml::add_script_result( |
&Apache::loncommon::modal_adhoc_window($function_name,500,500, |
&Apache::loncommon::modal_adhoc_window($function_name,500,500, |
'<pre>'.&Apache::run::dump($target,$safeeval).'</pre>', |
'<pre style="background-color:#ffffff;">'. |
|
&Apache::run::dump($target,$safeeval).'</pre>', |
&mt('Script Vars'))."<br />"); |
&mt('Script Vars'))."<br />"); |
} |
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
Line 126 sub start_script {
|
Line 127 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 320 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 314 sub end_window {
|
Line 354 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 ($start_page,$end_page); |
|
$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 = ''; |
} |
} |
Line 327 sub end_window {
|
Line 373 sub end_window {
|
} |
} |
|
|
|
|
|
sub start_windowlink { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result = ''; |
|
if ($target eq 'web' || $target eq 'webgrade') { |
|
&Apache::lonxml::startredirection; |
|
} elsif ($target eq 'edit') { |
|
$result.=&Apache::edit::tag_start($target,$token); |
|
$result.=&Apache::edit::text_arg('Link:','href',$token,70); |
|
$result.=&Apache::edit::text_arg('Height:','height',$token,5); |
|
$result.=&Apache::edit::text_arg('Width:','width',$token,5); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'href', |
|
'width','height'); |
|
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
|
} |
|
return $result; |
|
} |
|
|
|
sub end_windowlink { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
my $result; |
|
if ($target eq 'web' || $target eq 'webgrade') { |
|
my $output=&Apache::lonxml::endredirection; |
|
my $href= &Apache::lonxml::get_param('href',$parstack,$safeeval); |
|
if (!$href) { $href='/adm/rat/empty.html'; } |
|
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); |
|
if (!$width) { $width='500'; } |
|
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
|
if (!$height) { $height='200'; } |
|
$result=&Apache::loncommon::modal_link($href,$output,$width,$height); |
|
} else { |
|
$result = ''; |
|
} |
|
return $result; |
|
} |
|
|
|
|
sub start_togglebox { |
sub start_togglebox { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |