--- loncom/homework/edit.pm 2003/12/18 19:59:24 1.74 +++ loncom/homework/edit.pm 2005/08/30 15:36:07 1.94 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.74 2003/12/18 19:59:24 albertel Exp $ +# $Id: edit.pm,v 1.94 2005/08/30 15:36:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,13 +25,11 @@ # # 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 Apache::lonnet; use HTML::Entities(); use Apache::lonlocal; @@ -70,10 +68,9 @@ sub tag_start { # "\n"; my @help = Apache::lonxml::helpinfo($token); if ($help[0]) { - $result .= '' . - Apache::loncommon::help_open_topic(@help) . - ''; - } else { $result .= " "; } + $result .= '' . + Apache::loncommon::help_open_topic(@help); + } else { $result .= " "; } $result .= &end_row().&start_spanning_row(); } return $result; @@ -112,7 +109,7 @@ sub start_table { sub end_table { $Apache::edit::colordepth--; my $result=''; - $result.="
"; + $result.='
'; my ($tagname,$closingtag); if (defined($Apache::edit::inserttag[-2])) { @@ -122,7 +119,7 @@ sub end_table { $closingtag=$Apache::edit::inserttag[-1]; } $result.=&innerinsertlist('edit',$tagname,$closingtag). - "
"; + "
"; pop(@Apache::edit::inserttag); return $result; } @@ -150,7 +147,7 @@ sub deletelist { } sub handle_delete { - if (!$ENV{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } + if (!$env{"form.delete_$Apache::lonxml::curdepth"}) { return ''; } my ($space,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=0; if ($space) { @@ -193,7 +190,7 @@ sub get_insert_list { $descrip."\n"; } foreach my $option (sort(keys(%options))) {$result.=$options{$option};} - if ($result) { $result=''.$result; } + if ($result) { $result=''.$result; } } return $result; } @@ -225,9 +222,9 @@ sub innerinsertlist { } sub handle_insert { - if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } + if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } my $result; - my $tagnum = $ENV{"form.insert_$Apache::lonxml::curdepth"}; + my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"}; my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; if ($func eq 'default') { my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; @@ -242,7 +239,7 @@ sub handle_insert { } } else { my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined."); + &Apache::lonxml::error("Unable to insert tag ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined."); } } return $result; @@ -250,10 +247,10 @@ sub handle_insert { sub handle_insertafter { my $tagname=shift; - if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') + if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') { return ''; } my $result; - my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; + my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; if ($func eq 'default') { my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; @@ -284,13 +281,18 @@ sub insert_responseparam { '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + - - + '; } @@ -298,10 +300,11 @@ sub insert_formularesponse { sub insert_numericalresponse { return ' + + - - + '; } @@ -311,8 +314,7 @@ sub insert_stringresponse { - - + '; } @@ -328,10 +330,11 @@ sub insert_imageresponse { return ' + + - - + '; } @@ -340,10 +343,12 @@ sub insert_optionresponse { return ' + + + - - + '; } @@ -353,8 +358,7 @@ sub insert_organicresponse { - - + '; } @@ -369,10 +373,12 @@ sub insert_radiobuttonresponse { return ' + + + - - + '; } @@ -382,8 +388,7 @@ sub insert_reactionresponse { - - + '; } @@ -392,10 +397,12 @@ sub insert_rankresponse { return ' + + + - - + '; } @@ -406,10 +413,12 @@ sub insert_matchresponse { + + + - - + '; } @@ -419,16 +428,14 @@ sub insert_displaytitle { return ' - - + '; } sub insert_hintgroup { return ' - - + '; } @@ -463,11 +470,11 @@ sub insert_optionhint { } sub insert_startouttext { - return "\n"; + return ""; } sub insert_script { - return "\n"; + return "\n"; } sub textarea_sizes { @@ -486,7 +493,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 @@ -497,28 +504,40 @@ 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."
"; } - return $description."\n".'   '."\n"; + &HTML::Entities::encode($data,'<>&"').''. + ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', + 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; } sub modifiedfield { my ($endtag,$parser) = @_; my $result; -# foreach my $envkey (sort keys %ENV) { -# &Apache::lonxml::debug("$envkey ---- $ENV{$envkey}"); +# foreach my $envkey (sort keys %env) { +# &Apache::lonxml::debug("$envkey ---- $env{$envkey}"); # } # &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"}; +# &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; } @@ -534,7 +553,7 @@ sub get_new_args { #just want the string that it was set to my $value=$token->[2]->{$arg}; my $element=&html_element_name($arg); - my $newvalue=$ENV{"form.$element"}; + my $newvalue=$env{"form.$element"}; &Apache::lonxml::debug("for:$arg: cur is :$value: new is :$newvalue:"); if (defined($newvalue) && $value ne $newvalue) { if (ref($newvalue) eq 'ARRAY') { @@ -543,6 +562,9 @@ sub get_new_args { $token->[2]->{$arg}=$newvalue; } $rebuild=1; + } elsif (!defined($newvalue) && defined($value)) { + delete($token->[2]->{$arg}); + $rebuild=1; } } return $rebuild; @@ -605,7 +627,7 @@ sub checked_arg { &html_element_name($name)."'"; foreach my $selected (split(/,/,$allselected)) { if ( $selected eq $option ) { - $result.=" checked='on' "; + $result.=" checked='checked' "; last; } } @@ -632,15 +654,15 @@ sub select_arg { foreach my $option (@$list) { my ($text,$value); if ( ref($option) eq 'ARRAY') { - $value='value="'.$$option[0].'"'; + $value='value="'.&HTML::Entities::encode($$option[0]).'"'; $text=$$option[1]; $option=$$option[0]; } else { $text=$option; - $value='value="'.$option.'"'; + $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; } else { $optionlist.="\n"; } @@ -661,22 +683,22 @@ sub select_or_text_arg { foreach my $option (@$list) { my ($text,$value); if ( ref($option) eq 'ARRAY') { - $value='value="'.$$option[0].'"'; + $value='value="'.&HTML::Entities::encode($$option[0]).'"'; $text=$$option[1]; $option=$$option[0]; } else { $text=$option; - $value='value="'.$option.'"'; + $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; $found=1; } else { $optionlist.="\n"; } } $optionlist.="\n"; # my $element=&html_element_name($name); @@ -711,11 +733,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') { @@ -724,48 +746,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"; -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)