--- loncom/homework/inputtags.pm	2017/06/13 16:20:40	1.333.2.4.2.1
+++ loncom/homework/inputtags.pm	2015/10/05 02:35:40	1.337
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.333.2.4.2.1 2017/06/13 16:20:40 raeburn Exp $
+# $Id: inputtags.pm,v 1.337 2015/10/05 02:35:40 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.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');"'
-		     . ' onfocus="javascript:disableAutoComplete(\''.$input_tag_id.'\');"'
+		     . ' onfocus="javascript:disableAutoComplete(\''.$itemid.'\');"'
 		     . ' type="text" '.$readonly.' name="'. $name . '"'
-		     . ' id="' . $input_tag_id . '"'
+		     . ' id="' . $itemid . '"'
 		     . ' value="'.  $oldresponse.'"'
 		     . ' class="LC_textline spellchecked"  size="'.$size.'"'.$maxlength.' />';
 
 		$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 = &current_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 +661,12 @@ sub file_selector {
         $result .= $constraints.'<br />';
     }
     if ($which eq 'uploadonly' || $which eq 'both') { 
-	$result.=&mt('Submit a file: (only one file per submission)').
-	    ' <br /><input type="file" size="50" name="HWFILE'.
-	    $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';
-    }
+        my $free_space = $maxfilesize * 1048576;
+        $result .= &mt('Submit a file: (only one file per submission)').
+            ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
+            '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" /><br />'.
+            '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />'
+        }
     if ( $which eq 'both') {
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
     }
@@ -704,6 +700,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 +719,7 @@ sub current_file_submissions {
                  '<th>'.&mt('Size (MB)').'</th>'.
                  '<th>'.&mt('Last Modified').'</th>'.
                  &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 +738,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,'<>&"');
@@ -1048,7 +1053,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,9 +1077,7 @@ sub decideoutput {
 		$message = '\textbf{'.$message.'}';
 	    } else {
 		$message = "<b>".$message."</b>";
-                if ($computer) {
-                    $message = "$computer $message";
-                }
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    if ($awarded > 0) {
@@ -1118,9 +1121,7 @@ sub decideoutput {
 		$message = '\textbf{'.&mt('You are correct.').'}';
 	    } else {
 		$message = "<b>".&mt('You are correct.')."</b>";
-                if ($computer) {
-                    $message = "$computer $message";
-                }
+		$message.= $computer;
 	    }
 	    $added_computer_text=1;
 	    if  ($awarded > 0 
@@ -1318,12 +1319,11 @@ sub decideoutput {
 	&& &hide_award($award)) {
         $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
         my @interval= &Apache::lonnet::EXT("resource.$part.interval");
-        if ($interval[0]) {
+        if ($interval[0] =~ /\d+/) {
             my $first_access=&Apache::lonnet::get_first_access($interval[1]);
             if (defined($first_access)) {
                 my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
-                my ($timelimit) = ($interval[0] =~ /^(\d+)/);
-                unless (($due_date) && ($due_date < $first_access + $timelimit)) { 
+                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
                     $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
                 }
             }
@@ -1333,9 +1333,7 @@ sub decideoutput {
     }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
 	!$added_computer_text && $target ne 'tex') {
-        if ($computer) {
-            $message = "$computer $message";
-        }
+	$message.= $computer;
 	$added_computer_text=1;
     }
     if ($Apache::lonhomework::type eq 'practice') {
@@ -1702,7 +1700,8 @@ sub gradestatus {
 	 && $status ne 'NOT_IN_A_SLOT'
          && $status ne 'RESERVABLE'
          && $status ne 'RESERVABLE_LATER'
-         && $status ne 'NOTRESERVABLE') {
+         && $status ne 'NOTRESERVABLE'
+         && $status ne 'NEED_DIFFERENT_IP') {
 
 	if ($status eq 'SHOW_ANSWER') {
             $showbutton = 0;
@@ -1915,118 +1914,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(<<ENDFORMULABUTTON);
-<script type="text/javascript" language="JavaScript">
-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");
-}
-</script>
-<a href="javascript:LC_mathedit_${field}('${field}');void(0);"><img class="stift" src="$iconpath/stift.gif" alt="$button" title="$button" /></a>
-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(<<EQ_EDITOR_SCRIPT);
-<script type="text/javascript">
-  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);
-  }
-</script>
-EQ_EDITOR_SCRIPT
-    }
-}
-
 1;
 __END__