--- loncom/homework/edit.pm	2003/01/19 08:13:54	1.43
+++ loncom/homework/edit.pm	2022/12/31 14:08:59	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.43 2003/01/19 08:13:54 albertel Exp $
+# $Id: edit.pm,v 1.156 2022/12/31 14:08:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,14 +25,121 @@
 #
 # http://www.lon-capa.org/
 #
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
+=pod
+
+=head1 NAME
+
+Apache::edit - edit mode helpers
+
+=head1 SYNOPSIS
+
+Invoked by many homework and xml related modules.
+
+ &Apache::edit::SUBROUTINENAME(ARGUMENTS);
+
+=head1 INTRODUCTION
+
+This module outputs HTML syntax helpful for the rendering of edit
+mode interfaces.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item initialize_edit() 
+
+initialize edit (set colordepth to zero)
+
+=item tag_start($target,$token,$description)
+
+provide deletion and insertion lists
+for the manipulation of a start tag; return a scalar string
+
+=item tag_end($target,$token,$description)
+
+ending syntax corresponding to
+&tag_start. return a scalar string.
+
+=item  start_table($token)
+
+start table; update colordepth; return scalar string.
+
+=item end_table()
+
+reduce color depth; end table; return scalar string
+
+=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
+
+=item deletelist($target,$token)
+
+provide a yes option in an HTML select element; return scalar string
+
+=item handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
+$style)
+
+respond to a user delete request by passing relevant stack
+and array information to various rendering functions; return a scalar string
+
+=item get_insert_list($token)
+
+provide an insertion list based on possibilities from lonxml; return a scalar string
+
+=item insertlist($target,$token)
+
+api that uses get_insert_list; return a scalar string
+
+=item handleinsert($token)
+
+provide an insertion list based on possibilities from lonxml; return a scalar string
+
+=item 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.
+
+=item search($elementname)
+
+provide a link which will open up the filesystem searcher (lonsearchcat) and, once a file is selected, place the result in the form element $elementname.
+
+=item editline(tag,data,description,size)
+
+Provide a <input type="text" ../> for single-line text entry.  This is to be used for text enclosed by tags, not arguements/parameters associated with a tag.
+
+=back
+
+=cut
+
 package Apache::edit; 
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
+use Apache::loncommon;
 use HTML::Entities();
+use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA qw(:DEFAULT :match);
+ 
 
 # Global Vars
 # default list of colors to use in editing
@@ -40,456 +147,918 @@ use HTML::Entities();
 # depth of nesting of edit
 $Apache::edit::colordepth=0;
 @Apache::edit::inserttag=();
