--- loncom/homework/edit.pm	2003/10/06 20:11:38	1.57.2.2
+++ loncom/homework/edit.pm	2003/07/29 15:05:53	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.57.2.2 2003/10/06 20:11:38 albertel Exp $
+# $Id: edit.pm,v 1.58 2003/07/29 15:05:53 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,10 +63,17 @@ sub tag_start {
   &deletelist($target,$token)
   ."</td>
 <td>".
-    &insertlist($target,$token).&end_row().&start_spanning_row();
+    &insertlist($target,$token);
 #<td>". 
 #  &movebuttons($target,$token).
 #    "</tr><tr><td colspan=\"3\">\n";
+    my @help = Apache::lonxml::helpinfo($token);
+    if ($help[0]) {
+	$result .= '<td align="right" valign="top">' .
+	    Apache::loncommon::help_open_topic(@help) .
+	    '</td>';
+    } else { $result .= "<td>&nbsp;</td>"; }
+    $result .= &end_row().&start_spanning_row();
   }
   return $result;
 }
@@ -119,7 +126,7 @@ sub end_table {
   return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="3" bgcolor="#DDDDDD">';}
+sub start_spanning_row { return '<tr><td colspan="4" bgcolor="#DDDDDD">';}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }
 
@@ -527,19 +534,17 @@ sub select_arg {
     my $optionlist="";
     my $selected=$token->[2]{$name};
     foreach my $option (@$list) {
-	my ($text,$value);
+	my $value;
 	if ( ref($option) eq 'ARRAY') {
 	    $value='value="'.$$option[0].'"';
-	    $text=$$option[1];
-	    $option=$$option[0];
+	    $option=$$option[1];
 	} else {
-	    $text=$option;
 	    $value='value="'.$option.'"';
 	}
 	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$text</option>\n";
+	    $optionlist.="<option $value selected=\"on\">$option</option>\n";
 	} else {
-	    $optionlist.="<option $value >$text</option>\n";
+	    $optionlist.="<option $value >$option</option>\n";
 	}
     }
     $result.='<nobr>'.$description.'&nbsp;<select name="'.
@@ -556,20 +561,18 @@ sub select_or_text_arg {
     my $found=0;
     my $selected=$token->[2]{$name};
     foreach my $option (@$list) {
-	my ($text,$value);
+	my $value;
 	if ( ref($option) eq 'ARRAY') {
 	    $value='value="'.$$option[0].'"';
-	    $text=$$option[1];
-	    $option=$$option[0];
+	    $option=$$option[1];
 	} else {
-	    $text=$option;
 	    $value='value="'.$option.'"';
 	}
 	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$text</option>\n";
+	    $optionlist.="<option $value selected=\"on\">$option</option>\n";
 	    $found=1;
 	} else {
-	    $optionlist.="<option $value>$text</option>\n";
+	    $optionlist.="<option $value>$option</option>\n";
 	}
     }
     $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";