--- loncom/homework/edit.pm 2003/09/19 19:37:53 1.66 +++ 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.66 2003/09/19 19:37:53 matthew 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 @@ -273,16 +272,28 @@ sub handle_insertafter { return $result; } +sub insert_img { + return ' + '; +} + sub insert_responseparam { return ' '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + + '; } @@ -292,6 +303,7 @@ sub insert_numericalresponse { + '; } @@ -301,6 +313,7 @@ sub insert_stringresponse { + '; } @@ -318,6 +331,7 @@ sub insert_imageresponse { + '; } @@ -328,26 +342,55 @@ sub insert_optionresponse { + '; } +sub insert_organicresponse { + return ' + + + + + +'; +} + +sub insert_organicstructure { + return ' + +'; +} + sub insert_radiobuttonresponse { return ' + '; } +sub insert_reactionresponse { + return ' + + + + + +'; +} + sub insert_rankresponse { return ' + '; } @@ -360,6 +403,7 @@ sub insert_matchresponse { + '; } @@ -374,6 +418,13 @@ sub insert_hintpart { '; } +sub insert_hintgroup { + return ' + + +'; +} + sub insert_numericalhint { return ' @@ -405,11 +456,11 @@ sub insert_optionhint { } sub insert_startouttext { - return "\n"; + return ""; } sub insert_script { - return "\n"; + return "\n"; } sub textarea_sizes { @@ -428,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="
".$description."
"; } my $result = <<"END"; $description @@ -439,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="
".$description."
"; } + if ($usehtmlarea) { + push @Apache::lonxml::htmlareafields,'homework_edit_'. + $Apache::lonxml::curdepth; + } return $description."\n".'   '."\n"; + &HTML::Entities::encode($data,'<>&"').''. + ($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}"); @@ -461,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; } @@ -482,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; @@ -529,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') { @@ -558,7 +627,7 @@ sub text_arg { my $result; if (!defined $size) { $size=20; } my $arg=$token->[2]{$name}; - $result=$description.' '; return ''.$result.''; } @@ -616,7 +685,7 @@ sub select_or_text_arg { } $optionlist.="\n"; + ">".&mt('Type-in value')."\n"; # my $element=&html_element_name($name); my $selectelement='select_list_'.$element; @@ -629,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 (< $description   '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; } -# 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 ... $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"; -Click Coordinate Pair -ENDBUTTON + &Apache::lonnet::appenv(%data); + my $text="Enter Coordinates"; + if ($type eq 'polygon') { $text='Create Polygon Data'; } + my $result=''.$text.''; return $result; } + +sub deletecoorddata { + &Apache::lonnet::delenv("imagechoice\\."); +} + #----------------------------------------------------- browse sub browse { # insert a link to call up the filesystem browser (lonindexer) - my ($id, $mode) = @_; + my ($id, $mode, $titleid) = @_; my $form = 'lonhomework'; my $element; if (! defined($mode) || $mode eq 'attribute') { $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... $element = &Apache::lonnet::escape('homework_edit_'. - $Apache::lonxml::curdepth); + $Apache::lonxml::curdepth); + } + my $titleelement; + if ($titleid) { + $titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; } my $result = <<"ENDBUTTON"; -Select +Select ENDBUTTON return $result; } @@ -725,7 +816,7 @@ ENDBUTTON #----------------------------------------------------- browse sub search { # insert a link to call up the filesystem browser (lonindexer) - my ($id, $mode) = @_; + my ($id, $mode, $titleid) = @_; my $form = 'lonhomework'; my $element; if (! defined($mode) || $mode eq 'attribute') { @@ -734,8 +825,12 @@ sub search { $element = &Apache::lonnet::escape('homework_edit_'. $Apache::lonxml::curdepth); } + my $titleelement; + if ($titleid) { + $titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } my $result = <<"ENDBUTTON"; -Search +Search ENDBUTTON return $result; }