+# image-type responses: active background image and curdepth at definition
+$Apache::edit::bgimgsrc='';
+$Apache::edit::bgimgsrccurdepth='';
 
 sub initialize_edit {
-  $Apache::edit::colordepth=0;
-  @Apache::edit::inserttag=();
+    $Apache::edit::colordepth=0;
+    @Apache::edit::inserttag=();
 }
 
 sub tag_start {
-  my ($target,$token,$description) = @_;
-  my $result='';
-  if ($target eq "edit") {
-    my $tag=$token->[1];
-    if (!$description) {
-      $description=&Apache::lonxml::description($token);
-      if (!$description) { $description="&lt;$tag&gt;"; }
-    }
-    $result.= &start_table($token)."<tr><td>$description</td>
-<td>Delete".
-  &deletelist($target,$token)
-  ."</td>
-<td>".
-    &insertlist($target,$token).&end_row().&start_spanning_row();
+    my ($target,$token,$description) = @_;
+    my $result='';
+    if ($target eq "edit") {
+	my $tag=$token->[1];
+	if (!$description) {
+	    $description=&mt(&Apache::lonxml::description($token));
+	    if (!$description) { $description="&lt;$tag&gt;"; }
+	}
+    $result.= &start_table($token)."<tr><td>".&Apache::loncommon::insert_folding_button().
+        " $description</td><td>".&mt('Delete?')." ".&deletelist($target,$token).
+        "</td><td>".&insertlist($target,$token);
 #<td>". 
 #  &movebuttons($target,$token).
 #    "</tr><tr><td colspan=\"3\">\n";
-  }
-  return $result;
+	my @help = Apache::lonxml::helpinfo($token);
+	if ($help[0]) {
+	    $result .= '</td><td class="LC_edit_problem_latexhelper">'.
+		Apache::loncommon::help_open_topic(@help);
+	} else { $result .= "</td><td>&nbsp;"; }
+	$result .= &end_row().&start_spanning_row();
+    }
+    return $result;
 }
 
 sub tag_end {
-  my ($target,$token,$description) = @_;
-  my $result='';
-  if ($target eq 'edit') {
-    my $tag=$token->[1];
-    if (!defined($description)) {
-      $result.="</td></tr><tr><td>&lt;/$tag&gt;</td><td colspan=\"2\">&nbsp;</td>";
-    } else {
-      if ($description ne '') { $result.="</td></tr><tr><td>$description</td><td colspan=\"2\">&nbsp;</td>"; }
+    my ($target,$token,$description) = @_;
+    my $result='';
+    if ($target eq 'edit') {
+	$result.="</td></tr>".&end_table()."\n";
     }
-    $result.="</tr>".&end_table()."\n";
-  }
-  return $result;
+    return $result;
 }
 
 sub start_table {
-  my ($token)=@_;
-  my $tag = $token->[1];
-  my $tagnum;
-  foreach my $namespace (reverse @Apache::lonxml::namespace) {
-    my $testtag=$namespace.'::'.$tag;
-    $tagnum=$Apache::lonxml::insertlist{"$testtag.num"};
-    if (defined($tagnum)) { last; }
-  }
-  if (!defined ($tagnum)) { $tagnum=$Apache::lonxml::insertlist{"$tag.num"}; }
-  my $color = $Apache::lonxml::insertlist{"$tagnum.color"};
-  if (!defined($color)) {
-    $color = $Apache::edit::colorlist[$Apache::edit::colordepth];
-  }
-  $Apache::edit::colordepth++;
-  push(@Apache::edit::inserttag,$token->[1]);
-  my $result='<div align="right">';
-  $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="5" cellpadding="3">';
-  return $result;
+    my ($token)=@_;
+    my $tag = &Apache::lonxml::get_tag($token);
+    
+    my $color = $Apache::lonxml::insertlist{"$tag.color"};
+    &Apache::lonxml::debug(" $tag -- $color");
+    if (!defined($color)) {
+	$color = $Apache::edit::colorlist[$Apache::edit::colordepth];
+    }
+    $Apache::edit::colordepth++;
+    push(@Apache::edit::inserttag,$token->[1]);
+    my $result='<div>';
+    $result.='<table bgcolor="'.$color.'" width="97%" border="0" cellspacing="3" cellpadding="2">';
+    return $result;
 }
 
 sub end_table {
-  $Apache::edit::colordepth--;
-  my $result='</table></div>';
-  $result.="<table><tr><td>";
-
-  my ($tagname,$closingtag);
-  if (defined($Apache::edit::inserttag[-2])) {
-    $tagname=$Apache::edit::inserttag[-2];
-  } else {$tagname='problem';}
-  if (defined($Apache::edit::inserttag[-1])) {
-    $closingtag=$Apache::edit::inserttag[-1];
-  }
-  $result.=&innerinsertlist('edit',$tagname,$closingtag).
-    "</td></tr></table>";
-  pop(@Apache::edit::inserttag);
-  return $result;
+    $Apache::edit::colordepth--;
+    my $result='</table></div>';
+    $result.='<div><table><tr><td>';
+
+    my ($tagname,$closingtag);
+    if (defined($Apache::edit::inserttag[-2])) {
+	$tagname=$Apache::edit::inserttag[-2];
+    } else {
+	if ($Apache::lonhomework::parsing_a_task) {
+	    $tagname='Task';
+	} else {
+	    $tagname='problem';
+	}
+    }
+    if (defined($Apache::edit::inserttag[-1])) {
+	$closingtag=$Apache::edit::inserttag[-1];
+    }
+    $result.=&innerinsertlist('edit',$tagname,$closingtag).
+	"</td></tr></table></div>";
+    my $last = pop(@Apache::edit::inserttag);
+    return $result;
 }
 
-sub start_spanning_row { return '<tr><td colspan="3" bgcolor="#DDDDDD">';}
+sub start_spanning_row {
+    return '<tr name="foldblock_'.$Apache::lonxml::curdepth.
+    '" style="visibility: \'\'"><td colspan="5" bgcolor="#F0F0F0">';
+}
 sub start_row          { return '<tr><td bgcolor="#DDDDDD">';            }
 sub end_row            { return '</td></tr>';          }
 
 sub movebuttons {
-  my ($target,$token) = @_;
-  my $result='<input type="submit" name="moveup.'.
-    $Apache::lonxml::curdepth.'" value="Move Up" />';
-  $result.='<input type="submit" name="movedown.'.
-    $Apache::lonxml::curdepth.'" value="Move Down" />';
-  return $result;
+    my ($target,$token) = @_;
+    my $result='<input type="submit" name="moveup.'.
+	$Apache::lonxml::curdepth.'" value="Move Up" />';
+    $result.='<input type="submit" name="movedown.'.
+	$Apache::lonxml::curdepth.'" value="Move Down" />';
+    return $result;
 }
 
 sub deletelist {
-  my ($target,$token) = @_;
-  my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
+    my ($target,$token) = @_;
+    my $result = "<select name=\"delete_$Apache::lonxml::curdepth\">
 <option></option>
-<option>Yes</option>
+<option>".&mt('yes')."</option>
 </select>";
-  return $result;
+    return $result;
 }
 
 sub handle_delete {
-  if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
-  my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-  my $result=0;
-  if ($space) {
-    my $sub1="$space\:\:delete_$token->[1]";
-    {
-      no strict 'refs';
-      if (defined &$sub1) {
-	$result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
-      }
-    }
-  }
-  if (!$result) {
-    my $endtag='/'.$token->[1];
-    my $bodytext=&Apache::lonxml::get_all_text($endtag,$$parser[$#$parser]);
-    $$parser['-1']->get_token();
-    &Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
-    &Apache::lonxml::end_tag($tagstack,$parstack,$token);
-  }
-  return 1;
+    if (!$env{"form.delete_$Apache::lonxml::curdepth"}) { return ''; }
+    my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result=0;
+    if ($space) {
+	my $sub1="$space\:\:delete_$token->[1]";
+	{
+	    no strict 'refs';
+	    if (defined &$sub1) {
+		$result=&$sub1($target,$token,$tagstack,$parstack,$parser,$safeeval,$style);
+	    }
+	}
+    }
+    if (!$result) {
+	my $endtag='/'.$token->[1];
+	my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser,$style);
+	$$parser['-1']->get_token();
+	&Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]");
+	&Apache::lonxml::end_tag($tagstack,$parstack,$token);
+    }
+    return 1;
 }
 
 sub get_insert_list {
-  my ($tagname) = @_;
-  my $result='';
-  my @tagnums= ();
-  #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
-  if ($Apache::lonxml::insertlist{"$tagname.which"}) {
-    push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
-  }
-  foreach my $namespace (@Apache::lonxml::namespace) {
-    if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
-      push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
-    }
-  }
-  if (@tagnums) {
-    my %options;
-    foreach my $tagnum (@tagnums) {
-      my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"};
-      $options{$descrip} ="<option value=\"$tagnum\">".$descrip."</option>\n";
-    }
-    foreach my $option (sort(keys(%options))) { $result.=$options{$option}; }
-    if ($result) { $result='<option selected="on"></option>'.$result; }
-  }
-  return $result;
+    my ($tagname) = @_;
+    my $result='';
+    my @tags= ();
+    #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist))));
+    if ($Apache::lonxml::insertlist{"$tagname.which"}) {
+	push (@tags, @{ $Apache::lonxml::insertlist{"$tagname.which"} });
+    }
+    foreach my $namespace (@Apache::lonxml::namespace) {
+	if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) {
+	    push (@tags, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} });
+	}
+    }
+    if (@tags) {
+	my %options;
+	foreach my $tag (@tags) {
+	    my $descrip=$Apache::lonxml::insertlist{"$tag.description"};
+	    my $tagnum =$Apache::lonxml::insertlist{"$tag.num"};
+	    $options{$descrip} ="<option value=\"$tagnum\">".
+		&mt($descrip)."</option>\n";
+	}
+	foreach my $option (sort(keys(%options))) {$result.=$options{$option};}
+	if ($result) { $result='<option selected="selected"></option>'.$result; }
+    }
+    return $result;
 }
 
 sub insertlist {
-  my ($target,$token) = @_;
-  return &innerinsertlist($target,$token->[1]);
+    my ($target,$token) = @_;
+    return &innerinsertlist($target,$token->[1]);
 }
 
 sub innerinsertlist {
-  my ($target,$tagname,$closingtag) = @_;
-  my $result;
-  my $after='';
-  if ($closingtag) {
-     $after='_after_'.$closingtag; 
-  }
-  if ($target eq 'edit') {
-    my $optionlist= &get_insert_list($tagname);
-    if ($optionlist) {
-      $result = "Insert:
-<select name=\"insert$after\_$Apache::lonxml::curdepth\">
-$optionlist
-</select>"
-    } else {
-      $result="&nbsp;";
+    my ($target,$tagname,$closingtag) = @_;
+    my $result;
+    my $after='';
+    if ($closingtag) {
+	$after='_after_'.$closingtag; 
+    }
+    if ($target eq 'edit') {
+	my $optionlist= &get_insert_list($tagname);
+	if ($optionlist) {
+	    $result = &mt('Insert:')."
+            <select name=\"insert$after\_$Apache::lonxml::curdepth\">
+                  $optionlist
+            </select>"
+	} else {
+	    $result="&nbsp;";
+	}
     }
-  }
-  return $result;
+    return $result;
 }
 
 sub handle_insert {
-  if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
-  my $result;
-  my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"};
-  my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
-  if ($func eq 'default') {
-    my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-    my $namespace;
-    if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
-    $result.="\n<$newtag>\n</$newtag>";
-  } else {
-    if (defined(&$func)) {
-      {
-	no strict 'refs';
-	$result.=&$func();
-      }
-    } else {
-      my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-      &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined.");
-    }
-  }
-  return $result;
+    if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; }
+    my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"};
+    return &do_insert($tagnum);
 }
 
 sub handle_insertafter {
-  my $tagname=shift;
-  if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '')
-     { return ''; }
-  my $result;
-  my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
-  my $func=$Apache::lonxml::insertlist{"$tagnum.function"};
-  if ($func eq 'default') {
-    my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-    my $namespace;
-    if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
-    $result.="\n<$newtag>\n</$newtag>";
-  } else {
-    if (defined(&$func)) {
-      {
-	no strict 'refs';
-	$result.=&$func();
-      }
+    my $tagname=shift;
+    if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') {
+	return '';
+    }
+    my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"};
+    return &do_insert($tagnum,1);
+}
+
+sub do_insert {
+    my ($tagnum,$after) = @_;
+    my $result;
+
+    my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"};
+    my $func   = $Apache::lonxml::insertlist{"$newtag.function"};
+    if ($func eq 'default') {
+	my $namespace;
+	if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); }
+	my $depth = scalar(@Apache::lonxml::depthcounter);
+	$depth -- if ($after);
+	my $inset = "\t"x$depth;
+	$result.="\n$inset<$newtag></$newtag>";
     } else {
-      my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"};
-      &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)");
+	if (defined(&$func)) {
+	    {
+		no strict 'refs';
+		$result.=&$func();
+	    }
+	} else {
+	    &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined. ($tagnum)");
+	}
     }
