--- loncom/homework/inputtags.pm	2004/02/06 22:39:56	1.124.2.1
+++ loncom/homework/inputtags.pm	2004/02/24 23:22:24	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.124.2.1 2004/02/06 22:39:56 albertel Exp $
+# $Id: inputtags.pm,v 1.132 2004/02/24 23:22:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -24,8 +24,6 @@
 # /home/httpd/html/adm/gpl.txt
 #
 # http://www.lon-capa.org/
-#
-# 2/19 Guy 
 
 package Apache::inputtags;
 use HTML::Entities();
@@ -371,7 +369,7 @@ sub decideoutput {
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
 	      $message.=(($target eq 'web')?'<br />':' ').
-		  &mt('Your receipt is').' '.&Apache::lonnet::receipt().
+		  &mt('Your receipt is').' '.&Apache::lonnet::receipt($Apache::inputtags::part).
        (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
       }
@@ -398,7 +396,7 @@ sub decideoutput {
 			   $ENV{'request.course.id'}.
 			   '.disable_receipt_display'} eq 'yes') { 
 	      $message.=(($target eq 'web')?'<br />':' ').
-		  'Your receipt is '.&Apache::lonnet::receipt().
+		  'Your receipt is '.&Apache::lonnet::receipt($Apache::inputtags::part).
        (($target eq 'web')?&Apache::loncommon::help_open_topic('Receipt'):'');
 	  }
 	  $bgcolor=$possiblecolors{'correct'};
@@ -480,7 +478,7 @@ sub decideoutput {
   }
   if (lc($Apache::lonhomework::problemstatus) eq 'no'  && 
       $Apache::inputtags::status[-1] ne 'SHOW_ANSWER') {
-      $message = &mt("Answer Submitted");
+      $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
       $bgcolor=$possiblecolors{'correct'};
       $button=1;
   }
@@ -663,7 +661,7 @@ sub gradestatus {
       ($showbutton,$bgcolor,$message,$previousmsg) =
 	&decideoutput($award,$solved,$previous,$target);
       if ($target eq 'tex') {
-	$message=' '.$message.' ';
+	$message='\vskip 2 mm '.$message.' ';
       } else {
 	$message="<td bgcolor=\"$bgcolor\">$message</td>";
 	if ($previousmsg) {
@@ -679,21 +677,31 @@ sub gradestatus {
     if ( $tries eq '' ) { $tries = '0'; }
     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 ( $showbutton ) {
       if ($target eq 'tex') {
 	  if ($ENV{'request.state'} ne "construct" && $Apache::lonhomework::type ne 'exam') {
-	      $trystr = ' {\vskip 1 mm \small \textit{'.&mt('Tries').'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
+	      $trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.$tries.'/'.$maxtries.'} \vskip 2 mm ';
 	  } else {
 	      $trystr = '\vskip 0 mm ';
 	  }
       } else {
-         $trystr = "<td>".&mt('Tries')." $tries/$maxtries</td>";
+	  $trystr = "<td>".$tries_text." $tries";
+	  if($ENV{'request.state'} ne 'construct') {
+	      $trystr.="/$maxtries";
+	  } else {
+	      if (defined($Apache::inputtags::params{'maxtries'})) {
+		  $trystr.="/".$Apache::inputtags::params{'maxtries'};
+	      }
+	  }
+	  $trystr.="</td>";
       }
     }
     if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
     if ( $showbutton ) { 
       if ($target ne 'tex') {
-        $button = '<br /><input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
+        $button = '<input type="submit" name="submit" value="'.&mt('Submit Answer').'" />';
       }
     }
     if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {
@@ -712,7 +720,7 @@ sub gradestatus {
     if ($target eq 'tex') {
       return $button.' \vskip 0 mm '.$output.' ';
     } else {
-      return $button.'<table><tr>'.$output.'</tr></table>';
+      return '<table><tr><td>'.$button.'</td>'.$output.'</tr></table>';
     }
   }
 }