--- loncom/xml/scripttag.pm 2001/07/12 15:53:44 1.47
+++ loncom/xml/scripttag.pm 2001/08/13 20:52:33 1.49
@@ -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 {
@@ -105,9 +110,10 @@ sub start_scriptlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Script Functions').
+ &Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
@@ -119,9 +125,9 @@ sub start_scriptlib {
sub end_scriptlib {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
-# if ($target eq "edit" ) { $result=" "; }
- return $result;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
sub start_parserlib {
@@ -149,9 +155,10 @@ sub start_parserlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Tag Definitions').
+ &Apache::edit::editfield($token->[1],$bodytext,'',40,1).
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
@@ -163,11 +170,9 @@ sub start_parserlib {
sub end_parserlib {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
-# if ($target eq "edit" ) {
-# $result=&Apache::edit::tag_end($target,$token);
-# }
- return $result;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
sub start_window {