-  }
-  return $result;
+    return $result;
+}
+
+sub insert_img {
+    return '
+    <img />';
 }
 
 sub insert_responseparam {
-  return '
+    return '
     <responseparam />';
 }
 
+sub insert_parameter {
+    return '
+    <parameter />';
+}
+
 sub insert_formularesponse {
-  return '
+    return '
 <formularesponse answer="" samples="">
-    <textline />
+    <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
+    <textline size="25"/>
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </formularesponse>';
 }
 
+sub insert_functionplotresponse {
+    return '
+<functionplotresponse>
+<functionplotelements>
+</functionplotelements>
+<functionplotruleset>
+</functionplotruleset>
+</functionplotresponse>';
+}
+
+sub insert_spline {
+    return '
+<spline />';
+}
+
+sub insert_backgroundplot {
+    return '
+<backgroundplot />';
+}
+
+sub insert_plotobject {
+    return '
+<plotobject />';
+}
+
+sub insert_plotvector {
+    return '
+<plotvector />';
+}
+
+sub insert_drawvectorsum {
+    return '
+<drawvectorsum />';
+}
+
+
+sub insert_functionplotrule {
+    return '
+<functionplotrule />';
+}
+
+sub insert_functionplotvectorrule {
+    return '
+<functionplotvectorrule />';
+}
+
+sub insert_functionplotvectorsumrule {
+    return '
+<functionplotvectorsumrule />';
+}
+
+sub insert_functionplotcustomrule {
+    return '
+<functionplotcustomrule>
+<answer type="loncapa/perl">
+# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x)
+# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name")
+# &fpr_vectorlength("Name"), &fpr_vectorangle("Name")
+ 
+# Return 0 or 1
+return 1;
+</answer>
+</functionplotcustomrule>';
+}
+
+sub insert_functionplotruleset {
+    return '
+<functionplotruleset>
+<functionplotrule />
+</functionplotruleset>';
+}
+
+sub insert_functionplotelements {
+    return '
+<functionplotelements>
+<spline />
+</functionplotelements>';
+}
+
 sub insert_numericalresponse {
-  return '
+    return '
 <numericalresponse answer="">
+<responseparam type="tolerance" default="5%" name="tol" description="Numerical Tolerance" />
+<responseparam name="sig" type="int_range,0-16" default="0,15" description="Significant Figures" />
     <textline />
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </numericalresponse>';
 }
 
+sub insert_externalresponse {
+    return '
+<externalresponse url="" answer="" answerdisplay="" form="">
+    <textfield spellcheck="none" />
+</externalresponse>';
+}
+
+sub insert_customresponse {
+    return '
+<customresponse>
+    <answer type="loncapa/perl">
+    </answer>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</customresponse>';
+}
+
+sub insert_customresponse_answer {
+    return '
+    <answer type="loncapa/perl">
+    </answer>
+';
+}
+
+sub insert_customhint {
+    return '
+        <customhint>
+            <answer type="loncapa/perl">
+            </answer>
+        </customhint>';
+}
+
+sub insert_customhint_answer {
+    return '
+            <answer type="loncapa/perl">
+            </answer>
+';
+}
+
+sub insert_mathresponse {
+    return '
+<mathresponse>
+    <answer>
+    </answer>
+    <textline />
+    <hintgroup>
+        <startouttext />
+        <endouttext />
+    </hintgroup>
+</mathresponse>';
+}
+
+sub insert_mathresponse_answer {
+    return '
+    <answer>
+    </answer>
+';
+}
+
+sub insert_mathhint {
+    return '
+        <mathhint>
+            <answer>
+            </answer>
+        </mathhint>';
+}
+
+sub insert_mathhint_answer {
+    return '
+            <answer>
+            </answer>
+';
+}
+
 sub insert_stringresponse {
-  return '
+    return '
 <stringresponse answer="" type="">
     <textline />
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </stringresponse>';
 }
 
 sub insert_essayresponse {
-  return '
+    return '
 <essayresponse>
     <textfield></textfield>
 </essayresponse>';
 }
 
