Diff for /loncom/homework/edit.pm between versions 1.38 and 1.39

version 1.38, 2002/11/03 19:16:19 version 1.39, 2002/11/07 19:45:16
Line 99  sub start_table { Line 99  sub start_table {
   }    }
   $Apache::edit::colordepth++;    $Apache::edit::colordepth++;
   push(@Apache::edit::inserttag,$token->[1]);    push(@Apache::edit::inserttag,$token->[1]);
   my $result="<p align=\"right\"><table bgcolor=\"$color\" width=\"95%\" border=\"2\">";    my $result='<p align="right">';
     $result.='<table bgcolor="'.$color.'" width="99%" border="2">';
   return $result;    return $result;
 }  }
   
 sub end_table {  sub end_table {
   $Apache::edit::colordepth--;    $Apache::edit::colordepth--;
   my $result="</table></p>";    my $result='</table></p>';
   $result.=    $result.="<table><tr><td>";
  "<p><table width=\"100%\"><tr><td>".  
         &innerinsertlist('edit',    my ($tagname,$closingtag);
  (defined($Apache::edit::inserttag[-2])?$Apache::edit::inserttag[-2]:'problem')    if (defined($Apache::edit::inserttag[-2])) {
 ,      $tagname=$Apache::edit::inserttag[-2];
  (defined($Apache::edit::inserttag[-1])?$Apache::edit::inserttag[-1]:'')).    } else {$tagname='problem';}
         "</td></tr></table></p>";    if (defined($Apache::edit::inserttag[-1])) {
       $closingtag=$Apache::edit::inserttag[-1];
     }
     $result.=&innerinsertlist('edit',$tagname,$closingtag).
       "</td></tr></table>";
   pop(@Apache::edit::inserttag);    pop(@Apache::edit::inserttag);
   return $result;    return $result;
 }  }
Line 453  sub text_arg { Line 458  sub text_arg {
 }  }
   
 sub select_arg {  sub select_arg {
   my ($description,$name,$list,$token) = @_;      my ($description,$name,$list,$token) = @_;
   my $result;      my $result;
   my $optionlist="";      my $optionlist="";
   my $selected=$token->[2]{$name};      my $selected=$token->[2]{$name};
   foreach my $option (@$list) {      foreach my $option (@$list) {
     if ( $selected eq $option ) {   my $value;
       $optionlist.="<option selected=\"on\">$option</option>\n";   if ( ref($option) eq 'ARRAY') {
     } else {      $value='value="'.$$option[0].'"';
       $optionlist.="<option>$option</option>\n";      $option=$$option[1];
    } else {
       $value='value="'.$option.'"';
    }
    if ( $selected eq $option ) {
       $optionlist.="<option $value selected=\"on\">$option</option>\n";
    } else {
       $optionlist.="<option $value >$option</option>\n";
    }
     }      }
   }      $result.=$description.'<select name="'.
   $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">   "$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'         '.$optionlist.'
       </select>';        </select>';
   return $result;      return $result;
 }  }
   
 sub select_or_text_arg {  sub select_or_text_arg {
   my ($description,$name,$list,$token,$size) = @_;      my ($description,$name,$list,$token,$size) = @_;
   my $result;      my $result;
   my $optionlist="";      my $optionlist="";
   my $found=0;      my $found=0;
   my $selected=$token->[2]{$name};      my $selected=$token->[2]{$name};
   foreach my $option (@$list) {      foreach my $option (@$list) {
     if ( $selected eq $option ) {   my $value;
       $optionlist.="<option selected=\"on\">$option</option>\n";   if ( ref($option) eq 'ARRAY') {
       $found=1;      $value='value="'.$$option[0].'"';
     } else {      $option=$$option[1];
       $optionlist.="<option>$option</option>\n";   } else {
     }      $value='value="'.$option.'"';
   }   }
   $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";   if ( $selected eq $option ) {
   if (($found) || (!$selected)) {      $optionlist.="<option $value selected=\"on\">$option</option>\n";
     $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">      $found=1;
    } else {
       $optionlist.="<option $value>$option</option>\n";
    }
       }
       $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
       if (($found) || (!$selected)) {
    $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'         '.$optionlist.'
       </select>';        </select>';
   } else {      } else {
     $result.=&text_arg($description,$name,$token,$size);   $result.=&text_arg($description,$name,$token,$size);
   }      }
   return $result;      return $result;
 }  }
   
 #----------------------------------------------------- browse  #----------------------------------------------------- browse

Removed from v.1.38  
changed lines
  Added in v.1.39


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