--- loncom/homework/bridgetask.pm 2006/11/07 21:31:22 1.196 +++ loncom/homework/bridgetask.pm 2006/11/13 21:25:21 1.203 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: bridgetask.pm,v 1.196 2006/11/07 21:31:22 albertel Exp $ +# $Id: bridgetask.pm,v 1.203 2006/11/13 21:25:21 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -234,36 +234,43 @@ sub add_grading_button { if (scalar(keys(%sections)) < 3) { $size=scalar(keys(%sections))+2; } - my $sec_select = '\n"; - my $result=' '; - $result.=''; + $result.="\n\t".''; if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue'); - $result.='
Specify a section: | '.$sec_select.' | '; - $result.=''.' '."\n\t\t".' |
Specify a section: | '. + "\n\t\t\t".''.$sec_select."\n\t\t\t".' | '; + $result.="\n\t\t\t".''.' '; - $result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' |
'. - ' '. + "\n\t\t\t".' | '. + "\n\t\t\t\t".' '; $result.=&mt("[_1] entries, [_2] ready, [_3] being graded", - $entries,$ready,$locks).' | |
'."\n"; - $result.=''; + $entries,$ready,$locks).''."\n\t\t".''."\n"; + $result.="\n\t\t".'
'. + "\n\t\t".''; + $result.= "\n\t\t".''; $result.=&Apache::loncommon::select_dom_form($env{'user.domain'}, 'gradingdomain'); $result.=' '. @@ -271,7 +278,7 @@ sub add_grading_button { 'gradinguser', 'gradingdomain'); $result.=&Apache::loncommon::studentbrowser_javascript(); - $result.= '
'; + $result.= ''."\n"; } return $result; } @@ -295,18 +302,19 @@ sub add_request_another_attempt_button { my $description=&Apache::slotrequest::get_description($slot_name, $slot); $result.=(<Will be next available: $description
STUFF } if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); } $symb=&escape($symb); - $result.=''; + &mt($text).'" />'."\n\t". + ''."\n"; return $result; } @@ -584,7 +592,7 @@ sub start_Task { $result.='"; + $result.=$uri.'">'.&add_grading_button()."\n"; my $symb=&Apache::lonnet::symbread(); if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) { $result.=''; + } + + $result.=''; + + if (!$previous && $status ne 'SHOW_ANSWER' && + &show_task($status,$previous)) { my $action = &Apache::lonenc::check_encrypt($env{'request.uri'}); $result.=<". + &question_status_message(\%counts,-1). + "
\n".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."
\n" + .&question_status_message(\%counts, + $dimension{$dim}{'depth'}) + ."
\n'; + '
'.$status_display.'
'; + $criteria_info.="\n\t".''. + "\n\t".''.$status_display.'
'; if ($comment =~ /\w/) { - $criteria_info.=''. - &mt('Comment: [_1]',$comment).'
'; + $criteria_info.= + "\n\t". + ''.&mt('Comment: [_1]',$comment).'
'; } - $criteria_info.='