Diff for /loncom/homework/edit.pm between versions 1.6 and 1.10

version 1.6, 2001/05/13 21:40:32 version 1.10, 2001/06/12 22:42:55
Line 6  package Apache::edit; Line 6  package Apache::edit;
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   
   # Global Vars
   # default list of colors to use in editing
   @Apache::edit::colorlist=('#ffffff','#ff0000','#00ff00','#0000ff','#0ff000','#000ff0','#f0000f');
   # depth of nesting of edit
   $Apache::edit::colordepth=0;
   
   sub initialize_edit {
     $Apache::edit::colordepth=0;
   }
   
 sub tag_start {  sub tag_start {
   my ($target,$token) = @_;    my ($target,$token,$description) = @_;
   my $result='';    my $result='';
   if ($target eq "edit") {    if ($target eq "edit") {
     my $tag=$token->[1];      my $tag=$token->[1];
     $result.="<table width=\"100%\" border=\"2\"><tr><td>&lt;$tag&gt;</td>      if (!$description) { $description="&lt;$tag&gt;"; }
 <td>Delete:      $result.= &start_table($token)."<tr><td>$description</td>
 <select name=\"delete_$Apache::lonxml::curdepth\">  <td>Delete:".
 <option>Nothing</option>    &deletelist($target,$token)
 <option>Tag</option>    ."</td>
 <option>Subtags</option>  
 </select></td>  
 <td>".  <td>".
   &insertlist($token,$target).    &insertlist($target,$token).
     "</td>      "</td>
 </tr><tr><td colspan=\"3\">\n";  </tr><tr><td colspan=\"3\">\n";
   }    }
Line 27  sub tag_start { Line 35  sub tag_start {
 }  }
   
 sub tag_end {  sub tag_end {
   my ($target,$token) = @_;    my ($target,$token,$description) = @_;
   my $result='';    my $result='';
   if ($target eq 'edit') {    if ($target eq 'edit') {
     my $tag=$token->[1];      my $tag=$token->[1];
     $result.="</td></tr><tr><td>&lt;/$tag&gt;</td></tr></table>\n";      if (!defined($description)) {
         $result.="</td></tr><tr><td>&lt;/$tag&gt;";
       } else {
         if ($description ne '') { $result.="</td></tr><tr><td>$description"; }
       }
       $result.="</td></tr>".&end_table()."\n";
   }    }
   return $result;    return $result;
 }  }
   
 sub get_insert_list2 {  sub start_table {
   my ($token) = @_;    my ($token)=@_;
   my $result='';    my $tag = $token->[1];
   if ($Apache::lonxml::insertlist{"$token->[1].which"}) {    my $tagnum;
     my @tagnums= @{ $Apache::lonxml::insertlist{"$token->[1].which"} };    foreach my $namespace (reverse @Apache::lonxml::namespace) {
     foreach my $tagnum (@tagnums) {      my $testtag=$Apache::lonxml::namespace['-1'].'::'.$tag;
       $result.='<option value="'.$tagnum.'">'.$Apache::lonxml::insertlist{"$tag.description"}."</option>\n";      $tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
     }      if (defined($tagnum)) { last; }
     if ($result) { $result='<option selected="on"></option>'.$result; }    }
     if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
     my $color = $Apache::lonxml::insertlist{"$tagnum.color"};
     if (!defined($color)) {
       $color = $Apache::edit::colorlist[$Apache::edit::colordepth];
   }    }
     $Apache::edit::colordepth++;
     my $result="<table bgcolor=\"$color\" width=\"100%\" border=\"2\">";
     return $result;
   }
   
   sub end_table {
     $Apache::edit::colordepth--;
     my $result="</table>";
     return $result;
   }
   
   sub deletelist {
     my ($target,$token) = @_;
     my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
   <option>Nothing</option>
   <option>Tag</option>
   <option>Subtags</option>
   </select>";
   return $result;    return $result;
 }  }
   
 sub get_insert_list {  sub get_insert_list {
   my ($token) = @_;    my ($token) = @_;
   my $result='';    my $result='';
     my @tagnums= ();
     #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
   if ($Apache::lonxml::insertlist{"$token->[1].which"}) {    if ($Apache::lonxml::insertlist{"$token->[1].which"}) {
     my @tags= @{ $Apache::lonxml::insertlist{"$token->[1].which"} };      push (@tagnums, @{ $Apache::lonxml::insertlist{"$token->[1].which"} });
     foreach my $tag (@tags) {    }
       $result.='<option value="'.$tag.'">'.$Apache::lonxml::insertlist{"$tag.description"}."</option>\n";    foreach my $namespace (@Apache::lonxml::namespace) {
       if ($Apache::lonxml::insertlist{"$namespace".'::'."$token->[1].which"}) {
         push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$token->[1].which"} });
       }
     }
     if (@tagnums) {
       foreach my $tagnum (@tagnums) {
         $result.='<option value="'.$tagnum.'">'.$Apache::lonxml::insertlist{"$tagnum.description"}."</option>\n";
     }      }
     if ($result) { $result='<option selected="on"></option>'.$result; }      if ($result) { $result='<option selected="on"></option>'.$result; }
   }    }
Line 63  sub get_insert_list { Line 107  sub get_insert_list {
 }  }
   
 sub insertlist {  sub insertlist {
   my ($token,$target) = @_;    my ($target,$token) = @_;
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     my $optionlist= &get_insert_list($token);      my $optionlist= &get_insert_list($token);
Line 77  $optionlist Line 121  $optionlist
   return $result;    return $result;
 }  }
   
 sub handle_insert2 {  sub handle_insert {
   if (!$ENV{"form.insert_$Apache::lonxml::curdepth"}) { return ''; }    if (!$ENV{"form.insert_$Apache::lonxml::curdepth"}) { return ''; }
   my $result;    my $result;
   my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};    my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};
   my $func=$Apache::lonxml::insertlist{"$tagnum.function"};    my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
   if ($func eq 'default') {    if ($func eq 'default') {
     my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};      my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
       my $namespace;
       if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
     $result.="\n<$newtag>\n</$newtag>";      $result.="\n<$newtag>\n</$newtag>";
   } else {    } else {
     {      {
       no strict 'refs';        no strict 'refs';
       $result.=&$func;        $result.=&$func();
     }      }
   }    }
   return $result;    return $result;
 }  }
   
 sub handle_insert {  sub insert_optionresponse {
   if (!$ENV{"form.insert_$Apache::lonxml::curdepth"}) { return ''; }    return '
   my $result;  <optionresponse max="10">
   my $newtag = $ENV{"form.insert_$Apache::lonxml::curdepth"};      <foilgroup options="">
   my $func=$Apache::lonxml::insertlist{"$newtag.function"};      </foilgroup>
   if ($func eq 'default') {  </optionresponse>';
     $result.="\n<$newtag>\n</$newtag>";  
   } else {  
     {  
       no strict 'refs';  
       $result.=&$func;  
     }  
   }  
   return $result;  
 }  }
   
 sub editfield {  sub editfield {
Line 122  sub editfield { Line 160  sub editfield {
   if ($maxlength < $minwidth) { $maxlength = $minwidth; }    if ($maxlength < $minwidth) { $maxlength = $minwidth; }
   if ( $count < $minheight) { $count = $minheight; }    if ( $count < $minheight) { $count = $minheight; }
   if ($description) {    if ($description) {
     $description="<br />".$description;      $description="<br />".$description."<br />";
   }    }
   return "$description<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea>\n";    return "$description\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea>\n";
 #  return "<br />\n&lt;$tag&gt;<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br />\n&lt;/$tag&gt;<br />\n";  #  return "<br />\n&lt;$tag&gt;<br />\n&nbsp;&nbsp;&nbsp;<textarea rows=\"$count\" cols=\"$maxlength\" name=homework_edit_".$Apache::lonxml::curdepth.">$data</textarea><br />\n&lt;/$tag&gt;<br />\n";
 }  }
   

Removed from v.1.6  
changed lines
  Added in v.1.10


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