--- loncom/homework/inputtags.pm 2009/09/23 03:15:18 1.259.2.1
+++ loncom/homework/inputtags.pm 2009/12/06 21:00:15 1.260.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.259.2.1 2009/09/23 03:15:18 gci Exp $
+# $Id: inputtags.pm,v 1.260.4.1 2009/12/06 21:00:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -873,6 +873,8 @@ sub decideoutput {
if ($target eq 'web') {
$message .= '
'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
}
+ } else {
+ $message = &mt("Your submission has been recorded.");
}
$css_class=$possible_class{'no_grade'};
$button=1;
@@ -932,10 +934,10 @@ sub decideoutput {
&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
}
} else {
- $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+ $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
}
- $css_class=$possible_class{'no_grade'};
- $button=1;
+ $css_class=$possible_class{'no_grade'};
+ $button=1;
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {
@@ -1252,16 +1254,16 @@ sub get_grade_messages {
my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
if ($parmhash{'suppress_tries'} ne 'yes') {
$trystr .= "$tries_text $tries";
- if ($Apache::lonhomework::parsing_a_task) {
- } elsif($env{'request.state'} ne 'construct') {
- $trystr.="/$maxtries";
- } else {
- if (defined($Apache::inputtags::params{'maxtries'})) {
- $trystr.="/".$Apache::inputtags::params{'maxtries'};
- }
- }
+ if ($Apache::lonhomework::parsing_a_task) {
+ } elsif($env{'request.state'} ne 'construct') {
+ $trystr.="/$maxtries";
+ } else {
+ if (defined($Apache::inputtags::params{'maxtries'})) {
+ $trystr.="/".$Apache::inputtags::params{'maxtries'};
+ }
+ }
}
- $trystr.="";
+ $trystr.="";
}
}
@@ -1302,17 +1304,15 @@ sub gradestatus {
undef($previousmsg);
}
if ( $showbutton ) {
- if ($target ne 'tex') {
+ if ($target ne 'tex') {
my $submit_text = &mt('Submit Answer');
if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
$submit_text = &mt('Submit Questions');
}
$button =
- '';
+ '';
}
}
@@ -1408,8 +1408,12 @@ sub previous_tries {
$output.='