+sub insert_imageresponse {
+    return '
+<imageresponse max="1">
+    <foilgroup>
+      <foil>
+      </foil>
+    </foilgroup>
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</imageresponse>';
+}
+
 sub insert_optionresponse {
-  return '
+    return '
 <optionresponse max="10">
     <foilgroup options="">
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </optionresponse>';
 }
 
+sub insert_organicresponse {
+    return '
+<organicresponse>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</organicresponse>';
+}
+
+sub insert_organicstructure {
+    return '
+<organicstructure />
+';
+}
+
 sub insert_radiobuttonresponse {
-  return '
+    return '
 <radiobuttonresponse max="10">
     <foilgroup>
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </radiobuttonresponse>';
 }
 
+sub insert_reactionresponse {
+    return '
+<reactionresponse>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</reactionresponse>';
+}
+
 sub insert_rankresponse {
-  return '
+    return '
 <rankresponse max="10">
     <foilgroup options="">
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
     </foilgroup>
     <hintgroup>
+    <startouttext /><endouttext />
     </hintgroup>
 </rankresponse>';
 }
 
+sub insert_matchresponse {
+    return '
+<matchresponse max="10">
+    <foilgroup options="">
+      <itemgroup>
+        <item>
+          <startouttext /><endouttext />
+        </item>
+      </itemgroup>
+      <foil>
+         <startouttext /><endouttext />
+      </foil>
+    </foilgroup>
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</matchresponse>';
+}
+
+sub insert_startpartmarker { return '<startpartmarker />'; }
+sub insert_endpartmarker { return '<endpartmarker />'; }
+
 sub insert_displayduedate { return '<displayduedate />'; }
 sub insert_displaytitle   { return '<displaytitle />'; }
 sub insert_hintpart {
-  return '
+    return '
 <hintpart on="default">
-    <startouttext/>
-    <endouttext />
+    <startouttext/><endouttext />
 </hintpart>';
 }
 
