--- loncom/homework/edit.pm	2001/12/21 16:58:25	1.26
+++ loncom/homework/edit.pm	2002/03/06 20:15:35	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.26 2001/12/21 16:58:25 harris41 Exp $
+# $Id: edit.pm,v 1.29 2002/03/06 20:15:35 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 # 3/20 Guy
+# 01/10/02 Matthew
+# 03/06/02 Matthew
 package Apache::edit; 
 
 use strict;
@@ -55,10 +57,8 @@ sub tag_start {
   &deletelist($target,$token)
   ."</td>
 <td>".
-  &insertlist($target,$token).
-    "</td>
-</tr><tr><td colspan=\"3\">\n";
-#<td>".
+    &insertlist($target,$token).&end_row().&start_spanning_row();
+#<td>". 
 #  &movebuttons($target,$token).
 #    "</tr><tr><td colspan=\"3\">\n";
   }
@@ -105,6 +105,10 @@ sub end_table {
   return $result;
 }
 
+sub start_spanning_row { return '<tr><td colspan="3">';}
+sub start_row          { return '<tr><td>';            }
+sub end_row            { return '</td></tr>';          }
+
 sub movebuttons {
   my ($target,$token) = @_;
   my $result='<input type="submit" name="moveup.'.
@@ -317,13 +321,6 @@ sub modifiedfield {
 #  &Apache::lonxml::debug("I want homework_edit_$Apache::lonxml::curdepth");
 #  &Apache::lonxml::debug($ENV{"form.homework_edit_$Apache::lonxml::curdepth"});
   $result=$ENV{"form.homework_edit_$Apache::lonxml::curdepth"};
-  if (defined $token) {
-    if (defined $token->[4]) {
-      $result=$token->[4].$result;
-    } else {
-      $result=$result.$token->[2];
-    }
-  }
   return $result;
 }
 
@@ -392,7 +389,7 @@ sub select_arg {
   }
   $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'
-      </select></td></tr><tr><td colspan="3">';
+      </select>';
   return $result;
 }
 
@@ -414,12 +411,24 @@ sub select_or_text_arg {
   if ($found) {
     $result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
        '.$optionlist.'
-      </select></td></tr><tr><td colspan="3">';
+      </select>';
   } else {
     $result.=&text_arg($description,$name,$token,$size);
   }
   return $result;
 }
+
+#----------------------------------------------------- browse
+sub browse {
+    # insert a link to call up the filesystem browser (lonindexer)
+    my $form    = 'lonhomework';
+    my $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.bgimg");
+    my $result = <<"ENDBUTTON";
+<a href=\"javascript:openbrowser('$form','$element')\"\>Browse</a>
+ENDBUTTON
+    return $result;
+}
+
 1;
 __END__
 
@@ -473,6 +482,18 @@ end_table() : reduce color depth; end ta
 
 =item *
 
+start_spanning_row() : start a new table row spanning the 'edit' environment.
+
+=item *
+
+start_row() : start a new table row and element. 
+
+=item *
+
+end_row() : end current table element and row.
+
+=item *
+
 movebuttons($target,$token) : move-up and move-down buttons; return scalar
 string
 
@@ -507,6 +528,11 @@ from lonxml; return a scalar string
 get_insert_list($token) : provide an insertion list based on possibilities
 from lonxml; return a scalar string
 
+=item *
+browse($elementname) : provide a link which will open up the filesystem
+browser (lonindexer) and, once a file is selected, place the result in
+the form element $elementname.
+
 =back
 
 incomplete...