--- loncom/homework/edit.pm 2004/02/13 21:12:54 1.79 +++ loncom/homework/edit.pm 2004/06/03 16:42:02 1.82 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.79 2004/02/13 21:12:54 albertel Exp $ +# $Id: edit.pm,v 1.82 2004/06/03 16:42:02 www 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; @@ -475,7 +473,7 @@ sub textarea_sizes { sub editline { my ($tag,$data,$description,$size)=@_; - $data=&HTML::Entities::encode($data); + $data=&HTML::Entities::encode($data,'<>&"'); if ($description) { $description="
".$description."
"; } my $result = <<"END"; $description @@ -486,17 +484,23 @@ END } sub editfield { - my ($tag,$data,$description,$minwidth,$minheight)=@_; + my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_; my ($rows,$cols)=&textarea_sizes(\$data); + $rows+=3; # make room for HTMLarea if ($cols > 80) { $cols = 80; } if ($cols < $minwidth ) { $cols = $minwidth; } if ($rows < $minheight) { $rows = $minheight; } if ($description) { $description="
".$description."
"; } + if ($usehtmlarea) { + push @Apache::lonxml::htmlareafields,'homework_edit_'. + $Apache::lonxml::curdepth; + } return $description."\n".'   '."\n"; + &HTML::Entities::encode($data,'<>&"').''."\n"; } sub modifiedfield { @@ -703,11 +707,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') { @@ -716,18 +720,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"; -Click Coordinates -ENDBUTTON + &Apache::lonnet::appenv(%data); + my $text="Click Coordinates"; + my $result=''.$text.''; return $result; } @@ -737,7 +747,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') {