--- loncom/homework/structuretags.pm 2001/06/05 16:32:18 1.41
+++ loncom/homework/structuretags.pm 2001/06/26 21:09:08 1.44
@@ -1,6 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
# 2/19 Guy
+# 6/26/2001 fixed extra web display at end of tags
package Apache::structuretags;
use strict;
@@ -21,6 +22,7 @@ sub start_web {
}
sub end_web {
+ return '';
}
sub start_tex {
@@ -33,6 +35,7 @@ sub start_tex {
}
sub end_tex {
+ return '';
}
sub start_problem {
@@ -41,7 +44,11 @@ sub start_problem {
#intialize globals
$Apache::inputtags::part='0';
@Apache::inputtags::responselist = ();
-
+ $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+ &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
+ if ($Apache::lonhomework::type eq '') {
+ $Apache::lonhomework::type='homework';
+ }
#adeed vars to the scripting enviroment
my $expression='$external::part='.$Apache::inputtags::part.';';
&Apache::run::run($expression,$safeeval);
@@ -364,9 +371,15 @@ sub end_startouttext {
if ($target eq 'edit') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
- $result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$text,"Text Block",50,5);
+ $result.=&Apache::edit::start_table($token)."
Text Block |
+Delete:".
+ &Apache::edit::deletelist($target,$token)
+ ." |
+".
+ &Apache::edit::insertlist($target,$token).
+ " |
+
\n".
+ &Apache::edit::editfield($token->[1],$text,"",50,5);
}
if ($target eq 'modified') {
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
@@ -377,7 +390,7 @@ sub end_startouttext {
sub start_endouttext {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result='';
- if ($target eq "edit" ) { $result=&Apache::edit::tag_end($target,$token); }
+ if ($target eq "edit" ) { $result=" |
".&Apache::edit::end_table()."\n"; }
if ($target eq "modified") { $result=''; }
return $result;
}