--- loncom/homework/edit.pm	2003/06/16 15:09:23	1.56
+++ 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.56 2003/06/16 15:09:23 www 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>';          }
 
@@ -518,7 +525,7 @@ sub text_arg {
   my $arg=$token->[2]{$name};
   $result=$description.'&nbsp;<input name="'.&html_element_name($name).
     '" type="text" value="'.$arg.'" size="'.$size.'" />';
-  return $result;
+  return '<nobr>'.$result.'</nobr>';
 }
 
 sub select_arg {
@@ -540,10 +547,10 @@ sub select_arg {
 	    $optionlist.="<option $value >$option</option>\n";
 	}
     }
-    $result.=$description.'&nbsp;<select name="'.&html_element_name($name).
-        '">
+    $result.='<nobr>'.$description.'&nbsp;<select name="'.
+	&html_element_name($name).'">
        '.$optionlist.'
-      </select>';
+      </select></nobr>';
     return $result;
 }
 
@@ -577,7 +584,7 @@ sub select_or_text_arg {
     } else {
 	$result.=&text_arg($description,$name,$token,$size);
     }
-    return $result;
+    return '<nobr>'.$result.'</nobr>';
 }
 
 #----------------------------------------------------- image coordinates