--- loncom/xml/scripttag.pm 2001/07/12 15:53:44 1.47
+++ loncom/xml/scripttag.pm 2001/07/30 22:24:56 1.48
@@ -58,25 +58,30 @@ sub end_script {
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ my $result;
my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
if ( $target eq "modified" ) {
- }
- my $result=&Apache::run::run($bodytext,$safeeval);
- if ($target eq 'grade' ) {
- # grade should produce no output
- $result='';
- }
- if ($target eq "edit" ) {
- $result =
- "
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+ $result=$token->[4].&Apache::edit::modifiedfield();
+ } elsif ( $target eq "web" || $target eq "grade" ) {
+ $result=&Apache::run::run($bodytext,$safeeval);
+ if ($target eq 'grade' ) {
+ $result=''; # grade should produce no output
+ }
+ } elsif ($target eq "edit" ) {
+ #$result =
+ # "
<$token->[1]> output:
$bodytext
Source:
";
+ #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+ $result=&Apache::edit::tag_start($target,$token,'Script With Display');
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1)
}
return $result;
}
sub end_display {
- return ''
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+ return '';
}
sub start_scriptlib {