--- loncom/homework/inputtags.pm 2016/08/05 23:17:10 1.333.2.4
+++ loncom/homework/inputtags.pm 2015/10/30 03:49:47 1.338
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.4 2016/08/05 23:17:10 raeburn Exp $
+# $Id: inputtags.pm,v 1.338 2015/10/30 03:49:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,7 +460,7 @@ sub start_textline {
}
my $name = 'HWVAL_'.$id;
my $itemid = 'HWVAL_'.$partid.'_'.$id;
- my $input_tag_id = $itemid.'_'.$input_id;
+ my $input_tag_id = 'HWVAL_'.$input_id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
@@ -646,7 +646,7 @@ sub file_selector {
my $current_files_display = ¤t_file_submissions($part,$id);
my $addfiles;
if ($current_files_display) {
- $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
$current_files_display.
&Apache::lonhtmlcommon::row_closure();
$addfiles = &mt('Submit other file(s)');
@@ -667,10 +667,12 @@ sub file_selector {
$result .= $constraints.'
';
}
if ($which eq 'uploadonly' || $which eq 'both') {
- $result.=&mt('Submit a file: (only one file per submission)').
- '
';
- }
+ my $free_space = $maxfilesize * 1048576;
+ $result .= &mt('Submit a file: (only one file per submission)').
+ '
'.
+ '
'
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -704,6 +706,15 @@ sub current_file_submissions {
my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
+ my @unversioned;
+ foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
+ my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
+ unless ($version) {
+ push(@unversioned,$file);
+ }
+ }
+ return if (!@unversioned);
my $header = &portpath_popup_js().
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
@@ -714,7 +725,7 @@ sub current_file_submissions {
'