--- loncom/homework/inputtags.pm 2004/02/06 22:39:56 1.124.2.1
+++ loncom/homework/inputtags.pm 2004/02/24 22:34:51 1.131
@@ -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.131 2004/02/24 22:34:51 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();
@@ -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="
$message | ";
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 = "".&mt('Tries')." $tries/$maxtries | ";
+ $trystr = "".$tries_text." $tries";
+ if($ENV{'request.state'} ne 'construct') {
+ $trystr.="/$maxtries";
+ } else {
+ if (defined($Apache::inputtags::params{'maxtries'})) {
+ $trystr.="/".$Apache::inputtags::params{'maxtries'};
+ }
+ }
+ $trystr.=" | ";
}
}
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '
';
+ $button = '';
}
}
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.'';
+ return '';
}
}
}