--- loncom/homework/optionresponse.pm	2013/12/03 14:54:29	1.192
+++ loncom/homework/optionresponse.pm	2014/11/27 17:37:09	1.194
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.192 2013/12/03 14:54:29 bisitz Exp $
+# $Id: optionresponse.pm,v 1.194 2014/11/27 17:37:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,17 +120,22 @@ sub start_foilgroup {
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($token);
+    my %lt = &Apache::lonlocal::texthash(
+        sel => 'Select Options',
+        add => 'Add new Option:',
+        del => 'Delete an Option:',
+    );
     $result.= (<<ENDTABLE);
-      <tr><td>Select Options</td>
+      <tr><td>$lt{'sel'}</td>
         <td>
-	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
+	  $lt{'add'} <input type="text" name="$Apache::lonxml::curdepth.options" />
         </td>
-        <td>Delete an Option:
+        <td>$lt{'del'}
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
         </td>
 ENDTABLE
     $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
-					 [ ['nochoice','Don\'t show option list'] ]
+					 [ ['nochoice',"Don't show option list"] ]
 					 ,$token).'</td>';
     $result.= '<td><label>'.&mt('Two-option checkboxes for:').
               '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
@@ -141,9 +146,12 @@ ENDTABLE
        }
        $result.='>'.$option.'</option>';
     }
-    $result.='</select></label>';
+    $result.='</select></label> ';
     $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
-                                         [ ['nochoice','Don\'t show option list'] ]
+                                         [ ['nochoice',"Don't show option list"] ]
+                                         ,$token).' '.
+             &Apache::edit::checked_arg('','noprompt',
+                                         [ ['nochoice','Omit "Select all that are ... "' ] ]
                                          ,$token).'</td>';
     $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();
@@ -168,7 +176,8 @@ ENDTABLE
       $optchanged=1;
     }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
-						 'texoptions','checkboxvalue','checkboxoptions');
+						 'texoptions','checkboxvalue','checkboxoptions',
+                                                 'noprompt');
     if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
@@ -180,7 +189,8 @@ ENDTABLE
       $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
       $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
-      $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';
+      $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
+      $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
       $result .= '>';
     } # else nothing changed so just use the default mechanism
   }
@@ -210,7 +220,7 @@ sub end_foilgroup {
 					     -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');
-    my $noprompt       =&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
+    my $noprompt=&Apache::lonxml::get_param('noprompt', $parstack, $safeeval);
 
     if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");