--- loncom/xml/scripttag.pm 2006/03/29 22:48:08 1.134.2.2
+++ loncom/xml/scripttag.pm 2007/11/17 01:46:44 1.146
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
+ &Apache::loncommon::lonhttpd_port().'\';';
}
return ('','no');
}
@@ -116,18 +125,32 @@ sub start_script {
($env{'form.answer_output_mode'} ne 'tex') &&
($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;
- my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+ my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
- $result.="Script Vars
";
+".&mt('Script Vars')."
";
+ &Apache::lonxml::add_script_result($script_var);
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -140,7 +163,7 @@ sub start_script {
}
} else {
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
- if ($target ne "meta" && $target ne 'tex') {
+ if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
$result = $token->[4];
$result.=$bodytext;
}
@@ -223,7 +246,7 @@ sub start_scriptlib {
my $script=&Apache::lonnet::getfile($location);
if ($script == -1) {
if ($target eq 'edit') {
- $error='| Errors | Unable to find '.$location.' | '."\n";
+ $error='
| '.&mt('Errors').' | '.&mt(' Unable to find [_1]',''.$location.'').' | '."\n";
} else {
&Apache::lonxml::error(" Unable to find $location for scriptlib");
return "";
@@ -310,11 +333,13 @@ sub start_window {
$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('Width:','width',$token,5);
+ $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$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,'linktext',
- 'width','height');
+ 'width','height',
+ 'mimetype');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -334,7 +359,28 @@ sub end_window {
if (!$width) { $width='500'; }
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
if (!$height) { $height='200'; }
- $result = "$linktext";
+ my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
+ || 'text/html';
+
+ my ($start_page,$end_page);
+ if ($mimetype eq 'text/html') {
+ $start_page =
+ &Apache::loncommon::start_page($linktext, undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'js_ready' => 1,});
+ $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1,});
+ }
+ $result = "$linktext";
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -364,12 +410,12 @@ sub start_import {
my $dir=$location;
$dir=~s:/[^/]*$::;
# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ my $id= &Apache::lonxml::get_id($parstack,$safeeval);
if (!$id) { $id=$Apache::lonxml::curdepth; }
push(@Apache::inputtags::import,$id);
push(@Apache::inputtags::importlist,$id);
- &Apache::lonxml::newparser($parser,\$file,$dir);
+ &Apache::lonxml::newparser($parser,\$file,$dir);
} elsif ($target eq "edit" ) {
$result.=&Apache::edit::tag_start($target,$token);
@@ -381,7 +427,7 @@ sub start_import {
} elsif ($target eq 'modified') {
$result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
} elsif ($target eq 'meta') {
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ my $id= &Apache::lonxml::get_id($parstack,$safeeval);
$result.='