--- loncom/homework/inputtags.pm 2016/12/06 20:51:11 1.344
+++ loncom/homework/inputtags.pm 2019/08/11 17:11:00 1.349
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.344 2016/12/06 20:51:11 damieng Exp $
+# $Id: inputtags.pm,v 1.349 2019/08/11 17:11:00 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -667,13 +667,14 @@ sub file_selector {
if ($constraints) {
$result .= $constraints.'
';
}
- if ($which eq 'uploadonly' || $which eq 'both') {
+ if ($which eq 'uploadonly' || $which eq 'both') {
my $free_space = $maxfilesize * 1048576;
$result .= &mt('Submit a file: (only one file per submission)').
'
'.
- '
'
- }
+ '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload LC_hwkfile" />'.
+ '
';
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -694,7 +695,6 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
-
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -1904,8 +1904,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;
}