--- loncom/homework/grades.pm 2013/07/15 16:13:12 1.694 +++ loncom/homework/grades.pm 2013/07/16 17:17:33 1.695 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Grading handler # -# $Id: grades.pm,v 1.694 2013/07/15 16:13:12 bisitz Exp $ +# $Id: grades.pm,v 1.695 2013/07/16 17:17:33 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1702,7 +1702,7 @@ sub gradeBox { $wgt = ($wgt > 0 ? $wgt : '1'); my $score = ($$record{'resource.'.$partid.'.awarded'} eq '' ? '' : &compute_points($$record{'resource.'.$partid.'.awarded'},$wgt)); - my $result=''."\n"; + my $data_WGT=''."\n"; my $display_part= &get_display_part($partid,$symb); my %last_resets = &get_last_resets($symb,$env{'request.course.id'}, [$partid]); @@ -1710,7 +1710,7 @@ sub gradeBox { if ($last_resets{$partid}) { $aggtries = &get_num_tries($record,$last_resets{$partid},$partid); } - $result.=&Apache::loncommon::start_data_table_row(); + my $result=&Apache::loncommon::start_data_table_row(); my $ctr = 0; my $thisweight = 0; my $increment = &get_increment(); @@ -1747,8 +1747,9 @@ sub gradeBox { $result .= - ''.$display_part.''.$radio.''.&mt('or').''.$line.''; + ''.$data_WGT.$display_part.''.$radio.''.&mt('or').''.$line.''; $result.=&Apache::loncommon::end_data_table_row(); + $result.=&Apache::loncommon::start_data_table_row().''; $result.=''."\n". ''."\n". ''."\n"; my $res_error; $result.=&handback_box($symb,$uname,$udom,$counter,$partid,$record,\$res_error); + $result.=''.&Apache::loncommon::end_data_table_row(); if ($res_error) { return &navmap_errormsg(); } @@ -2051,7 +2053,7 @@ sub submission {
$lt{'keyw'}:  $lt{'list'}    $lt{'past'}    + class="page">$lt{'past'}    $lt{'high'}

KEYWORDS # @@ -2167,13 +2169,14 @@ KEYWORDS if ($env{"form.$uname:$udom:$partid:submitted_by"}) { if (exists($seenparts{$partid})) { next; } $seenparts{$partid}=1; - my $submitby='Part: '.$display_part. - ' Collaborative submission by: '. - ''. - $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.'
'; - $request->print($submitby); + $request->print( + ''.&mt('Part: [_1]',$display_part).''. + ' '.&mt('Collaborative submission by: [_1]', + ''. + $$fullname{$env{"form.$uname:$udom:$partid:submitted_by"}}.''). + '
'); next; } my $responsetype = $responseType->{$partid}->{$respid}; @@ -2243,7 +2246,7 @@ KEYWORDS $lastsubonly.='
'.&mt('Like all files provided by users, this file may contain viruses').'
'; foreach my $file (@$files) { &Apache::lonnet::allowuploaded('/adm/grades',$file); - $lastsubonly.='
'.$file.''; + $lastsubonly.='
'.$file.''; } } $lastsubonly.='
'; @@ -2300,10 +2303,10 @@ KEYWORDS ''."\n"; $result.=' '. - &mt('Compose message to student').(scalar(@$col_fullnames) >= 1 ? 's' : '').'