--- loncom/homework/bridgetask.pm 2006/03/28 19:55:43 1.122 +++ loncom/homework/bridgetask.pm 2006/03/28 21:06:00 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.122 2006/03/28 19:55:43 albertel Exp $ +# $Id: bridgetask.pm,v 1.124 2006/03/28 21:06:00 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -213,6 +213,7 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); + $result.= '</p>'; } return $result; } @@ -429,6 +430,13 @@ sub start_Task { &Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); $body_tag_start .= '<div class="LC_task">'."\n"; + + if ($target eq 'web' || $target eq 'webgrade') { + $head_tag_start.='<title>'. + &Apache::structuretags::get_resource_name($parstack,$safeeval). + '</title>'; + } + if ($target eq 'web' && $env{'request.state'} ne 'construct') { if ($Apache::lonhomework::modifygrades) { $body_tag_start.='<form name="gradesubmission" method="post" action="'; @@ -538,8 +546,7 @@ DONESCREEN } } } elsif ($target eq 'web') { - my $name= &Apache::structuretags::get_resource_name($parstack,$safeeval); - $result.="$head_tag_start<title>$name</title></head> + $result.="$head_tag_start</head> $body_tag_start \n".&style(); $result.=&preserve_grade_info(); @@ -552,7 +559,11 @@ DONESCREEN $target eq 'webgrade') { my $webgrade='yes'; if ($target eq 'webgrade') { - $result.=$head_tag_start.'</head>'.$body_tag_start; + $result.=$head_tag_start. + '</head>'.$body_tag_start. + "\n".'<div class="LC_GRADING_task">'."\n". + '<script type="text/javascript" + src="/adm/includes/task_grading.js"></script>'; #$result.='<br />Review'.&show_queue('reviewqueue'); #$result.='<br />Grade'.&show_queue('gradingqueue'); } @@ -1021,7 +1032,7 @@ DONEBUTTON # &mt('Throw Away & Stop Grading').'" /> '; #$result.='<input type="submit" name="save" value="'. # &mt('Save Partial Grade and Continue Grading').'" /> '; - $result.='</form>'."\n</div>\n". + $result.='</form>'."\n</div>\n</div>\n". &Apache::loncommon::endbodytag().'</html>'; } elsif ($target eq 'meta') { $result.=&Apache::response::meta_package_write('Task');