--- loncom/homework/inputtags.pm 2015/10/30 11:33:07 1.333.2.3
+++ loncom/homework/inputtags.pm 2015/04/21 12:28:05 1.334
@@ -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.334 2015/04/21 12:28:05 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -460,23 +460,17 @@ sub start_textline {
}
my $name = 'HWVAL_'.$id;
my $itemid = 'HWVAL_'.$partid.'_'.$id;
- my $input_tag_id = $itemid.'_'.$input_id;
if ($Apache::inputtags::status[-1] eq 'CANNOT_ANSWER') {
$name = "none";
}
$result.= '';
$result .= &spellcheck_onblur($itemid, $spellcheck);
- if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&
- (($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
- (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) {
- $result.=&edit_mathresponse_button($input_tag_id);
- }
}
if ($Apache::lonhomework::type eq 'exam'
&& &needs_exam_box($tagstack)) {
@@ -646,7 +640,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)');
@@ -704,6 +698,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 +717,7 @@ sub current_file_submissions {
'
'.&mt('Size (MB)').' | '.
''.&mt('Last Modified').' | '.
&Apache::loncommon::end_data_table_header_row();
- my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+ my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
my ($result,$header_shown,%okfiles,%rows,%legacy,@bad_file_list);
if ($uploadedfile) {
@@ -733,9 +736,9 @@ sub current_file_submissions {
push(@bad_file_list,$error);
}
}
- if ($portfiles =~ /[^\s]/) {
+ if (@unversioned > 0) {
my $prefix = "/uploaded/$udom/$uname/portfolio";
- foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
+ foreach my $file (@unversioned) {
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
my $url = $prefix.$path.$name;
my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
@@ -903,7 +906,7 @@ sub valid_award {
{
my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
- 'WRONG_NUMBOXESCHECKED','TOO_LONG',
+ 'WRONG_NUMCHECKEDBOXES','TOO_LONG',
'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'NOT_FUNCTION',
@@ -1908,118 +1911,6 @@ sub spelling_languages {
return \@spelllangs;
}
-sub edit_mathresponse_button {
- my ($field) = @_;
- my $eqneditor = 'lcmath';
- if ($env{'browser.type'} eq 'safari') {
- if ($env{'browser.os'} eq 'mac') {
- my ($prefix,$version) = ($env{'browser.version'} =~ /^(\d*)(\d{3})\./);
- if ($env{'browser.mobile'}) {
- if (($version < 531) || (($prefix eq '') && ($version < 533))) {
- $eqneditor = '';
- }
- } elsif ($version < 533) {
- $eqneditor = 'dragmath';
- }
- } elsif ($env{'browser.os'} eq 'win') {
- if ($env{'browser.version'} < 533) {
- $eqneditor = 'dragmath';
- }
- }
- } elsif ($env{'browser.type'} eq 'explorer') {
- if ($env{'browser.version'} < 9) {
- $eqneditor = 'dragmath';
- }
- } elsif ($env{'browser.type'} eq 'mozilla') {
- if ($env{'browser.version'} < 5) {
- $eqneditor = 'dragmath';
- } else {
- if ($env{'browser.info'} =~ /^firefox\-([\d\.]+)/) {
- my $firefox = $1;
- if ($firefox < 4) {
- $eqneditor = 'dragmath';
- }
- }
- }
- } elsif ($env{'browser.type'} eq 'chrome') {
- if ($env{'browser.version'} < 5) {
- $eqneditor = 'dragmath';
- }
- } elsif ($env{'browser.type'} eq 'opera') {
- if ($env{'browser.version'} < 12) {
- $eqneditor = 'dragmath';
- }
- }
- if ($eqneditor eq 'lcmath') {
- if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
- if (exists($env{'course.'.$env{'request.course.id'}.'.uselcmath'})) {
- if ($env{'course.'.$env{'request.course.id'}.'.uselcmath'} eq '0') {
- $eqneditor = 'dragmath';
- }
- } else {
- my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
- if ($domdefs{'uselcmath'} eq '0') {
- $eqneditor = 'dragmath';
- }
- }
- } else {
- my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
- if ($domdefs{'uselcmath'} eq '0') {
- $eqneditor = 'dragmath';
- }
- }
- }
- if ($eqneditor eq 'dragmath') {
- # DragMath applet
- my $button=&mt('Edit Answer');
-# my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
- my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
- return(<
-function LC_mathedit_${field} (LCtextline) {
- thenumber = LCtextline;
- var thedata = '';
- if (document.getElementById(LCtextline)) {
- thedata = document.getElementById(LCtextline).value;
- }
- newwin = window.open("/adm/dragmath/MaximaPopup.html","","width=565,height=400,resizable");
-}
-
-
-ENDFORMULABUTTON
- } elsif ($eqneditor eq 'lcmath') {
- # LON-CAPA math equation editor
- my $mathjaxjs;
- unless (lc(&Apache::lontexconvert::tex_engine()) eq 'mathjax') {
- $mathjaxjs = <<"MATHJAX_SCRIPT";
-var mathjaxscript = document.createElement("script");
- mathjaxscript.type = "text/javascript";
- mathjaxscript.src = "/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML";
- document.body.appendChild(mathjaxscript);
-MATHJAX_SCRIPT
- }
- return(<
- var LCmathField = document.getElementById('${field}');
- LCmathField.className += ' math'; // note the space
- LCmathField.setAttribute('data-implicit_operators', 'true');
- var LCMATH_started;
- if (typeof LCMATH_started === 'undefined') {
- $mathjaxjs
- LCMATH_started = true;
- var script = document.createElement("script");
- script.type = "text/javascript";
- script.src = "/adm/LC_math_editor/LC_math_editor.min.js";
- document.body.appendChild(script);
- window.addEventListener('load', function(e) {
- LCMATH.initEditors();
- }, false);
- }
-
-EQ_EDITOR_SCRIPT
- }
-}
-
1;
__END__