--- loncom/homework/bridgetask.pm 2006/03/28 21:06:00 1.124
+++ loncom/homework/bridgetask.pm 2006/03/31 20:29:56 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.124 2006/03/28 21:06:00 albertel Exp $
+# $Id: bridgetask.pm,v 1.135 2006/03/31 20:29:56 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -259,64 +259,14 @@ sub preserve_grade_info {
}
sub style {
- return (<
+ my ($target) = @_;
+ if ($target eq 'web'
+ || $target eq 'webgrade') {
+ return (<
STYLE
-
+ }
+ return;
}
sub show_task {
@@ -429,6 +379,7 @@ sub start_Task {
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ $head_tag_start .= &style($target);
$body_tag_start .= '
'."\n";
if ($target eq 'web' || $target eq 'webgrade') {
@@ -547,7 +498,7 @@ DONESCREEN
}
} elsif ($target eq 'web') {
$result.="$head_tag_start
- $body_tag_start \n".&style();
+ $body_tag_start \n";
$result.=&preserve_grade_info();
$result.=&internal_location();
@@ -563,7 +514,7 @@ DONESCREEN
''.$body_tag_start.
"\n".'
'."\n".
'';
+ src="/res/adm/includes/task_grading.js">';
#$result.='
Review'.&show_queue('reviewqueue');
#$result.='
Grade'.&show_queue('gradingqueue');
}
@@ -1023,7 +974,7 @@ DONEBUTTON
&Apache::structuretags::finalize_storage();
}
} elsif ($target eq 'webgrade') {
- $result.="
\n
";
+ $result.="
";
#$result.=''."\n";
+ '
'."\n";
@Apache::scripttag::parser_env = @_;
$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
$result.='
'."\n".
@@ -1923,8 +1872,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();
}
}
@@ -1932,6 +1881,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 {