--- loncom/homework/inputtags.pm	2008/12/07 23:40:57	1.251
+++ loncom/homework/inputtags.pm	2009/04/16 14:45:47	1.257
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.251 2008/12/07 23:40:57 www Exp $
+# $Id: inputtags.pm,v 1.257 2009/04/16 14:45:47 onken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -388,7 +388,8 @@ sub start_textline {
 	     && $Apache::lonhomework::type ne 'exam') {
 	my $size = &Apache::lonxml::get_param('size',$parstack,$safeeval);
 	if ($size != 0) {$size=$size*2; $size.=' mm';} else {$size='40 mm';}
-	if ($env{'form.pdfFormFields'} eq 'yes') {
+	if ($env{'form.pdfFormFields'} eq 'yes'
+            && $Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
             my $fieldname = $env{'request.symb'}.
                                  '&part_'. $Apache::inputtags::part.
                                  '&textresponse'.
@@ -461,16 +462,17 @@ sub end_hiddenline {
 $part -> partid
 $id -> responseid
 $uploadefiletypes -> comma seperated list of extensions allowed or * for any
-$which -> 'uploadedonly'  -> only newly uploaded files
+$which -> 'uploadonly'  -> only newly uploaded files
           'portfolioonly' -> only allow files from portfolio
           'both' -> allow files from either location
 $extratext -> additional text to go between the link and the input box
+$maxfilesize -> maximum cumulative filesize for submitted files (in MB).
 returns a table row <tr> 
 
 =cut
 
 sub file_selector {
-    my ($part,$id,$uploadedfiletypes,$which,$extratext)=@_;
+    my ($part,$id,$uploadedfiletypes,$which,$extratext,$maxfilesize)=@_;
     if (!$uploadedfiletypes) { return ''; }
 
     my $jspart=$part;
@@ -479,9 +481,16 @@ sub file_selector {
     my $result;
     
     $result.='<tr><td>';
-    if ($uploadedfiletypes ne '*') {
-	$result.=
-	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+    if (($uploadedfiletypes ne '*') || ($maxfilesize)) {
+        if ($uploadedfiletypes ne '*') {
+	    $result.=
+	        &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+        }
+        if ($maxfilesize) {
+            $result.=&mt('Combined size of files not to exceed: [_1] MB[_2].',
+                         '<b>'.$maxfilesize.'</b>').'<br />';
+        }
+        $result .= '<br />';
     }
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file can be uploaded)').
@@ -498,7 +507,6 @@ sub file_selector {
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
 	$result .= &show_past_portfile_submission($part,$id);
-
     }
     $result.='</td></tr>'; 
     return $result;
@@ -728,7 +736,7 @@ sub decideoutput {
 			      '.disable_receipt_display'} ne 'yes') &&
                     ($Apache::lonhomework::type ne 'practice')) { 
 		    $message.=(($target eq 'web')?'<br />':' ').
-			&mt('Your receipt is [_1]',
+			&mt('Your receipt no. is [_1]',
 			    (&Apache::lonnet::receipt($Apache::inputtags::part).
 			     (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'')));
 		}
@@ -810,7 +818,7 @@ sub decideoutput {
         $css_class=$possible_class{'not_charged_try'};
         $button=1;
     } elsif ($award eq 'INVALID_FILETYPE') {
-	$message = &mt('Submission won\'t be graded. The type of file submitted is not allowed.');
+	$message = &mt("Submission won't be graded. The type of file submitted is not allowed.");
 	$css_class=$possible_class{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'SIG_FAIL') {
@@ -887,14 +895,27 @@ sub decideoutput {
     my (undef,undef,$domain,$user)=&Apache::lonnet::whichuser();
     foreach my $resid(@Apache::inputtags::response){
         if ($Apache::lonhomework::history{"resource.$part.$resid.handback"}) {
-	    $message.='<br />';
+            if ($target eq 'tex') {
+                $message.= "\\\\\n";
+            } else {
+                $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>';
+                if ($target eq 'tex') {
+                    $file_msg.= "\\\\\n".$file;
+                } else {
+                    $file_msg.= '<br /><a href="/uploaded/'."$domain/$user".'/'.$file.'">'.$file.'</a>';
+                }
 	    }
 	    $message .= &mt('Returned file(s): [_1]',$file_msg);
+            if ($target eq 'tex') {
+                $message.= "\\\\\n";
+            } else {
+                $message.='<br />';
+            }
 	}
     }
 
@@ -1216,7 +1237,7 @@ sub get_grade_messages {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-	    $trystr = "<td><nobr>".$tries_text." $tries";
+	    $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
 		$trystr.="/$maxtries";
@@ -1225,7 +1246,7 @@ sub get_grade_messages {
 		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr.="</nobr></td>";
+	    $trystr.="</span></td>";
 	}
     }