--- loncom/homework/edit.pm	2001/05/15 20:48:43	1.7
+++ loncom/homework/edit.pm	2001/06/11 16:15:37	1.9
@@ -7,21 +7,19 @@ use strict;
 use Apache::lonnet;
 
 sub tag_start {
-  my ($target,$token) = @_;
+  my ($target,$token,$description) = @_;
   my $result='';
   if ($target eq "edit") {
     my $tag=$token->[1];
 #    my $color = sprintf("#%06lx",(hex("ffffff")) >> scalar(split(/_/,$Apache::lonxml::curdepth)));
     my $color = sprintf("#%02lxffff",33* scalar(split(/_/,$Apache::lonxml::curdepth)));
-    $result.="<table bgcolor=\"$color\" 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>
+    if (!$description) { $description="&lt;$tag&gt;"; }
+    $result.="<table bgcolor=\"$color\" width=\"100%\" border=\"2\"><tr><td>$description</td>
+<td>Delete:".
+  &deletelist($target,$token)
+  ."</td>
 <td>".
-  &insertlist($token,$target).
+  &insertlist($target,$token).
     "</td>
 </tr><tr><td colspan=\"3\">\n";
   }
@@ -29,15 +27,30 @@ sub tag_start {
 }
 
 sub tag_end {
-  my ($target,$token) = @_;
+  my ($target,$token,$description) = @_;
   my $result='';
   if ($target eq 'edit') {
     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></table>\n";
   }
   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;
+}
+
 sub get_insert_list {
   my ($token) = @_;
   my $result='';
@@ -63,7 +76,7 @@ sub get_insert_list {
 }
 
 sub insertlist {
-  my ($token,$target) = @_;
+  my ($target,$token) = @_;
   my $result;
   if ($target eq 'edit') {
     my $optionlist= &get_insert_list($token);
@@ -116,9 +129,9 @@ sub editfield {
   if ($maxlength < $minwidth) { $maxlength = $minwidth; }
   if ( $count < $minheight) { $count = $minheight; }
   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";
 }