version 1.152, 2010/04/27 20:29:20
|
version 1.160, 2011/12/19 01:49:32
|
Line 102 sub start_script {
|
Line 102 sub start_script {
|
($Apache::lonhomework::viewgrades == 'F')) { |
($Apache::lonhomework::viewgrades == 'F')) { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
|
my $start_page = |
|
&Apache::loncommon::start_page('Script Vars', undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1,}); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
|
|
$uname =~s/\W//g; |
$uname =~s/\W//g; |
$udom =~s/\W//g; |
$udom =~s/\W//g; |
my $function_name = |
my $function_name = |
join('_','LONCAPA_scriptvars',$uname,$udom, |
join('_','LONCAPA_scriptvars',$uname,$udom, |
$env{'form.counter'},$Apache::lonxml::curdepth); |
$env{'form.counter'},$Apache::lonxml::curdepth); |
my $script_var ="<script type=\"text/javascript\"> |
&Apache::lonxml::add_script_result( |
// <![CDATA[ |
&Apache::loncommon::modal_adhoc_window($function_name,500,500, |
function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>"; |
'<pre>'.&Apache::run::dump($target,$safeeval).'</pre>', |
my $listing=&Apache::run::dump($target,$safeeval); |
&mt('Script Vars'))."<br />"); |
$listing=~s/\\/\\\\/g; |
|
$listing=~s/\'/\\\'/g; |
|
$script_var.=$listing; |
|
$script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()} |
|
// ]]> |
|
</script><a href=\"javascript:$function_name();void(0);\">".&mt('Script Vars')."</a><br />"; |
|
&Apache::lonxml::add_script_result($script_var); |
|
} |
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
#&Apache::run::run($bodytext,$safeeval); |
#&Apache::run::run($bodytext,$safeeval); |
Line 309 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 326 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 { |
Line 372 sub start_import {
|
Line 332 sub start_import {
|
my $bodytext=$$parser[$#$parser]->get_text("/import"); |
my $bodytext=$$parser[$#$parser]->get_text("/import"); |
my $result =""; |
my $result =""; |
|
|
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); |
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); |
|
|
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' |
|| $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) { |
|| $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) { |
Line 384 sub start_import {
|
Line 344 sub start_import {
|
&Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>"); |
&Apache::lonxml::error("<b> Unable to find <i>$bodytext as $location</i> for import</b>"); |
return ""; |
return ""; |
} |
} |
|
my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval); |
|
if (($importmode eq 'problem') || ($importmode eq 'part')) { |
|
# We are using import to import published problems |
|
if (($importmode eq 'problem') || ($file=~/<part[^<]*>/s)) { |
|
# We explicitly don't want this to be a separate part or the problem already has parts |
|
$file=~s/^\s*<problem>/<library>/s; |
|
$file=~s/<\/problem>\s*$/<\/library>/s; |
|
} else { |
|
# We want this to be a separate part, but it currently is not |
|
$file=~s/^\s*<problem>/<library><part>/s; |
|
$file=~s/<\/problem>\s*$/<\/part><\/library>/s; |
|
} |
|
} |
my $dir=$location; |
my $dir=$location; |
$dir=~s:/[^/]*$::; |
$dir=~s:/[^/]*$::; |
# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n"); |
# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n"); |
Line 397 sub start_import {
|
Line 369 sub start_import {
|
|
|
} 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::editline($token->[1],$bodytext,'',40); |
my $location=$token->[1]; |
|
$location=~s/^\s*//s; |
|
$location=~s/\s*$//s; |
|
$result.=&Apache::edit::editline($location,$bodytext,'',40); |
$result.=&Apache::edit::browse(undef,'textnode'); |
$result.=&Apache::edit::browse(undef,'textnode'); |
|
$result.= ' <label>'.&mt('Import as:'). |
|
'<select name="importmode_'.$Apache::lonxml::curdepth.'">'; |
|
my %options=&Apache::lonlocal::texthash('' => 'as standard library', |
|
'problem' => 'as problem', |
|
'part' => 'as problem part(s)'); |
|
foreach my $option (sort(keys(%options))) { |
|
$result.='<option value="'.$option.'"'; |
|
if ($option eq &Apache::lonxml::get_param('importmode',$parstack,$safeeval)) { |
|
$result.=' selected="selected"'; |
|
} |
|
$result.='>'.$options{$option}.'</option>'; |
|
} |
|
$result.='</select></label>'; |
#FIXME this need to convert $bodytext to be a contruction space reference |
#FIXME this need to convert $bodytext to be a contruction space reference |
#my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); |
#my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); |
#$result.="Click<a href=\"$location\">here</a> to edit<br />" |
#$result.="Click<a href=\"$location\">here</a> to edit<br />" |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4].&Apache::edit::modifiedfield("/import",$parser); |
&Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode'); |
|
$result='<import id="'.$token->[2]{'id'}.'" importmode="'.$token->[2]{'importmode'}.'">'; |
|
$result.=&Apache::edit::modifiedfield("/import",$parser); |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
my $id= &Apache::lonxml::get_id($parstack,$safeeval); |
my $id= &Apache::lonxml::get_id($parstack,$safeeval); |
$result.='<import part="'.$Apache::inputtags::part; |
$result.='<import part="'.$Apache::inputtags::part; |
if ($id) { |
if ($id) { |
$result.='" id="'.$id; |
$result.='" id="'.$id; |
} |
} |
$result.='">'; |
$result.='" importmode="'.$token->[2]{'importmode'}.'">'; |
$result.=$bodytext; |
$result.=$bodytext; |
$result.='</import>'; |
$result.='</import>'; |
} |
} |
Line 597 sub start_algebra {
|
Line 587 sub start_algebra {
|
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval); |
my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval); |
$result=&Apache::lontexconvert::algebra($inside,undef,$target,$style,$parstack,$safeeval); |
$result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval); |
} |
} |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} |
} |