--- loncom/homework/edit.pm	2002/11/08 14:38:47	1.40
+++ loncom/homework/edit.pm	2003/01/28 00:14:17	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.40 2002/11/08 14:38:47 albertel Exp $
+# $Id: edit.pm,v 1.44 2003/01/28 00:14:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -100,7 +100,7 @@ sub start_table {
   $Apache::edit::colordepth++;
   push(@Apache::edit::inserttag,$token->[1]);
   my $result='<div align="right">';
-  $result.='<table bgcolor="'.$color.'" width="97%" border="2">';
+  $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';
   return $result;
 }
 
@@ -122,8 +122,8 @@ sub end_table {
   return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="3">';}
-sub start_row          { return '<tr><td>';            }
+sub start_spanning_row { return '<tr><td colspan="3" bgcolor="#DDDDDD">';}
+sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }
 
 sub movebuttons {
@@ -327,6 +327,28 @@ sub insert_radiobuttonresponse {
 </radiobuttonresponse>';
 }
 
+sub insert_rankresponse {
+  return '
+<rankresponse max="10">
+    <foilgroup options="">
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</rankresponse>';
+}
+
+sub insert_matchresponse {
+  return '
+<matchresponse max="10">
+    <foilgroup options="">
+      <itemgroup>
+      </itemgroup>
+    </foilgroup>
+    <hintgroup>
+    </hintgroup>
+</matchresponse>';
+}
+
 sub insert_displayduedate { return '<displayduedate />'; }
 sub insert_displaytitle   { return '<displaytitle />'; }
 sub insert_hintpart {
@@ -452,7 +474,7 @@ sub text_arg {
   my $result;
   if (!defined $size) { $size=20; }
   my $arg=$token->[2]{$name};
-  $result=$description.'<input name="'."$Apache::lonxml::curdepth.$name".
+  $result=$description.'&nbsp;<input name="'."$Apache::lonxml::curdepth.$name".
     '" type="text" value="'.$arg.'" size="'.$size.'" />';
   return $result;
 }
@@ -476,7 +498,7 @@ sub select_arg {
 	    $optionlist.="<option $value >$option</option>\n";
 	}
     }
-    $result.=$description.'<select name="'.
+    $result.=$description.'&nbsp;<select name="'.
 	"$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'
       </select>';
@@ -506,7 +528,7 @@ sub select_or_text_arg {
     }
     $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
     if (($found) || (!$selected)) {
-	$result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
+	$result.=$description.'&nbsp;<select name="'."$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'
       </select>';
     } else {
@@ -518,9 +540,15 @@ sub select_or_text_arg {
 #----------------------------------------------------- browse
 sub browse {
     # insert a link to call up the filesystem browser (lonindexer)
-    $_ = shift;
+    my ($id, $mode) = @_;
     my $form    = 'lonhomework';
-    my $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$_");
+    my $element;
+    if (! defined($mode) || $mode eq 'attribute') {
+        $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$id");
+    } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
+        $element = &Apache::lonnet::escape('homework_edit_'.
+                                           $Apache::lonxml::curdepth);
+    }
     my $result = <<"ENDBUTTON";
 <a href=\"javascript:openbrowser('$form','$element')\"\>Browse</a>
 ENDBUTTON