--- loncom/homework/edit.pm	2001/04/05 00:07:34	1.2
+++ loncom/homework/edit.pm	2001/04/26 21:21:48	1.3
@@ -7,21 +7,32 @@ use strict;
 use Apache::lonnet;
 
 sub tag_start {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($tag) = @_;
   my $result='';
 
-  $result.="<table border=\"1\"><tr><td>&lt;$token->[1]&gt;</td>
-<td><input type=\"submit\" name=\"delete_$Apache::lonxml::curdepth\" value=\"Delete\" /></td>
-<td><input type=\"submit\" name=\"insert_$Apache::lonxml::curdepth\" value=\"Insert\" /></td>
+  $result.="<table width=\"100%\" border=\"2\"><tr><td>&lt;$tag&gt;</td>
+<td>Delete:
+<select name=\"delete_$Apache::lonxml::curdepth\">
+<option>Nothing</option>
+<option>Tag</option>
+<option>Subtags</option>
+</select></td>
+<td>Insert:
+<select name=\"insert_$Apache::lonxml::curdepth\">
+<option>Nothing</option>
+<option>Text Block</option>
+<option>Script Block</option>
+</select>
+</td>
 </tr><tr><td colspan=\"3\">\n";
   return $result;
 }
 
 sub tag_end {
-  my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+  my ($tag) = @_;
   my $result='';
 
-  $result.="</td></tr><tr><td>&lt;/$token->[1]&gt;</td></tr></table>\n";
+  $result.="</td></tr><tr><td>&lt;/$tag&gt;</td></tr></table>\n";
   return $result;
 }
 
@@ -43,16 +54,21 @@ sub editfield {
 
 sub modifiedfield {
   my ($token) = @_;
-  foreach my $envkey (sort keys %ENV) {
-    &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
-  }
-  &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
-  &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
-  if (defined $token->[4]) {
-    return $token->[4].$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
-  } else {
-    return $ENV{"homework_edit_$Apache::lonxml::curdepth"}.$token->[2];
+  my $result;
+#  foreach my $envkey (sort keys %ENV) {
+#    &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
+#  }
+#  &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
+#  &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
+  $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
+  if (defined $token) {
+    if (defined $token->[4]) {
+      $result=$token->[4].$result;
+    } else {
+      $result=$result.$token->[2];
+    }
   }
+  return $result;
 }
 
 1;