-sub insert_numericalhint {
+sub insert_hintgroup {
   return '
+<hintgroup>
+    <startouttext /><endouttext />
+</hintgroup>';
+}
+
+sub insert_numericalhint {
+    return '
 <numericalhint>
 </numericalhint>';
 }
 
+sub insert_reactionhint {
+    return '
+<reactionhint>
+</reactionhint>';
+}
+
+sub insert_organichint {
+    return '
+<organichint>
+</organichint>';
+}
+
+sub insert_stringhint {
+    return '
+<stringhint>
+</stringhint>';
+}
+
+sub insert_formulahint {
+    return '
+<formulahint>
+</formulahint>';
+}
+
 sub insert_radiobuttonhint {
-  return '
+    return '
 <radiobuttonhint>
 </radiobuttonhint>';
 }
 
+sub insert_optionhint {
+    return '
+<optionhint>
+</optionhint>';
+}
+
 sub insert_startouttext {
-  return "<startouttext />\n<endouttext />";
+    return "<startouttext /><endouttext />";
 }
 
 sub insert_script {
-  return "\n<script type=\"loncapa/perl\">\n</script>";
+    return "\n<script type=\"loncapa/perl\"></script>";
+}
+
+sub js_change_detection {
+    my $unsaved=&mt("There are unsaved changes");
+    return (<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+var clean = true;
+var is_submit = false;
+var still_ask = false;
+function compareForm(event_) {
+        if (!event_ && window.event) {
+          event_ = window.event;
+        }
+	if ((!is_submit || (is_submit && still_ask)) && !clean) {
+	    still_ask = false;
+	    is_submit = false;
+            event_.returnValue = "$unsaved";
+            return "$unsaved";
+        }
+}
+function unClean() {
+     clean=false;
+}
+window.onbeforeunload = compareForm;
+// ]]>
+</script>
+SCRIPT
+}
+
+sub form_change_detection {
+    return ' onsubmit="is_submit=true;" ';
+}
+
+sub element_change_detection {
+    return ' onchange="unClean();" ';
+}
+
+sub submit_ask_anyway {
+    my ($extra_action) = @_;
+    my $resource = &Apache::loncommon::escape_single($env{'request.ambiguous'});
+    return ' onclick="saveScrollPosition(\''.$resource.'\');still_ask=true;'.$extra_action.';" ';
+}
+
+sub submit_dont_ask {
+    my ($extra_action) = @_;
+    my $resource = &Apache::loncommon::escape_single($env{'request.ambiguous'});
+    return ' onclick="saveScrollPosition(\''.$resource.'\');is_submit=true;'.$extra_action.';" ';
+}
+
+sub js_update_linknum {
+    return (<<SCRIPT);
+<script type="text/javascript">
+// <![CDATA[
+function updateNumber(name,index,caller,textprompt) {
+    var pickitem = document.getElementById(name+'_'+index);
+    var picknumtext = document.getElementById(name+'_numtext_'+index);
+    if (pickitem.checked) {
+        var showval = '';
+        if (pickitem.value != 'nochoice') {
+            showval = pickitem.value;
+        } 
+        var picknum=prompt(textprompt,showval);
+        if (picknum == '' || picknum == null) {
+            if (caller == 'check') {
+                pickitem.checked=false;
+                pickitem.value='nochoice';
+            }
+        } else {
+            picknum.toString();
+            var regexdigit=/^\\d+\$/;
+            if (regexdigit.test(picknum)) {
+                pickitem.value = picknum;
+                picknumtext.innerHTML = '&nbsp;<a href="javascript:updateNumber(\\''+name+'\\',\\''+index+'\\',\\'link\\',\\''+textprompt+'\\');">'+picknum+'</a>';
+            } else {
+                if (caller == 'check') {
+                    pickitem.checked=false;
+                    pickitem.value='nochoice';
+                }
+                return;
+            }
+        }
+    } else {
+        pickitem.value = '';
+        picknumtext.innerHTML = '';
+    }
+}
+
+// ]]>
+</script>
+SCRIPT
+
 }
 
 sub textarea_sizes {
-  my ($data)=@_;
-  my $count=0;
-  my $maxlength=-1;
-  foreach (split ("\n", $$data)) { $count++;
+    my ($data)=@_;
+    my $count=0;
+    my $maxlength=-1;
+    foreach (split ("\n", $$data)) {
+	$count+=int(length($_)/79);
+	$count++;
 	if (length($_) > $maxlength) { $maxlength = length($_); }
-      }
-  my $rows = $count;
-  my $cols = $maxlength;
-  return ($rows,$cols);
+    }
+    my $rows = $count;
+    my $cols = $maxlength;
+    return ($rows,$cols);
 }
 
 sub editline {
     my ($tag,$data,$description,$size)=@_;
-    $data=&HTML::Entities::encode($data);
-    if ($description) { $description="<br />".$description."<br />"; }
+    $data=&HTML::Entities::encode($data,'<>&"');
+    if ($description) { $description=$description."<br />"; }
+    my $change_code = &element_change_detection();
     my $result = <<"END";
 $description
 <input type="text" name="homework_edit_$Apache::lonxml::curdepth" 
-       value="$data" size="$size" />
+       value="$data" size="$size" $change_code />
 END
     return $result;
 }
 
 sub editfield {
-  my ($tag,$data,$description,$minwidth,$minheight)=@_;
+    my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
 
-  my ($rows,$cols)=&textarea_sizes(\$data);
-  if ($cols > 80) { $cols = 80; }
-  if ($cols < $minwidth ) { $cols = $minwidth; }
-  if ($rows < $minheight) { $rows = $minheight; }
-  if ($description) { $description="<br />".$description."<br />"; }
-  return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea rows="'.$rows.
-    '" cols="'.$cols.'" name="homework_edit_'.$Apache::lonxml::curdepth.'">'.
-      &HTML::Entities::encode($data).'</textarea>'."\n";
+    my ($rows,$cols)=&textarea_sizes(\$data);
+    my $textareaclass;
+ 
+    if (&Apache::lonhtmlcommon::htmlareabrowser() && $usehtmlarea) { 
+	$rows+=7;      # make room for HTMLarea
+	$minheight+=7; # make room for HTMLarea
+        $textareaclass = ' class="LC_richDefaultOff"';
+    }
+    if ($cols > 80) { $cols = 80; }
+    if ($cols < $minwidth ) { $cols = $minwidth; }
+    if ($rows < $minheight) { $rows = $minheight; }
+    if ($description) { $description='<br />'.&mt($description).'<br />'; }
+
+    # remove typesetting whitespace from between data and the end tag
+    # to make the edit look prettier
+    $data =~ s/\n?[ \t]*$//;
+
+    return $description."\n".'<textarea style="width:99%" rows="'.$rows.
+	'" cols="'.$cols.'" name="homework_edit_'.
+	$Apache::lonxml::curdepth.'" id="homework_edit_'.
+	$Apache::lonxml::curdepth.'" '.&element_change_detection().
+        $textareaclass.'>'.
+	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
+        ($usehtmlarea?'<br />'.&Apache::lonhtmlcommon::spelllink('lonhomework',
+                                   'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
 }
 
 sub modifiedfield {
-  my ($token) = @_;
-  my $result;
-#  foreach my $envkey (sort keys %ENV) {
-#    &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
-#  }
-#  &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"};
-  return $result;
+    my ($endtag,$parser) = @_;
+    my $result;
+    $result=$env{"form.homework_edit_$Apache::lonxml::curdepth"};
+    my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
+    # textareas throw away intial \n 
+    if ($bodytext=~/^\n/) {
+	$result="\n".$result;
+    }
+    # if there is typesetting whitespace from between the data and the end tag
+    # restore to keep the source looking pretty
+    if ($bodytext =~ /(\n?[ \t]*)$/) {
+	$result .= $1;
+    }
+    return $result;
 }
 
 # Returns a 1 if the token has been modified and you should rebuild the tag
 # side-effects, will modify the $token if new values are found
 sub get_new_args {
-  my ($token,$parstack,$safeeval,@args)=@_;
-  my $rebuild=0;
-  foreach my $arg (@args) {
-    #just want the string that it was set to
-    my $value=$token->[2]->{$arg};
-    my $newvalue=$ENV{"form.$Apache::lonxml::curdepth.$arg"};
-    &Apache::lonxml::debug(" for:$arg: cur is :$value: new is :$newvalue:");
-    if ($value ne $newvalue) {
-      $token->[2]->{$arg}=$newvalue;
-      $rebuild=1;
+    my ($token,$parstack,$safeeval,@args)=@_;
+    my $rebuild=0;
+    foreach my $arg (@args) {
+	#just want the string that it was set to
+	my $value=$token->[2]->{$arg};
+	my $element=&html_element_name($arg);
+	my $newvalue=$env{"form.$element"};
+	&Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:");
+	if (defined($newvalue) && $value ne $newvalue) {
+	    if (ref($newvalue) eq 'ARRAY') {
+		$token->[2]->{$arg}=join(',',@$newvalue);
+	    } else {
+		$token->[2]->{$arg}=$newvalue;
+	    }
+	    $rebuild=1;
+	    # add new attributes to the of the attribute seq
+	    if (!grep { $arg eq $_ } (@{ $token->[3] })) {
+		push(@{ $token->[3] },$arg);
+	    }
+	} elsif (!defined($newvalue) && defined($value)) {
+	    delete($token->[2]->{$arg});
+	    $rebuild=1;
+	}
     }
-  }
-  return $rebuild;
+    return $rebuild;
 }
 
 # looks for /> on start tags
 sub rebuild_tag {
-  my ($token) = @_;
-  my $result;
-  if ($token->[0] eq 'S') {
-    $result = '<'.$token->[1];
-    while (my ($key,$val)= each(%{$token->[2]})) {
-      $val=~s:^\s+|\s+$::g;
-      $val=~s:"::g; #"
-      &Apache::lonxml::debug("setting :$key: to  :$val:");
-      $result.=' '.$key.'="'.$val.'"';
-    }
-    if ($token->[4] =~ m:/>$:) {
-      $result.=' />';
-    } else {
-      $result.='>';
+    my ($token) = @_;
+    my $result;
+    if ($token->[0] eq 'S') {
+	$result = '<'.$token->[1];
+	foreach my $attribute (@{ $token->[3] }) {
+	    my $value = $token->[2]{$attribute};
+	    next if ($value eq '');
+	    $value =~s/^\s+|\s+$//g;
+	    $value =~s/\"//g;
+	    &Apache::lonxml::debug("setting :$attribute: to  :$value:");
+	    $result.=' '.$attribute.'="'.$value.'"';
+	}
+	if ($token->[4] =~ m:/>$:) {
+	    $result.=' />';
+	} else {
+	    $result.='>';
+	}
+    } elsif ( $token->[0] eq 'E' ) {
+	$result = '</'.$token->[1].'>';
     }
-  } elsif ( $token->[0] eq 'E' ) {
-    $result = '</'.$token->[1].'>';
-  }
-  return $result;
+    return $result;
 }
 
-sub text_arg {
-  my ($description,$name,$token,$size) = @_;
-  my $result;
-  if (!defined $size) { $size=20; }
-  my $arg=$token->[2]{$name};
-  $result=$description.'<input name="'."$Apache::lonxml::curdepth.$name".
-    '" type="text" value="'.$arg.'" size="'.$size.'" />';
-  return $result;
+sub html_element_name {
+    my ($name) = @_;
+    return $name.'_'.$Apache::lonxml::curdepth;
 }
 
-sub select_arg {
-    my ($description,$name,$list,$token) = @_;
+sub hidden_arg {
+    my ($name,$token) = @_;
+    my $result;
+    my $arg=$token->[2]{$name};
+    $result='<input name="'.&html_element_name($name).
+	'" type="hidden" value="'.$arg.'" />';
+    return $result;
+}
+
+sub checked_arg {
+    my ($description,$name,$list,$token,$onclick,$useid) = @_;
     my $result;
     my $optionlist="";
-    my $selected=$token->[2]{$name};
+    my $allselected=$token->[2]{$name};
+    $result=&mt($description);
     foreach my $option (@$list) {
-	my $value;
+	my ($value,$text);
 	if ( ref($option) eq 'ARRAY') {
 	    $value='value="'.$$option[0].'"';
-	    $option=$$option[1];
+	    $text=&mt($$option[1]);
+	    $option=$$option[0];
 	} else {
+	    $text=&mt($option);
 	    $value='value="'.$option.'"';
 	}
-	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$option</option>\n";
-	} else {
-	    $optionlist.="<option $value >$option</option>\n";
+        $result.=' <span class="LC_edit_opt"><label><input type="checkbox" '.$value.' name="'.
+	    &html_element_name($name).'"';
+	foreach my $selected (split(/,/,$allselected)) {
+	    if ( $selected eq $option ) {
+		$result.=' checked="checked" ';
+		last;
+	    }
 	}
+        if ($useid) {
+            $result .= ' id="'.&html_element_name($name).'" ';
+        }
+	$result.=&element_change_detection().$onclick.' />'.$text.'</label></span>'."\n";
+    }
+    return $result;
+}
+
+sub text_arg {
+    my ($description,$name,$token,$size, $class) = @_;
+    my $result;
+    if (!defined $size) { $size=20; }
+    my $arg=$token->[2]{$name};
+    $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).
+	'" type="text" value="'.$arg.'" size="'.$size.'" ';
+    if (defined $class) {
+	$result .= 'class="' . $class . '" ';
+    }
+    $result .=	&element_change_detection().'/>';
+    return ' <span class="LC_edit_opt">'.$result.'</span>';
+}
+
+sub select_arg {
+    my ($description,$name,$list,$token) = @_;
+    my $result;
+    my $optionlist="";
+    my $selected=$token->[2]{$name};
+    if (ref($list) eq 'ARRAY') {
+        foreach my $option (@{$list}) {
+	    my ($text,$value);
+	    if (ref($option) eq 'ARRAY') {
+	        $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+	        $text=$option->[1];
+	        $option=$option->[0];
+	    } else {
+	        $text=$option;
+	        $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+	    }
+	    if ( $selected eq $option ) {
+	        $optionlist.="<option $value selected=\"selected\">".&mt($text)."</option>\n";
+	    } else {
+	        $optionlist.="<option $value >".&mt($text)."</option>\n";
+	    }
+        }
     }
-    $result.=$description.'<select name="'.
-	"$Apache::lonxml::curdepth.$name".'">
+    $result.=' <span class="LC_edit_opt">'.&mt($description).'&nbsp;<select name="'.
+	&html_element_name($name).'" '.&element_change_detection().' >
        '.$optionlist.'
-      </select>';
+      </select></span>';
     return $result;
 }
 
@@ -499,179 +1068,285 @@ sub select_or_text_arg {
     my $optionlist="";
     my $found=0;
     my $selected=$token->[2]{$name};
-    foreach my $option (@$list) {
-	my $value;
-	if ( ref($option) eq 'ARRAY') {
-	    $value='value="'.$$option[0].'"';
-	    $option=$$option[1];
-	} else {
-	    $value='value="'.$option.'"';
-	}
-	if ( $selected eq $option ) {
-	    $optionlist.="<option $value selected=\"on\">$option</option>\n";
-	    $found=1;
-	} else {
-	    $optionlist.="<option $value>$option</option>\n";
-	}
+    if (ref($list) eq 'ARRAY') {
+        foreach my $option (@{$list}) {
+	    my ($text,$value);
+	    if (ref($option) eq 'ARRAY') {
+	        $value='value="'.&HTML::Entities::encode($option->[0]).'"';
+	        $text=$option->[1];
+	        $option=$option->[0];
+	    } else {
+	        $text=$option;
+	        $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"';
+	    }
+	    if ( $selected eq $option ) {
+	        $optionlist.="<option $value selected=\"selected\">$text</option>\n";
+	        $found=1;
+	    } else {
+	        $optionlist.="<option $value>$text</option>\n";
+	    }
+        }
     }
-    $optionlist.="<option value=\"TYPEDINVALUE\">Type in value</option>\n";
-    if (($found) || (!$selected)) {
-	$result.=$description.'<select name="'."$Apache::lonxml::curdepth.$name".'">
-       '.$optionlist.'
-      </select>';
-    } else {
-	$result.=&text_arg($description,$name,$token,$size);
+    $optionlist.="<option value=\"TYPEDINVALUE\"".
+ 	((!$found)?' selected="selected"':'').
+ 	">".&mt('Type-in value')."</option>\n";
+#
+    my $change_code=&element_change_detection();
+    my $element=&html_element_name($name);
+    my $selectelement='select_list_'.$element;
+    my $typeinelement='type_in_'.$element;
+    my $typeinvalue=($found?'':$selected);
+#
+    my $hiddenvalue='this.form.'.$element.'.value';
+    my $selectedindex='this.form.'.$selectelement.'.selectedIndex';
+    my $selectedvalue='this.form.'.$selectelement.
+	     '.options['.$selectedindex.'].value';
+    my $typedinvalue='this.form.'.$typeinelement.'.value';
+    my $selecttypeinindex='this.form.'.$selectelement.'.options.length';
+    $description=&mt($description);
+#
+    return (<<ENDSELECTORTYPE);
+ <span class="LC_edit_opt">
+$description
+&nbsp;<select name="$selectelement"
+onchange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
+$optionlist
+</select>
+<input type="text" size="$size" name="$typeinelement"
+       value="$typeinvalue" 
+onchange="$hiddenvalue=$typedinvalue;"
+onfocus="$selectedindex=$selecttypeinindex-1;" />
+<input type="hidden" name="$element" value="$selected" $change_code />
+</span>
+ENDSELECTORTYPE
+}
+
+#----------------------------------------------------- image coordinates
+# single image coordinates, x, y 
+sub entercoords {
+    my ($idx,$idy,$mode,$width,$height) = @_;
+    unless ($Apache::edit::bgimgsrc) { return ''; }
+    if ($idx) { $idx.='_'; }
+    if ($idy) { $idy.='_'; }
+    my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
+    my $form    = 'lonhomework';
+    my $element;
+    if (! defined($mode) || $mode eq 'attribute') {
+        $element = &escape("$Apache::lonxml::curdepth");
+    } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
+        $element = &escape('homework_edit_'.
+                                           $Apache::lonxml::curdepth);
+    }
+    my $id=$Apache::lonxml::curdepth;
+    my %data=("imagechoice.$id.type"      =>'point',
+	      "imagechoice.$id.formname"  =>$form,
+	      "imagechoice.$id.formx"     =>"$idx$element",
+	      "imagechoice.$id.formy"     =>"$idy$element",
+	      "imagechoice.$id.file"      =>$bgfile,
+	      "imagechoice.$id.formcoord" =>$element);
+    if ($height) {
+	$data{"imagechoice.$id.formheight"}=$height.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
     }
+    if ($width) {
+	$data{"imagechoice.$id.formwidth"}=$width.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
+    }
+    &Apache::lonnet::appenv(\%data);
+    my $text="Click Coordinates";
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }
 
-#----------------------------------------------------- browse
-sub browse {
-    # insert a link to call up the filesystem browser (lonindexer)
-    my ($id, $mode) = @_;
+# coordinates (x1,y1)-(x2,y2)...
+# mode can be either box, or polygon
+sub entercoord {
+    my ($idx,$mode,$width,$height,$type) = @_;
+    unless ($Apache::edit::bgimgsrc) { return ''; }
+    my $bgfile=&escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
-        $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$id");
+        $element = &escape("$idx\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
-        $element = &Apache::lonnet::escape('homework_edit_'.
+        $element = &escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
-    my $result = <<"ENDBUTTON";
-<a href=\"javascript:openbrowser('$form','$element')\"\>Browse</a>
-ENDBUTTON
+    my $id=$Apache::lonxml::curdepth;
+    my %data=("imagechoice.$id.type"      =>$type,
+	      "imagechoice.$id.formname"  =>$form,
+	      "imagechoice.$id.file"      =>$bgfile,
+	      "imagechoice.$id.formcoord" =>$element);
+    if ($height) {
+	$data{"imagechoice.$id.formheight"}=$height.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
+    }
+    if ($width) {
+	$data{"imagechoice.$id.formwidth"}=$width.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
+    }
+    &Apache::lonnet::appenv(\%data);
+    my $text="Enter Coordinates";
+    if ($type eq 'polygon') { $text='Create Polygon Data'; }
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }
 
+sub deletecoorddata {
+    &Apache::lonnet::delenv('imagechoice.');
+}
+
+#----------------------------------------------------- browse and search links
+sub browse_or_search {
+    my ($id,$mode,$titleid,$only,$crsonly,$usesearch) = @_;
+    my $output;
+    my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url();
+    if ($cnum) {
+        my $form = 'lonhomework';
+        my ($element,$bretitleelement,$srchtitleelement);
+        $element = &get_element($id,$mode); 
+        my %lt = &Apache::lonlocal::texthash (
+            uacf => 'Use a course file',
+            uanf => 'Use a new file',
+            impo => 'Import',
+            sear => 'Search',
+            sefi => 'Select File',
+            upfi => 'Upload File',
+            dire => 'Directory',
+            news => 'New sub-directory',
+        );
+        my ($importcrsres,$uploadfile,$allonly);
+        if ($only) {
+            $allonly = $only;
+            if ($crsonly) {
+                $allonly .= ','.$crsonly;
+            }
+        } elsif ($crsonly) {
+            $allonly = $crsonly;
+        }
+        my ($numdirs,$pickfile) =
+            &Apache::loncommon::import_crsauthor_form('coursepath_'.$element,'coursefile_'.$element,undef,$allonly,$element);
+        $importcrsres=(<<CRSRES);
+        <fieldset id="importcrsresform_$element" style="display:inline;">
+        <legend>$lt{'uacf'}</legend>
+        $pickfile
+        <input type="button" name="crsres" value="$lt{'sefi'}" onclick="updateCrsFile(this.form,'$element');" />
+        </fieldset>
+CRSRES
+        my %subdirs;
+        my $toppath="/priv/$cdom/$cnum";
+        my $exclude = &Apache::lonnet::priv_exclude();
+        &Apache::lonnet::recursedirs(1,1,'',$exclude,'',$toppath,'',\%subdirs);
+        my $numcrsdirs = keys(%subdirs);
+        my $pickdir = $lt{'dire'}.'<select name="crsauthorpath_'.$element.'">'."\n".
+                                   '<option value="/">/</option>'."\n";
+        if ($numcrsdirs) {
+            foreach my $key (sort { lc($a) cmp lc($b) } (keys(%subdirs))) {
+                $pickdir .= '<option value="'.$key.'">'.$key.'</option>'."\n";
+            }
+        }
+        $pickdir .= '</select><br />';
+        my $uploadfile =(<<CRSUPL);
+        <fieldset id="uploadcrsresform_$element" style="display:inline;">
+        <legend>$lt{'uanf'}</legend>
+        <p>
+        $pickdir
+        <span class="LC_nobreak">$lt{'news'}?&nbsp;
+        <label><input type="radio" name="newsubdir_$element" value="0" onclick="toggleNewsubdir(this.form,'$element');" checked="checked" />No</label>
+        &nbsp;
+        <label><input type="radio" name="newsubdir_$element" value="1" onclick="toggleNewsubdir(this.form,'$element');" />Yes</label>
+        </span><span id="newsubdir_$element"></span>
+        <input type="hidden" name="newsubdirname_$element" id="newsubdirname_$element" value="" autocomplete="off" />
+        </p>
+        <input type="file" id="uploadcrsres_$element" name="uploadcrsres_$element" size="40" />
+        <input type="hidden" id="crsuploadto_$element" name="filename_$element" value="$ENV{'REQUEST_URI'}" />
+        <input type="submit" id="crsupload_$element" class="LC_uploadcrsres" value="$lt{'upfi'}" />
+        <iframe id="crsupload_target_$element" name="crsupload_target_$element" src="" style="width:0px;height:0px;border:0px"></iframe>
+        </fieldset>
+CRSUPL
+        if ($titleid) {
+            $bretitleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+            $srchtitleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+        } else {
+            $bretitleelement=",'$only'";
+        }
+        $output = '<a href="javascript:toggleChooser(document.'.$form.",'$element'".');">'.
+                  &mt('Choose File').'</a>'.
+                  '<div id="chooser_'.$element.'" style="display:none" class="LC_left_float">'.
+                  '<fieldset><legend>'.&mt('Choose File').'</legend>'.
+                  '<label><input type="radio" name="chooser_'.$element.'" value="crsres" onclick="toggleCrsFile(this.form,'."'$element'".')" />'.$lt{'uacf'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="chooser_'.$element.'" value="upload" onclick="toggleCrsUpload(this.form,'."'$element'".')" />'.$lt{'uanf'}.'</label>&nbsp;'.
+                  '<label><input type="radio" name="chooser_'.$element.'" value="import" onclick="toggleResImport(this.form,'."'$element'".');openbrowser('."'$form','$element'$bretitleelement)".'" />'.$lt{'impo'}.'</label>';
+        if ($usesearch) {
+            $output .= '&nbsp;<label><input type="radio" name="chooser_'.$element.'" value="search" onclick="opensearcher('."'$form','$element'$srchtitleelement".')" />'.$lt{'sear'}.'</label>';
+        }
+        $output .= '<div id="chooser_'.$element.'_crsres" style="display:none">'.
+                   $importcrsres.
+                   '</div>'.
+                   '<div id="chooser_'.$element.'_upload" style="display:none">'.
+                   $uploadfile. 
+                   '</div>'.
+                   '</fieldset></div>';
+                    
+    } else {
+        $output = &browse($id, $mode, $titleid, $only);
+        if ($usesearch) {
+            $output .= ' '.&search($id, $mode, $titleid);
+        }
+    }
+    return $output;
+}
+
 #----------------------------------------------------- browse
+sub browse {
+    # insert a link to call up the filesystem browser (lonindexer)
+    my ($id, $mode, $titleid, $only) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                                           se => 'Select',
+                                         );
+    my $form    = 'lonhomework';
+    my $element = &get_element($id,$mode);
+    my $titleelement;
+    if ($titleid) {
+	$titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+    } else {
+        $titleelement=",'$only'";
+    }
+    return <<"ENDBUTTON";
+<a href=\"javascript:openbrowser('$form','$element'$titleelement)\"\>$lt{'se'}</a>
+ENDBUTTON
+}
+
+#----------------------------------------------------- search
 sub search {
     # insert a link to call up the filesystem browser (lonindexer)
-    $_ = shift;
+    my ($id, $mode, $titleid) = @_;
     my $form    = 'lonhomework';
-    my $element = &Apache::lonnet::escape("$Apache::lonxml::curdepth.$_");
+    my $element = &get_element($id,$mode);
+    my $titleelement;
+    if ($titleid) {
+	$titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'";
+    }
+    my $linktext = &mt('Search');
     my $result = <<"ENDBUTTON";
-<a href=\"javascript:opensearcher('$form','$element')\"\>Search</a>
+<a href=\"javascript:opensearcher('$form','$element'$titleelement)\"\>$linktext</a>
 ENDBUTTON
     return $result;
 }
 
+sub get_element {
+    my ($id,$mode) = @_;
+    my $element;
+    if (! defined($mode) || $mode eq 'attribute') {
+        $element = &escape("$id\_$Apache::lonxml::curdepth");
+    } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
+        $element = &escape('homework_edit_'.
+                                           $Apache::lonxml::curdepth);
+    }
+    return $element;
+}
 
 1;
 __END__
 
-=head1 NAME
-
-Apache::edit - edit mode helpers
-
-=head1 SYNOPSIS
-
-Invoked by many homework and xml related modules.
-
- &Apache::edit::SUBROUTINENAME(ARGUMENTS);
-
-=head1 INTRODUCTION
-
-This module outputs HTML syntax helpful for the rendering of edit
-mode interfaces.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
 
-=head1 HANDLER SUBROUTINE
-
-There is no handler subroutine.
-
-=head1 OTHER SUBROUTINES
-
-=over 4
-
-=item *
-
-initialize_edit() : initialize edit (set colordepth to zero)
-
-=item *
-
-tag_start($target,$token,$description) : provide deletion and insertion lists
-for the manipulation of a start tag; return a scalar string
-
-=item *
-
-tag_end($target,$token,$description) : ending syntax corresponding to
-&tag_start. return a scalar string.
-
-=item *
-
-start_table($token) : start table; update colordepth; return scalar string.
-
-=item *
-
-end_table() : reduce color depth; end table; return scalar string
-
-=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
-
-=item *
-
-deletelist($target,$token) : provide a yes option in an HTML select element;
-return scalar string
-
-=item *
-
-handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,
-$style) : respond to a user delete request by passing relevant stack
-and array information to various rendering functions; return a scalar string
-
-=item *
-
-get_insert_list($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-insertlist($target,$token) : api that uses get_insert_list;
-return a scalar string
-
-=item *
-
-handleinsert($token) : provide an insertion list based on possibilities
-from lonxml; return a scalar string
-
-=item *
-
-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.
-
-=item *
-search($elementname) : provide a link which will open up the filesystem
-searcher (lonsearchcat) and, once a file is selected, place the result in
-the form element $elementname.
-
-=item *
-editline(tag,data,description,size): Provide a <input type="text" ../> for
-single-line text entry.  This is to be used for text enclosed by tags, not
-arguements/parameters associated with a tag.
-
-=back
-
-incomplete...
-
-=cut