--- loncom/homework/bridgetask.pm 2006/03/28 21:11:02 1.125 +++ loncom/homework/bridgetask.pm 2006/03/30 22:39:17 1.134 @@ -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.134 2006/03/30 22:39:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -263,7 +263,7 @@ sub style { if ($target eq 'web' || $target eq 'webgrade') { return (<<STYLE); -<link rel="stylesheet" type="text/css" href="/adm/includes/task.css" /> +<link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" /> STYLE } return; @@ -514,7 +514,7 @@ DONESCREEN '</head>'.$body_tag_start. "\n".'<div class="LC_GRADING_task">'."\n". '<script type="text/javascript" - src="/adm/includes/task_grading.js"></script>'; + src="/res/adm/includes/task_grading.js"></script>'; #$result.='<br />Review'.&show_queue('reviewqueue'); #$result.='<br />Grade'.&show_queue('gradingqueue'); } @@ -974,7 +974,7 @@ DONEBUTTON &Apache::structuretags::finalize_storage(); } } elsif ($target eq 'webgrade') { - $result.="</div>\n<hr />"; + $result.="</div>"; #$result.='<input type="submit" name="next" value="'. # &mt('Save & Next').'" /> '; #$result.='<input type="submit" name="end" value="'. @@ -1764,9 +1764,7 @@ sub get_instance { my $link=&link($instance,$id); my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"}; $result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n". - '<a name="'.$link.'" />'."\n". - '<a name="next_'.$last_link.'" />'."\n". - '<div class="LC_GRADING_criteriatext">'."\n"; + '<div class="LC_GRADING_criteriatext" id="'.$last_link.'">'."\n"; @Apache::scripttag::parser_env = @_; $result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id}); $result.='</div>'."\n". @@ -1874,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(); } } @@ -1883,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 {