--- loncom/homework/inputtags.pm 2015/04/21 12:28:05 1.334 +++ loncom/homework/inputtags.pm 2015/10/05 02:35:40 1.337 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.334 2015/04/21 12:28:05 raeburn Exp $ +# $Id: inputtags.pm,v 1.337 2015/10/05 02:35:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -661,10 +661,12 @@ sub file_selector { $result .= $constraints.'
'; } if ($which eq 'uploadonly' || $which eq 'both') { - $result.=&mt('Submit a file: (only one file per submission)'). - '

'; - } + my $free_space = $maxfilesize * 1048576; + $result .= &mt('Submit a file: (only one file per submission)'). + '

'. + '
' + } if ( $which eq 'both') { $result.='
'.''.&mt('OR:').'
'; } @@ -906,7 +908,7 @@ sub valid_award { { my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE', - 'WRONG_NUMCHECKEDBOXES','TOO_LONG', + 'WRONG_NUMBOXESCHECKED','TOO_LONG', 'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT', 'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT', 'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION', @@ -1698,7 +1700,8 @@ sub gradestatus { && $status ne 'NOT_IN_A_SLOT' && $status ne 'RESERVABLE' && $status ne 'RESERVABLE_LATER' - && $status ne 'NOTRESERVABLE') { + && $status ne 'NOTRESERVABLE' + && $status ne 'NEED_DIFFERENT_IP') { if ($status eq 'SHOW_ANSWER') { $showbutton = 0;