--- loncom/homework/inputtags.pm 2015/10/30 11:33:07 1.333.2.3
+++ loncom/homework/inputtags.pm 2019/03/18 20:21:14 1.333.2.5
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.3 2015/10/30 11:33:07 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.5 2019/03/18 20:21:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1048,7 +1048,7 @@ sub decideoutput {
#
my $computer = ($handgrade || $nocorrect)? ''
- : " ".&mt("Computer's answer now shown above.");
+ : &mt("Computer's answer now shown above.");
&Apache::lonxml::debug("handgrade has :$handgrade:");
if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
@@ -1072,7 +1072,9 @@ sub decideoutput {
$message = '\textbf{'.$message.'}';
} else {
$message = "".$message."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0) {
@@ -1116,7 +1118,9 @@ sub decideoutput {
$message = '\textbf{'.&mt('You are correct.').'}';
} else {
$message = "".&mt('You are correct.')."";
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
}
$added_computer_text=1;
if ($awarded > 0
@@ -1328,7 +1332,9 @@ sub decideoutput {
}
if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&
!$added_computer_text && $target ne 'tex') {
- $message.= $computer;
+ if ($computer) {
+ $message = "$computer $message";
+ }
$added_computer_text=1;
}
if ($Apache::lonhomework::type eq 'practice') {
@@ -1865,8 +1871,13 @@ sub previous_tries {
my $tries_text = &get_tries_text('link');
my $prefix = $env{'form.request.prefix'};
$prefix =~ tr{.}{_};
- my $function_name = "LONCAPA_previous_tries_".$prefix.
- $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
+ my $function_name = 'LONCAPA_previous_tries_'.$prefix;
+ if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+ $function_name .= $Apache::lonxml::curdepth;
+ } else {
+ $function_name .= &js_escape($id);
+ }
+ $function_name .= '_'.$Apache::lonxml::counter;
my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."
";
return $result;
}