--- loncom/homework/inputtags.pm	2005/03/31 21:24:29	1.160
+++ loncom/homework/inputtags.pm	2005/04/05 15:39:41	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.160 2005/03/31 21:24:29 albertel Exp $
+# $Id: inputtags.pm,v 1.164 2005/04/05 15:39:41 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,8 +306,11 @@ sub file_selector {
     if (!$uploadedfiletypes) { return ''; }
     my $result;
     
-    $result.='<tr><td>'.
-	&mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    $result.='<tr><td>';
+    if ($uploadedfiletypes ne '*') {
+	$result.=
+	    &mt('Allowed filetypes: <b>[_1]</b>',$uploadedfiletypes).'<br />';
+    }
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
@@ -335,15 +338,15 @@ sub file_selector {
 	    '<input type="text" size="50" name="HWPORT'.$part.'_'.$id.'" value="" />'.
 	    '<br />';
 	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my $filelist;
+	    my @filelist;
 	    foreach my $file (split(',',&Apache::lonnet::unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
 		my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
 		my $url="/uploaded/$domain/$user/portfolio$file";
 		my $icon=&Apache::loncommon::icon($url);
-		$filelist.='<a href="'.$url.'"><img src="'.$icon.
-		    '" border="0" />'.$file.'</a>';
+		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
+		     '" border="0" />'.$file.'</a>');
 	    }
-	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",$filelist);
+	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
 	}
     }
     $result.='</td></tr>'; 
@@ -805,7 +808,10 @@ sub gradestatus {
 	if ( $maxtries eq '' ) { $maxtries = '2'; } 
 	if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
 	my $tries_text=&mt('Tries');
-	if ( $Apache::lonhomework::type eq 'survey') { $tries_text=&mt('Submissions'); }
+	if ( $Apache::lonhomework::type eq 'survey' ||
+	     $Apache::lonhomework::parsing_a_task) {
+	    $tries_text=&mt('Submissions');
+	}
 	if ( $showbutton ) {
 	    if ($target eq 'tex') {
 		if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam' && $ENV{'form.suppress_tries'} ne 'yes') {
@@ -815,7 +821,8 @@ sub gradestatus {
 		}
 	    } else {
 		$trystr = "<td><nobr>".$tries_text." $tries";
-		if($ENV{'request.state'} ne 'construct') {
+		if ($Apache::lonhomework::parsing_a_task) {
+		} elsif($ENV{'request.state'} ne 'construct') {
 		    $trystr.="/$maxtries";
 		} else {
 		    if (defined($Apache::inputtags::params{'maxtries'})) {
@@ -833,10 +840,9 @@ sub gradestatus {
 	}
 	if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
 	    #last submissions was after due date
-	    if ($target eq 'tex') {
-		$latemessage=' The last submission was after the Due Date ';
-	    } else {
-		$latemessage="<td bgcolor=\"#ffaaaa\">The last submission was after the Due Date</td>";
+	    $latemessage=&mt(' The last submission was after the Due Date ');;
+	    if ($target eq 'web') {
+		$latemessage='<td bgcolor="#ffaaaa">'.$latemessage.'</td>';
 	    }
 	}
     }