--- loncom/homework/edit.pm	2004/01/15 03:24:52	1.78
+++ loncom/homework/edit.pm	2004/09/30 21:47:21	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # edit mode helpers
 #
-# $Id: edit.pm,v 1.78 2004/01/15 03:24:52 www Exp $
+# $Id: edit.pm,v 1.87 2004/09/30 21:47:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,9 +25,7 @@
 #
 # http://www.lon-capa.org/
 #
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
 package Apache::edit; 
 
 use strict;
@@ -284,10 +282,16 @@ sub insert_responseparam {
     <responseparam />';
 }
 
+sub insert_parameter {
+    return '
+    <parameter />';
+}
+
 sub insert_formularesponse {
     return '
 <formularesponse answer="" samples="">
-    <textline />
+    <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol" />
+    <textline size="25"/>
     <hintgroup>
     <startouttext /><endouttext />
     </hintgroup>
@@ -475,7 +479,7 @@ sub textarea_sizes {
 
 sub editline {
     my ($tag,$data,$description,$size)=@_;
-    $data=&HTML::Entities::encode($data);
+    $data=&HTML::Entities::encode($data,'<>&"');
     if ($description) { $description="<br />".$description."<br />"; }
     my $result = <<"END";
 $description
@@ -486,17 +490,29 @@ END
 }
 
 sub editfield {
-    my ($tag,$data,$description,$minwidth,$minheight)=@_;
+    my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_;
 
     my ($rows,$cols)=&textarea_sizes(\$data);
+    if (&Apache::lonhtmlcommon::htmlareabrowser() &&
+	!&Apache::lonhtmlcommon::htmlareablocked()) {
+	$rows+=7;      # make room for HTMLarea
+	$minheight+=7; # make room for HTMLarea
+    }
     if ($cols > 80) { $cols = 80; }
     if ($cols < $minwidth ) { $cols = $minwidth; }
     if ($rows < $minheight) { $rows = $minheight; }
     if ($description) { $description="<br />".$description."<br />"; }
+    if ($usehtmlarea) {
+	push @Apache::lonxml::htmlareafields,'homework_edit_'.
+	    $Apache::lonxml::curdepth;
+    }
     return $description."\n".'&nbsp;&nbsp;&nbsp;<textarea rows="'.$rows.
 	'" cols="'.$cols.'" name="homework_edit_'.
+	$Apache::lonxml::curdepth.'" id="homework_edit_'.
 	$Apache::lonxml::curdepth.'">'.
-	&HTML::Entities::encode($data).'</textarea>'."\n";
+	&HTML::Entities::encode($data,'<>&"').'</textarea>'.
+	($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework',
+			 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";
 }
 
 sub modifiedfield {
@@ -532,6 +548,9 @@ sub get_new_args {
 		$token->[2]->{$arg}=$newvalue;
 	    }
 	    $rebuild=1;
+	} elsif (!defined($newvalue) && defined($value)) {
+	    delete($token->[2]->{$arg});
+	    $rebuild=1;
 	}
     }
     return $rebuild;
@@ -700,11 +719,11 @@ ENDSELECTORTYPE
 #----------------------------------------------------- image coordinates
 # single image coordinates, x, y 
 sub entercoords {
-    my ($idx,,$idy,$mode,$width,$height) = @_;
+    my ($idx,$idy,$mode,$width,$height) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
     if ($idx) { $idx.='_'; }
     if ($idy) { $idy.='_'; }
-    my $bgfile=&Apache::lonnet::escape($Apache::edit::bgimgsrc);
+    my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {
@@ -713,18 +732,24 @@ sub entercoords {
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
-    my $formheight='';
+    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) {
-	$formheight='&formheight='.$height.'_'.$Apache::edit::bgimgsrccurdepth;
+	$data{"imagechoice.$id.formheight"}=$height.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
     }
-    my $formwidth='';
     if ($width) {
-	$formwidth='&formwidth='.$width.'_'.$Apache::edit::bgimgsrccurdepth;
+	$data{"imagechoice.$id.formwidth"}=$width.'_'.
+	    $Apache::edit::bgimgsrccurdepth;
     }
-    my $result = <<"ENDBUTTON";
-<a href="/cgi-bin/imagechoice.pl?formname=$form&file=$bgfile&formx=$idx$element&formy=$idy$element$formheight$formwidth"
-target="imagechoice">Click Coordinates</a>
-ENDBUTTON
+    &Apache::lonnet::appenv(%data);
+    my $text="Click Coordinates";
+    my $result='<a href="/adm/imagechoice?token='.$id.'" target="imagechoice">'.$text.'</a>';
     return $result;
 }
 
@@ -734,7 +759,6 @@ sub entercoord {
     my ($idx,$mode,$width,$height,$type) = @_;
     unless ($Apache::edit::bgimgsrc) { return ''; }
     my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc));
-    &Apache::lonnet::logthis($Apache::edit::bgfile);
     my $form    = 'lonhomework';
     my $element;
     if (! defined($mode) || $mode eq 'attribute') {