--- loncom/homework/edit.pm 2003/10/24 21:09:24 1.68 +++ loncom/homework/edit.pm 2004/02/17 22:02:43 1.80 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.68 2003/10/24 21:09:24 albertel Exp $ +# $Id: edit.pm,v 1.80 2004/02/17 22:02:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ 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,6 +274,11 @@ sub handle_insertafter { return $result; } +sub insert_img { + return ' + '; +} + sub insert_responseparam { return ' '; @@ -283,8 +289,7 @@ sub insert_formularesponse { - - + '; } @@ -294,8 +299,7 @@ sub insert_numericalresponse { - - + '; } @@ -305,8 +309,7 @@ sub insert_stringresponse { - - + '; } @@ -324,8 +327,7 @@ sub insert_imageresponse { - - + '; } @@ -336,32 +338,55 @@ sub insert_optionresponse { - - + '; } +sub insert_organicresponse { + return ' + + + + + +'; +} + +sub insert_organicstructure { + return ' + +'; +} + sub insert_radiobuttonresponse { return ' - - + '; } +sub insert_reactionresponse { + return ' + + + + + +'; +} + sub insert_rankresponse { return ' - - + '; } @@ -374,8 +399,7 @@ sub insert_matchresponse { - - + '; } @@ -393,8 +417,7 @@ sub insert_hintpart { sub insert_hintgroup { return ' - - + '; } @@ -429,11 +452,11 @@ sub insert_optionhint { } sub insert_startouttext { - return "\n"; + return ""; } sub insert_script { - return "\n"; + return "\n"; } sub textarea_sizes { @@ -477,7 +500,7 @@ sub editfield { } sub modifiedfield { - my ($token) = @_; + my ($endtag,$parser) = @_; my $result; # foreach my $envkey (sort keys %ENV) { # &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}"); @@ -485,6 +508,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; } @@ -506,6 +532,9 @@ sub get_new_args { $token->[2]->{$arg}=$newvalue; } $rebuild=1; + } elsif (!defined($newvalue) && defined($value)) { + delete($token->[2]->{$arg}); + $rebuild=1; } } return $rebuild; @@ -553,7 +582,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') { @@ -582,7 +611,7 @@ sub text_arg { my $result; if (!defined $size) { $size=20; } my $arg=$token->[2]{$name}; - $result=$description.' '; return ''.$result.''; } @@ -640,7 +669,7 @@ sub select_or_text_arg { } $optionlist.="\n"; + ">".&mt('Type-in value')."\n"; # my $element=&html_element_name($name); my $selectelement='select_list_'.$element; @@ -653,12 +682,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)