--- loncom/homework/optionresponse.pm	2001/12/07 23:58:35	1.28
+++ loncom/homework/optionresponse.pm	2002/01/17 12:23:31	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.28 2001/12/07 23:58:35 albertel Exp $
+# $Id: optionresponse.pm,v 1.31 2002/01/17 12:23:31 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,25 +30,28 @@ package Apache::optionresponse;
 use strict;
 use Apache::response;
 
-sub BEGIN {
+BEGIN {
   &Apache::lonxml::register('Apache::optionresponse',('optionresponse'));
 }
 
 sub start_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
-  #when in a radiobutton response use these
+  #when in a option response use these
   &Apache::lonxml::register('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
     $result.=&Apache::edit::start_table($token).
-      "<tr><td>Multiple Option Response Question</td><td>Delete:".
+	"<tr><td>Multiple Option Response Question</td><td>Delete:".
 	&Apache::edit::deletelist($target,$token)
-	  ."</td><td>&nbsp;</td></tr><tr><td colspan=\"3\">\n";
+	."</td><td>&nbsp;".
+        &Apache::edit::end_row().
+        &Apache::edit::start_spanning_row().
+        "\n";
     $result.=&Apache::edit::text_arg('Max Number Of Foils:','max',$token,'4').
-      "</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+        &Apache::edit::end_row().
+	&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -65,6 +68,7 @@ sub end_optionresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   &Apache::response::end_response;
   pop @Apache::lonxml::namespace;
+  &Apache::lonxml::deregister('Apache::optionresponse',('foilgroup','foil','conceptgroup'));
   my $result;
   if ($target eq 'edit') { $result=&Apache::edit::end_table(); }
   return $result;
@@ -97,10 +101,10 @@ sub start_foilgroup {
         </td>
         <td>Delete an Option:
 	  <select name="$Apache::lonxml::curdepth.deleteopt">$optionlist</select>
-        </td>
-     </tr>
-     <tr><td colspan="3">$insertlist<br />
 ENDTABLE
+    $result.= &Apache::edit::end_row();
+    $result.= &Apache::edit::start_spanning_row();
+    $result.= $insertlist.'<br />';
   }
   if ($target eq 'modified') {
     my @options;
@@ -280,8 +284,8 @@ sub start_conceptgroup {
   my $result;
   if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,"Concept Grouped Foils");
-    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50')."</td></tr>";
-    $result.="<tr><td colspan=\"3\">\n";
+    $result.=&Apache::edit::text_arg('Concept:','concept',$token,'50').
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();
   }
   if ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'concept');
@@ -332,7 +336,7 @@ sub start_foil {
     eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,$level);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.= &Apache::edit::select_or_text_arg('Correct Option:','value',['unused',(@opt)],$token,'15');
-    $result .= '</td></tr><tr><td colspan="3">';
+    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'value','name');
     if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }