[BACK]Return to matchresponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/matchresponse.pm between versions 1.69 and 1.73.2.1

version 1.69, 2008/02/01 22:05:45 version 1.73.2.1, 2008/12/11 01:20:32
Line 33  use Math::Random(); Line 33  use Math::Random();
 use Apache::optionresponse();  use Apache::optionresponse();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonxml;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));      &Apache::lonxml::register('Apache::matchresponse',('matchresponse'));
Line 53  sub start_matchresponse { Line 54  sub start_matchresponse {
  $result=&Apache::response::meta_package_write('matchresponse');   $result=&Apache::response::meta_package_write('matchresponse');
     } elsif ($target eq 'edit' ) {      } elsif ($target eq 'edit' ) {
  $result.=&Apache::edit::start_table($token).   $result.=&Apache::edit::start_table($token).
     '<tr><td>'.&Apache::lonxml::description($token)."</td><td>Delete:".      '<tr><td>'.&Apache::lonxml::description($token).'</td>'
     &Apache::edit::deletelist($target,$token)             .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
     ."</td><td>&nbsp".&Apache::edit::end_row()     .&Apache::edit::deletelist($target,$token)
     .&Apache::edit::start_spanning_row();             .'</span></td>'
              .'<td>&nbsp;'.&Apache::edit::end_row()
      .&Apache::edit::start_spanning_row();
   
  $result.=   $result.=
     &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$token,'4').      &Apache::edit::text_arg('Max Number Of Shown Foils:','max',$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::end_row().&Apache::edit::start_spanning_row()."\n";      &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n";
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
Line 100  sub start_itemgroup { Line 103  sub start_itemgroup {
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&Apache::edit::tag_start($target,$token);   $result=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::select_arg('Randomize Order:','randomize',   $result.=&Apache::edit::select_arg('Randomize Order:','randomize',
    ['yes','no'],$token);     ['yes','no'],$token).'&nbsp;'x 3;
  $result.=&Apache::edit::select_arg('Items Display Location:',   $result.=&Apache::edit::select_arg('Items Display Location:',
    'location',     'location',
    ['top','bottom','left','right'],     ['top','bottom','left','right'],
    $token);     $token).'&nbsp;'x 3;
  $result.=&Apache::edit::select_arg('Items Display Directection:',   $result.=&Apache::edit::select_arg('Items Display Direction:',
    'direction',     'direction',
    ['vertical','horizontal'],     ['vertical','horizontal'],
    $token);     $token);
Line 195  sub start_item { Line 198  sub start_item {
  $result=&Apache::edit::tag_start($target,$token,"Item");   $result=&Apache::edit::tag_start($target,$token,"Item");
  $result.=&Apache::edit::text_arg('Name:','name',$token);   $result.=&Apache::edit::text_arg('Name:','name',$token);
  if ($randomize ne 'no') {   if ($randomize ne 'no') {
     $result.=&Apache::edit::select_arg('Location:','location',      $result.='&nbsp;'x 3 .
                        &Apache::edit::select_arg('Location:','location',
        ['random','top','bottom'],         ['random','top','bottom'],
        $token);         $token);
  }   }
Line 251  sub start_foilgroup { Line 255  sub start_foilgroup {
     &Apache::response::pushrandomnumber();      &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::start_table($token)   $result.=&Apache::edit::start_table($token)
     ."<tr><td>Collection Of Foils</td><td>Delete:"      .'<tr><td>'.&mt('Collection Of Foils').'</td>'
               .'<td><span class="LC_nobreak">'.&mt('Delete?')
     .&Apache::edit::deletelist($target,$token)      .&Apache::edit::deletelist($target,$token)
     ."</td><td>&nbsp;".&Apache::edit::end_row()      .'</span></td>'
               .'<td>&nbsp;'.&Apache::edit::end_row()
             .&Apache::edit::start_spanning_row()."\n";              .&Apache::edit::start_spanning_row()."\n";
     }      }
     return $result;      return $result;
Line 507  sub displayfoils { Line 513  sub displayfoils {
  $optionlist="<option></option>\n";   $optionlist="<option></option>\n";
     } else {      } else {
  if ($Apache::lonhomework::type ne 'exam') {   if ($Apache::lonhomework::type ne 'exam') {
     $optionlist='\framebox[5 mm][s]{\tiny\strut}';                      $optionlist='\framebox[10 mm][s]{\tiny\strut}';
  }                  }
     }      }
     my $option;      my $option;
     foreach $option (@used_letters) {      foreach $option (@used_letters) {
  if ($option eq $last_letter) {   if ($option eq $last_letter) {
     if ($target ne 'tex') {$optionlist.="<option selected=\"on\">$option</option>\n";}      if ($target ne 'tex') {
                           $optionlist.="<option selected=\"on\">$option</option>\n";
                       }
  } else {   } else {
     if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}      if ($target ne 'tex') {
                           $optionlist.="<option>$option</option>\n";
                       }
  }   }
     }      }
     if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {      if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
Line 573  sub displayfoils { Line 583  sub displayfoils {
     $question .= '\end{list} \vskip -8 mm \strut ';      $question .= '\end{list} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";                      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
  }   }
             }               } 
     $temp++;      $temp++;
Line 719  sub end_foil { Line 729  sub end_foil {
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     &Apache::lonxml::debug("Got a name of :$name:");      &Apache::lonxml::debug("Got a name of :$name:");
     if (!$name) {      if (!$name) {
  &Apache::lonxml::warning("Foils without names exist. This can cause problems to malfunction.");   &Apache::lonxml::warning(&mt('Foils without names exist. This can cause problems to malfunction.'));
  $name=$Apache::lonxml::curdepth;   $name=$Apache::lonxml::curdepth;
     }      }
     &Apache::lonxml::debug("Using a name of :$name:");      &Apache::lonxml::debug("Using a name of :$name:");
     if (defined($Apache::response::foilnames{$name})) {      if (defined($Apache::response::foilnames{$name})) {
  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));   &Apache::lonxml::error(&mt("Foil name [_1] appears more than once. Foil names need to be unique.",'<b><tt>'.$name.'</tt></b>'));
     }      }
     $Apache::response::foilnames{$name}++;      $Apache::response::foilnames{$name}++;
     my $location =&Apache::lonxml::get_param('location',$parstack,      my $location =&Apache::lonxml::get_param('location',$parstack,
Removed from v.1.69  
changed lines
  Added in v.1.73.2.1

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