--- loncom/homework/inputtags.pm	2019/11/20 23:00:04	1.351
+++ loncom/homework/inputtags.pm	2023/04/02 03:16:28	1.358
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.351 2019/11/20 23:00:04 raeburn Exp $
+# $Id: inputtags.pm,v 1.358 2023/04/02 03:16:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -474,8 +474,10 @@ sub start_textline {
 
 		$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')) {
+                    (((($tagstack->[-2] eq 'formularesponse') || ($tagstack->[-2] eq 'mathresponse')) &&
+                      (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') ne 'yes')) || 
+                     (($tagstack->[-2] eq 'customresponse') &&
+                       (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffeditor') eq 'no')))) {
                     $result.=&edit_mathresponse_button($input_tag_id);
                 }
 	    }
@@ -657,8 +659,13 @@ sub file_selector {
     $result .= &Apache::lonhtmlcommon::row_title($addfiles);
     my $constraints;
     if ($uploadedfiletypes ne '*') {
+        my $showtypes = $uploadedfiletypes;
+        if ($showtypes =~ /,/) {
+            my $conjunc = &mt('or');
+            $showtypes =~ s/,([^,]+)$/ $conjunc $1/;
+        }
 	$constraints =
-	    &mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
+	    &mt('Allowed filetypes: [_1]','<b>'.$showtypes.'</b>').'<br />';
     }
     if ($maxfilesize) {
         $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
@@ -1162,7 +1169,11 @@ sub decideoutput {
         if ($target ne 'tex') {
            $message .= &Apache::loncommon::help_open_topic('Some_Items_Were_Not_Submitted');
         }
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button = 1;
     } elsif ($award eq 'WRONG_NUMBOXESCHECKED') {
         $message = &mt('Number of boxes checked outside permissible range (either too few or too many).');
@@ -1211,7 +1222,7 @@ sub decideoutput {
     } elsif ($award eq 'SIG_FAIL') {
 	my ($used,$min,$max)=split(':',$awardmsg);
 	my $word = ($used < $min) ? 'more' : 'fewer';
-	$message = &mt("Submission not graded. Use $word digits.",$used);
+	$message = &mt("Submission not graded. Use $word significant figures.");
         if (&Apache::lonhomework::show_some_problem_status()) {
             $css_class=$possible_class{'no_charge_warn'};
         } else {
@@ -1226,21 +1237,37 @@ sub decideoutput {
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
 	$message = &mt('Unable to interpret units. Computer reads units as "[_1]".',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
 	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
 	$message = &mt('Only a number required. Computer reads units of "[_1]".',&markup_unit($awardmsg,$target));
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {
 	$message = &mt("Units required").'.';
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units')};
-	$css_class=$possible_class{'not_charged_try'};
+        if (&Apache::lonhomework::show_some_problem_status()) {
+            $css_class=$possible_class{'no_charge_warn'};
+        } else {
+            $css_class=$possible_class{'not_charged_try'};
+        }
 	$button=1;
     } elsif ($award eq 'COMMA_FAIL') {
 	$message = &mt("Proper comma separation is required").'.';
@@ -1760,12 +1787,17 @@ sub gradestatus {
 	}
 	if ( $showbutton ) {
 	    if ($target ne 'tex') {
-		$button = 
+                if ($env{'form.disable_submit'}) {
+                    $button = '<input type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit" value="'.&mt('Submit Answer').'" disabled="disabled" />&nbsp;'.
+                               '<div id="msg_submit_'.$id.'" style="display:none"></div>';
+                } else {
+		    $button =
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\');this.form.action+=\'#'.&escape($id).'\';"
                     type="submit" name="submit_'.$id.'" id="submit_'.$id.'" class="LC_hwk_submit"
                     value="'.&mt('Submit Answer').'" />&nbsp;'.
                     '<div id="msg_submit_'.$id.'" style="display:none">'.
                     &mt('Processing your submission ...').'</div>';
+                }
 	    }
 	}
 
@@ -1910,13 +1942,15 @@ sub previous_tries {
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
     my $function_name = 'LONCAPA_previous_tries_'.$prefix;
-    if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
+    if (($env{'request.state'} eq 'construct') || ($id =~ /\W/)) {
         $function_name .= $Apache::lonxml::curdepth;
     } else {
-        $function_name .= &js_escape($id);
+        $function_name .= $id;
     }
     $function_name .= '_'.$Apache::lonxml::counter;
-    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
+    my $possmathjax = 1;
+    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,
+                                                        &mt($tries_text),$possmathjax)."<br />";
     return $result;
 }