--- loncom/homework/inputtags.pm	2021/09/07 20:37:33	1.355
+++ 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.355 2021/09/07 20:37:33 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.',
@@ -1780,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>';
+                }
 	    }
 	}