[LON-CAPA-cvs] cvs: loncom /homework optionresponse.pm

[raeburn]

raeburn		Thu Nov 27 17:37:09 2014 EDT

  Modified files:              
    /loncom/homework	optionresponse.pm 
  Log:
  - Bug 6597
    - Attributes for foilgroup in optionresponse now include checkbox for
      omit "Select all that are ..." in colorful editor (displayed by default
      when reponse uses checkboxes for binary options instead of dropdown lists).
  
  
Index: loncom/homework/optionresponse.pm
diff -u loncom/homework/optionresponse.pm:1.193 loncom/homework/optionresponse.pm:1.194
--- loncom/homework/optionresponse.pm:1.193	Tue Dec  3 17:22:08 2013
+++ loncom/homework/optionresponse.pm	Thu Nov 27 17:37:09 2014
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.193 2013/12/03 17:22:08 bisitz Exp $
+# $Id: optionresponse.pm,v 1.194 2014/11/27 17:37:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,9 +146,12 @@
        }
        $result.='>'.$option.'</option>';
     }
-    $result.='</select></label>';
+    $result.='</select></label> ';
     $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',
                                          [ ['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();
@@ -173,7 +176,8 @@
       $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) {
@@ -185,7 +189,8 @@
       $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
   }
@@ -215,7 +220,7 @@
 					     -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");