--- loncom/homework/inputtags.pm 2005/04/07 06:56:21 1.165
+++ loncom/homework/inputtags.pm 2005/06/20 19:54:28 1.168
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.165 2005/04/07 06:56:21 albertel Exp $
+# $Id: inputtags.pm,v 1.168 2005/06/20 19:54:28 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -235,7 +235,7 @@ sub start_textline {
}
} else {
#right or wrong don't show what was last typed in.
- $result=''.$Apache::inputtags::answertxt{$id}.'';
+ $result=''.$Apache::inputtags::answertxt{$id}.'';
#$result='';
}
} elsif ($target eq 'edit') {
@@ -305,6 +305,10 @@ sub end_hiddenline {
sub file_selector {
my ($part,$id,$uploadedfiletypes,$which)=@_;
if (!$uploadedfiletypes) { return ''; }
+
+ my $jspart=$part;
+ $jspart=~s/\./_/g;
+
my $result;
$result.='
';
@@ -315,7 +319,7 @@ sub file_selector {
if ($which eq 'uploadonly' || $which eq 'both') {
$result.=&mt('Submit a file: (only one file can be uploaded)').
'
';
+ $jspart.'_'.$id.'" /> ';
my $uploadedfile= &HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
if ($uploadedfile) {
@@ -334,9 +338,9 @@ sub file_selector {
$result.=' '.''.&mt('OR:').' ';
}
if ($which eq 'portfolioonly' || $which eq 'both') {
- $result.=''.
+ $result.=''.
&mt('Select Portfolio Files').' '.
- ''.
+ ''.
' ';
if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
my @filelist;
@@ -494,7 +498,7 @@ sub decideoutput {
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
- $message = &mt('The filetype extension of the file you uploaded is not allowed.');
+ $message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'SIG_FAIL') {