Diff for /loncom/homework/optionresponse.pm between versions 1.191 and 1.194

version 1.191, 2013/07/19 18:24:21 version 1.194, 2014/11/27 17:37:09
Line 64  sub start_optionresponse { Line 64  sub start_optionresponse {
      $token,'4').       $token,'4').
         &Apache::edit::select_arg('Randomize Foil Order:','randomize',          &Apache::edit::select_arg('Randomize Foil Order:','randomize',
   ['yes','no'],$token).    ['yes','no'],$token).
         &Apache::edit::select_arg(&mt('Display of options when printed'),'TeXlayout',          &Apache::edit::select_arg('Display of options when printed','TeXlayout',
   [['horizontal','Normal list'],    [['horizontal','Normal list'],
    ['vertical','Listed in a vertical column']],$token).     ['vertical','Listed in a vertical column']],$token).
         &Apache::edit::end_row().&Apache::edit::start_spanning_row();          &Apache::edit::end_row().&Apache::edit::start_spanning_row();
Line 120  sub start_foilgroup { Line 120  sub start_foilgroup {
     }      }
     my $insertlist=&Apache::edit::insertlist($target,$token);      my $insertlist=&Apache::edit::insertlist($target,$token);
     $result.=&Apache::edit::start_table($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);      $result.= (<<ENDTABLE);
       <tr><td>Select Options</td>        <tr><td>$lt{'sel'}</td>
         <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>
         <td>Delete an Option:          <td>$lt{'del'}
   <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>    <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
         </td>          </td>
 ENDTABLE  ENDTABLE
     $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',      $result.= '<td>'.&Apache::edit::checked_arg('Print options:','texoptions',
  [ ['nochoice','Don\'t show option list'] ]   [ ['nochoice',"Don't show option list"] ]
  ,$token).'</td>';   ,$token).'</td>';
     $result.= '<td><label>'.&mt('Two-option checkboxes for:').      $result.= '<td><label>'.&mt('Two-option checkboxes for:').
               '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';                '<select name="checkboxvalue_'.$Apache::lonxml::curdepth.'">';
Line 141  ENDTABLE Line 146  ENDTABLE
        }         }
        $result.='>'.$option.'</option>';         $result.='>'.$option.'</option>';
     }      }
     $result.='</select></label>';      $result.='</select></label> ';
     $result.=&Apache::edit::checked_arg('Checkbox options:','checkboxoptions',      $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>';                                           ,$token).'</td>';
     $result.= &Apache::edit::end_row();      $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();      $result.= &Apache::edit::start_spanning_row();
Line 168  ENDTABLE Line 176  ENDTABLE
       $optchanged=1;        $optchanged=1;
     }      }
     my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,      my $rebuildtag = &Apache::edit::get_new_args($token,$parstack,$safeeval,
  'texoptions','checkboxvalue','checkboxoptions');   'texoptions','checkboxvalue','checkboxoptions',
                                                    'noprompt');
     if ($optchanged || $rebuildtag ) {      if ($optchanged || $rebuildtag ) {
       $result = "<foilgroup options=\"(";        $result = "<foilgroup options=\"(";
       foreach my $option (@options) {        foreach my $option (@options) {
Line 180  ENDTABLE Line 189  ENDTABLE
       $result.=')" ';        $result.=')" ';
       $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';        $result .= 'texoptions="'.$token->[2]{'texoptions'}.'" ';
       $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';        $result .= 'checkboxoptions="'.$token->[2]{'checkboxoptions'}.'" ';
       $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'"';        $result .= 'checkboxvalue="'.$token->[2]{'checkboxvalue'}.'" ';
         $result .= 'noprompt="'.$token->[2]{'noprompt'}.'"';
       $result .= '>';        $result .= '>';
     } # else nothing changed so just use the default mechanism      } # else nothing changed so just use the default mechanism
   }    }
Line 210  sub end_foilgroup { Line 220  sub end_foilgroup {
      -2,0);       -2,0);
     my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);      my $checkboxvalue=&Apache::lonxml::get_param('checkboxvalue',$parstack,$safeeval);
     my $checkboxchoices=(&Apache::lonxml::get_param('checkboxoptions',$parstack,$safeeval) ne 'nochoice');      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=();}      if ($target eq 'tex' && $tex_option_switch eq 'nochoice') {@opt=();}
     &Apache::lonxml::debug("Options are $#opt");      &Apache::lonxml::debug("Options are $#opt");

Removed from v.1.191  
changed lines
  Added in v.1.194


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>