--- loncom/homework/bridgetask.pm 2006/03/28 21:11:02 1.125
+++ loncom/homework/bridgetask.pm 2006/03/31 20:31:38 1.128.2.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.125 2006/03/28 21:11:02 albertel Exp $
+# $Id: bridgetask.pm,v 1.128.2.6 2006/03/31 20:31:38 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -263,7 +263,7 @@ sub style {
if ($target eq 'web'
|| $target eq 'webgrade') {
return (<
+
STYLE
}
return;
@@ -455,11 +455,7 @@ sub start_Task {
my $files = '
'."\n".
'';
+ src="/res/adm/includes/task_grading.js">';
#$result.='
Review'.&show_queue('reviewqueue');
#$result.='
Grade'.&show_queue('gradingqueue');
}
@@ -974,7 +970,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="
\n'."\n";
+ '
'."\n";
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='
'."\n".
@@ -1874,8 +1868,8 @@ sub start_IntroParagraph {
if ($tagstack->[-2] eq 'Dimension') {
$dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
- } elsif ($target eq 'webgrade') {
- &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
+ } elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ &Apache::lonxml::startredirection();
}
}
@@ -1883,6 +1877,10 @@ sub start_IntroParagraph {
}
sub end_IntroParagraph {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ if ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
+ my $result = &Apache::lonxml::endredirection();
+ }
}
sub start_Instance {