--- loncom/homework/optionresponse.pm	2001/06/11 16:13:53	1.13
+++ loncom/homework/optionresponse.pm	2001/06/12 22:42:55	1.14
@@ -17,7 +17,7 @@ sub start_optionresponse {
   push (@Apache::lonxml::namespace,'optionresponse');
   my $id = &Apache::response::start_response($parstack,$safeeval);
   if ($target eq 'edit') {
-    $result.="<table width=\"100%\" border=\"2\"><tr><td>Multiple Option Response Question</td>
+    $result.=&Apache::edit::start_table($token)."<tr><td>Multiple Option Response Question</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
 ."</td></tr><tr><td colspan=\"3\">\n";
@@ -53,13 +53,13 @@ sub start_foilgroup {
     my $option;
     my @opt;
     eval '@opt ='. &Apache::lonxml::get_param('options',$parstack,$safeeval);
-
+    my $count=0;
     foreach $option (@opt) {
-      $optionlist.="<option>$option</option>\n";
+      $optionlist.="<option value=\"$count\">$option</option>\n";
     }
     my $insertlist=&Apache::edit::insertlist($target,$token);
+    $result.=&Apache::edit::start_table($token);
     $result.= (<<ENDTABLE);
-    <table width="100%" border="2">
       <tr><td>Select Options</td>
         <td>
 	  Add new Option: <input type="text" name="$Apache::lonxml::curdepth.options" />
@@ -73,23 +73,32 @@ ENDTABLE
   }
   if ($target eq 'modified') {
     my @options;
+    my $optchanged=0;
     eval '@options ='.&Apache::lonxml::get_param('options',$parstack,$safeeval);
+    if ($ENV{"form.$Apache::lonxml::curdepth.deleteopt"}) {
+      my $delopt=$ENV{"form.$Apache::lonxml::curdepth.deleteopt"};
+      splice(@options,$delopt,1);
+      $optchanged=1;
+    }
     if ($ENV{"form.$Apache::lonxml::curdepth.options"}) {
       my $newopt = $ENV{"form.$Apache::lonxml::curdepth.options"};
-      $newopt =~ s/\'/\\\'/g;
       if ($options[0]) {
-	push(@options,$ENV{"form.$Apache::lonxml::curdepth.options"});
+	push(@options,$newopt);
       } else {
-	$options[0]=$ENV{"form.$Apache::lonxml::curdepth.options"};
+	$options[0]=$newopt;
       }
+      $optchanged=1;
+    }
+    if ($optchanged) {
       $result = "<foilgroup options=\"(";
       foreach my $option (@options) {
+	$option=~s/\'/\\\'/;
 	&Apache::lonxml::debug("adding option :$option:");
 	$result .="'".$option."',";
       }
       chop $result;
       $result.=')">';
-    }
+    } # else nothing changed so just use the default mechanism
   }
   return $result;
 }
@@ -225,9 +234,14 @@ sub start_foil {
   if ($target eq 'web') { &Apache::lonxml::startredirection; }
   if ($target eq 'edit') {
     $result=&Apache::edit::tag_start($target,$token,"Foil");
-    my $options= &Apache::lonxml::get_param('options',$parstack,$safeeval);
     my @opt;
-    eval '@opt ='.$options;
+    eval '@opt ='.&Apache::lonxml::get_param('options',$parstack,$safeeval,'-2');
+    my $optionlist="<option></option>\n";
+    foreach my $option (@opt) {
+      $optionlist.="<option>$option</option>\n";
+    }
+    $result.="Name: <input name=\"$Apache::lonxml::curdepth.name\" type=\"text\" />".
+      "Correct Option:<select>$optionlist</select></td></tr><tr><td colspan=\"3\">";
   }
   return $result;
 }
@@ -262,8 +276,8 @@ sub end_foil {
 sub insert_foil {
   return '
 <foil name="" value="">
-<starttextarea />
-<endtextarea />
+<startouttext />
+<endouttext />
 </foil>';
 }
 1;