--- loncom/homework/inputtags.pm 2014/09/14 15:21:43 1.325 +++ loncom/homework/inputtags.pm 2014/12/22 17:04:03 1.329 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # input definitons # -# $Id: inputtags.pm,v 1.325 2014/09/14 15:21:43 raeburn Exp $ +# $Id: inputtags.pm,v 1.329 2014/12/22 17:04:03 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -235,6 +235,7 @@ sub start_textfield { my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval); $result=''; my $tagident = 'HWVAL_' . $resid; + my $itemid = 'HWVAL_'.$partid.'_'.$resid; if ($addchars) { $result.=&addchars($tagident, $addchars); } @@ -243,7 +244,7 @@ sub start_textfield { 'externalresponse')) { $textareaclass = 'class="LC_richDetectHtml spellchecked"'; } - $result.= '"; - $result .= &spellcheck_onblur($tagident, $spellcheck); + $result .= &spellcheck_onblur($itemid, $spellcheck); return $result; } } elsif ($target eq 'edit') { @@ -457,18 +459,19 @@ sub start_textline { $readonly=''; } my $name = 'HWVAL_'.$id; + my $itemid = 'HWVAL_'.$partid.'_'.$id; if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') { $name = "none"; } $result.= ''; + . ' class="LC_textline spellchecked" size="'.$size.'"'.$maxlength + . ' autocomplete="off" />'; - $result .= &spellcheck_onblur($name, $spellcheck); + $result .= &spellcheck_onblur($itemid, $spellcheck); } if ($Apache::lonhomework::type eq 'exam' && &needs_exam_box($tagstack)) { @@ -638,7 +641,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)'); @@ -696,6 +699,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(); @@ -706,7 +718,7 @@ sub current_file_submissions { '