--- loncom/homework/inputtags.pm	2006/06/12 22:03:44	1.196
+++ loncom/homework/inputtags.pm	2006/07/20 21:48:07	1.204
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.196 2006/06/12 22:03:44 albertel Exp $
+# $Id: inputtags.pm,v 1.204 2006/07/20 21:48:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -283,9 +283,7 @@ sub start_textline {
 	$Apache::lonxml::evaluate--;
 	my $partid=$Apache::inputtags::part;
 	my $id=$Apache::inputtags::response[-1];
-	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER'
-	    || ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER' &&
-		$Apache::lonhomework::history{"resource.$partid.solved"} !~ /^correct/	)) {
+	if (!&Apache::response::show_answer()) {
 	    my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	    my $maxlength;
 	    if ($size eq '') { $size=20; } else {
@@ -440,12 +438,12 @@ sub file_selector {
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
 	if ($Apache::lonhomework::history{"resource.$part.$id.portfiles"}=~/[^\s]/){
-	    my (@filelist,@bad_file_list);
-	    foreach my $file (split(',',&unescape($Apache::lonhomework::history{"resource.$part.$id.portfiles"}))) {
+	    my (@file_list,@bad_file_list);
+	    foreach my $file (split(/\s*,\s*/,&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);
-		push(@filelist,'<a href="'.$url.'"><img src="'.$icon.
+		push(@file_list,'<a href="'.$url.'"><img src="'.$icon.
 		     '" border="0" />'.$file.'</a>');
 		if (! &Apache::lonnet::stat_file($url)) {
 		    &Apache::lonnet::logthis("bad file is $url");
@@ -453,9 +451,15 @@ sub file_selector {
 			 '" border="0" />'.$file.'</a>');
 		}
 	    }
-	    $result.=&mt("Portfolio files previously selected: <strong>[_1]</strong>",join(', ',@filelist));
+	    my $files = '<span class="LC_filename">'.
+		join('</span>, <span class="LC_filename">',@file_list).
+		'</span>';
+	    $result.=&mt("Portfolio files previously selected: [_1]",$files);
 	    if (@bad_file_list) {
-		$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> <span class="LC_filename">[_1]</span>',join(', ',@bad_file_list));
+		my $bad_files = '<span class="LC_filename">'.
+		    join('</span>, <span class="LC_filename">',@bad_file_list).
+		    '</span>';
+		$result.='<br />'.&mt('<span class="LC_error">These file(s) don\'t exist:</span> [_1]',$bad_files);
 	    }
 	}
     }
@@ -534,10 +538,11 @@ sub decideoutput {
     my $bgcolor='orange';
     my $added_computer_text=0;
     my %possiblecolors =
-	( 'correct' => '#aaffaa',
-	  'charged_try' => '#ffaaaa',
+	( 'correct'         => '#aaffaa',
+	  'charged_try'     => '#ffaaaa',
 	  'not_charged_try' => '#ffffaa',
-	  'no_message' => '#fffff',
+	  'no_grade'        => '#ffffaa',
+	  'no_message'      => '#ffffff',
 	  );
 
     my $part = $Apache::inputtags::part;
@@ -696,7 +701,7 @@ sub decideoutput {
 	$button=1;
     } elsif ($award eq 'SUBMITTED') {
 	$message = &mt("Your submission has been recorded.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     } elsif ($award eq 'DRAFT') {
 	$message = &mt("A draft copy has been saved.");
@@ -720,16 +725,22 @@ sub decideoutput {
     }
     my (undef,undef,$domain,$user)=&Apache::lonxml::whichuser();
     foreach my $resid(@Apache::inputtags::response){
-        &Apache::lonnet::logthis("handback is ".$Apache::lonhomework::history{"resource.$part.$resid.handback"});
         if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
-            $message.= '<br /><a href="/uploaded/'."$domain/$user".'/portfolio/'.$Apache::lonhomework::history{"resource.$part.$resid.handback"}.'">Returned File</a>';
-        }
+	    $message.='<br />';
+	    my @files = split(/\s*,\s*/,
+			      $Apache::lonhomework::history{"resource.$part.$resid.handback"});
+	    my $file_msg;
+	    foreach my $file (@files) {
+		$file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+	    }
+	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+	}
     }
 
     if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
 	$Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
 	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
-	$bgcolor=$possiblecolors{'correct'};
+	$bgcolor=$possiblecolors{'no_grade'};
 	$button=1;
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&