--- loncom/homework/edit.pm	2003/10/24 21:45:32	1.69
+++ 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.69 2003/10/24 21:45:32 albertel Exp $
+# $Id: edit.pm,v 1.87 2004/09/30 21:47:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,14 +25,13 @@
 #
 # http://www.lon-capa.org/
 #
-# 3/20 Guy
-# 01/10/02 Matthew
-# 03/06/02 Matthew
+
 package Apache::edit; 
 
 use strict;
 use Apache::lonnet();
 use HTML::Entities();
+use Apache::lonlocal;
 
 # Global Vars
 # default list of colors to use in editing
@@ -283,13 +282,18 @@ 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 />
+    <startouttext /><endouttext />
     </hintgroup>
 </formularesponse>';
 }
@@ -299,8 +303,7 @@ sub insert_numericalresponse {
 <numericalresponse answer="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </numericalresponse>';
 }
@@ -310,8 +313,7 @@ sub insert_stringresponse {
 <stringresponse answer="" type="">
     <textline />
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </stringresponse>';
 }
@@ -329,8 +331,7 @@ sub insert_imageresponse {
     <foilgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </imageresponse>';
 }
@@ -341,32 +342,55 @@ sub insert_optionresponse {
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </optionresponse>';
 }
 
+sub insert_organicresponse {
+    return '
+<organicresponse>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</organicresponse>';
+}
+
+sub insert_organicstructure {
+    return '
+<organicstructure />
+';
+}
+
 sub insert_radiobuttonresponse {
     return '
 <radiobuttonresponse max="10">
     <foilgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </radiobuttonresponse>';
 }
 
+sub insert_reactionresponse {
+    return '
+<reactionresponse>
+    <textline />
+    <hintgroup>
+    <startouttext /><endouttext />
+    </hintgroup>
+</reactionresponse>';
+}
+
 sub insert_rankresponse {
     return '
 <rankresponse max="10">
     <foilgroup options="">
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </rankresponse>';
 }
@@ -379,8 +403,7 @@ sub insert_matchresponse {
       </itemgroup>
     </foilgroup>
     <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
     </hintgroup>
 </matchresponse>';
 }
@@ -398,8 +421,7 @@ sub insert_hintpart {
 sub insert_hintgroup {
   return '
 <hintgroup>
-    <startouttext/>
-    <endouttext />
+    <startouttext /><endouttext />
 </hintgroup>';
 }
 
@@ -434,11 +456,11 @@ sub insert_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 textarea_sizes {
@@ -457,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
@@ -468,21 +490,33 @@ 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 {
-    my ($token) = @_;
+    my ($endtag,$parser) = @_;
     my $result;
 #  foreach my $envkey (sort keys %ENV) {
 #    &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}");
@@ -490,6 +524,9 @@ 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"};
+    my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser);
+    # textareas throw away intial \n 
+    if ($bodytext=~/^\n/) { $result="\n".$result; }
     return $result;
 }
 
@@ -511,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;
@@ -558,7 +598,7 @@ sub checked_arg {
     my $result;
     my $optionlist="";
     my $allselected=$token->[2]{$name};
-    $result=$description;
+    $result=&mt($description);
     foreach my $option (@$list) {
 	my ($value,$text);
 	if ( ref($option) eq 'ARRAY') {
@@ -587,7 +627,7 @@ sub text_arg {
     my $result;
     if (!defined $size) { $size=20; }
     my $arg=$token->[2]{$name};
-    $result=$description.'&nbsp;<input name="'.&html_element_name($name).
+    $result=&mt($description).'&nbsp;<input name="'.&html_element_name($name).
 	'" type="text" value="'.$arg.'" size="'.$size.'" />';
     return '<nobr>'.$result.'</nobr>';
 }
@@ -645,7 +685,7 @@ sub select_or_text_arg {
     }
     $optionlist.="<option value=\"TYPEDINVALUE\"".
  	((!$found)?' selected="on"':'').
- 	">Type in value</option>\n";
+ 	">".&mt('Type-in value')."</option>\n";
 #
     my $element=&html_element_name($name);
     my $selectelement='select_list_'.$element;
@@ -658,12 +698,13 @@ sub select_or_text_arg {
 	     '.options['.$selectedindex.'].value';
     my $typedinvalue='this.form.'.$typeinelement.'.value';
     my $selecttypeinindex='this.form.'.$selectelement.'.options.length';
+    $description=&mt($description);
 #
     return (<<ENDSELECTORTYPE);
 <nobr>
 $description
 &nbsp;<select name="$selectelement"
-onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }"
+onChange="if ($selectedvalue!='TYPEDINVALUE') { $hiddenvalue=$selectedvalue; $typedinvalue=''; }" >
 $optionlist
 </select>
 <input type="text" size="$size" name="$typeinelement"
@@ -678,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') {
@@ -691,48 +732,65 @@ 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;
 }
 
-# coordinate pair (x1,y1)-(x2,y2)
-sub entercoordpair {
-    my ($id,$mode,$width,$height) = @_;
+# 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=&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') {
-        $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth");
+        $element = &Apache::lonnet::escape("$idx\_$Apache::lonxml::curdepth");
     } elsif ($mode eq 'textnode') {  # for data between <tag> ... </tag>
         $element = &Apache::lonnet::escape('homework_edit_'.
                                            $Apache::lonxml::curdepth);
     }
-    my $formheight='';
+    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) {
-	$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?mode=pair&formname=$form&file=$bgfile$formheight$formwidth&formcoord=$element"
-target="imagechoice">Click Coordinate Pair</a>
-ENDBUTTON
+    &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
 sub browse {
     # insert a link to call up the filesystem browser (lonindexer)