--- loncom/homework/randomlabel.pm	2001/12/04 15:17:56	1.8
+++ loncom/homework/randomlabel.pm	2002/01/21 16:40:57	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.8 2001/12/04 15:17:56 albertel Exp $
+# $Id: randomlabel.pm,v 1.11 2002/01/21 16:40:57 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,8 +58,9 @@
 #  ===========================================
 package Apache::randomlabel;
 use strict;
+use Apache::edit;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
 }
 
@@ -103,7 +104,7 @@ sub start_randomlabel {
       &Apache::edit::text_arg('Width(pixel):','width',$token,4).
 	&Apache::edit::text_arg('Height(pixel):','height',$token,4).
 	  &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
-	    '</td></tr><tr><td colspan="3">';
+	     &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'bgimg','width','height',
@@ -154,7 +155,7 @@ sub start_labelgroup {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token).
       &Apache::edit::select_arg('Type:','type',['text','image'],$token).
-	'</td></tr><tr><td colspan="3">';
+	  &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'name','type');
@@ -278,7 +279,7 @@ sub start_location {
     $result.=&Apache::edit::text_arg('X:','x',$token,4).
       &Apache::edit::text_arg('Y:','y',$token,4).
 	&Apache::edit::text_arg('Value:','value',$token).
-	'</td></tr><tr><td colspan="3">';
+	  &Apache::edit::end_row();
     $result.=&Apache::edit::end_table;
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
@@ -309,12 +310,12 @@ sub start_label {
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
-    $result.='</td></tr><tr><td colspan="3">'.
+    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
       &Apache::edit::editfield('',$text,'',20,1).
 	&Apache::edit::end_table();
   } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");
-    $result.=&Apache::edit::modifiedfield($token);
+    $result.='<label>'.&Apache::edit::modifiedfield($token);
   }
   return $result;
 }