--- loncom/homework/edit.pm 2003/12/18 19:59:24 1.74 +++ loncom/homework/edit.pm 2006/04/18 22:36:23 1.101 @@ -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.101 2006/04/18 22:36:23 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; @@ -95,10 +92,12 @@ sub start_table { foreach my $namespace (reverse @Apache::lonxml::namespace) { my $testtag=$namespace.'::'.$tag; $tagnum=$Apache::lonxml::insertlist{"$testtag.num"}; + &Apache::lonxml::debug(" $testtag "); if (defined($tagnum)) { last; } } if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};} my $color = $Apache::lonxml::insertlist{"$tagnum.color"}; + &Apache::lonxml::debug(" $tagnum -- $color"); if (!defined($color)) { $color = $Apache::edit::colorlist[$Apache::edit::colordepth]; } @@ -112,7 +111,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 +121,7 @@ sub end_table { $closingtag=$Apache::edit::inserttag[-1]; } $result.=&innerinsertlist('edit',$tagname,$closingtag). - "
"; + "
"; pop(@Apache::edit::inserttag); return $result; } @@ -150,7 +149,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) { @@ -164,7 +163,7 @@ sub handle_delete { } if (!$result) { my $endtag='/'.$token->[1]; - my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser); + my $bodytext=&Apache::lonxml::get_all_text($endtag,$parser,$style); $$parser['-1']->get_token(); &Apache::lonxml::debug("Deleting :$bodytext: for $token->[1]"); &Apache::lonxml::end_tag($tagstack,$parstack,$token); @@ -193,7 +192,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 +224,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 +241,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 +249,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 +283,18 @@ sub insert_responseparam { '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + - - + '; } @@ -298,21 +302,40 @@ sub insert_formularesponse { sub insert_numericalresponse { return ' + + - - + '; } +sub insert_customresponse { + return ' + + + + + + + +'; +} + +sub insert_customresponse_answer { + return ' + + +'; +} + sub insert_stringresponse { return ' - - + '; } @@ -328,10 +351,11 @@ sub insert_imageresponse { return ' + + - - + '; } @@ -340,10 +364,12 @@ sub insert_optionresponse { return ' + + + - - + '; } @@ -353,8 +379,7 @@ sub insert_organicresponse { - - + '; } @@ -369,10 +394,12 @@ sub insert_radiobuttonresponse { return ' + + + - - + '; } @@ -382,8 +409,7 @@ sub insert_reactionresponse { - - + '; } @@ -392,10 +418,12 @@ sub insert_rankresponse { return ' + + + - - + '; } @@ -406,10 +434,12 @@ sub insert_matchresponse { + + + - - + '; } @@ -419,16 +449,14 @@ sub insert_displaytitle { return ' - - + '; } sub insert_hintgroup { return ' - - + '; } @@ -463,11 +491,49 @@ sub insert_optionhint { } sub insert_startouttext { - return "\n"; + return ""; } sub insert_script { - return "\n"; + return "\n"; +} + +sub js_change_detection { + my $unsaved=&mt("There are unsaved changes"); + return (< +var clean = true; +var is_submit = false; +var still_ask = false; +function compareForm(event_) { + if (!event_ && window.event) { + event_ = window.event; + } + if ((!is_submit || (is_submit && still_ask)) && !clean) { + still_ask = false; + is_submit = false; + event_.returnValue = "$unsaved"; + return "$unsaved"; + } +} +function unClean() { + clean=false; +} +window.onbeforeunload = compareForm; + +SCRIPT +} + +sub form_change_detection { + return ' onsubmit="is_submit=true;" '; +} + +sub element_change_detection { + return ' onchange="unClean();" '; +} + +sub submit_ask_anyway { + return ' onclick="still_ask=true;" '; } sub textarea_sizes { @@ -486,39 +552,52 @@ 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 $change_code = &element_change_detection(); my $result = <<"END"; $description + value="$data" size="$size" $change_code /> END return $result; } 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"; + $Apache::lonxml::curdepth.'" id="homework_edit_'. + $Apache::lonxml::curdepth.'" '.&element_change_detection().'>'. + &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 +613,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 +622,9 @@ sub get_new_args { $token->[2]->{$arg}=$newvalue; } $rebuild=1; + } elsif (!defined($newvalue) && defined($value)) { + delete($token->[2]->{$arg}); + $rebuild=1; } } return $rebuild; @@ -601,15 +683,15 @@ sub checked_arg { $text=$option; $value='value="'.$option.'"'; } - $result.="$text\n"; } return $result; } @@ -620,7 +702,8 @@ sub text_arg { if (!defined $size) { $size=20; } my $arg=$token->[2]{$name}; $result=&mt($description).' '; + '" type="text" value="'.$arg.'" size="'.$size.'" '. + &element_change_detection().'/>'; return ''.$result.''; } @@ -632,21 +715,21 @@ 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"; } } $result.=''.$description.' '; return $result; @@ -661,24 +744,25 @@ 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 $change_code=&element_change_detection(); my $element=&html_element_name($name); my $selectelement='select_list_'.$element; my $typeinelement='type_in_'.$element; @@ -703,7 +787,7 @@ $optionlist value="$typeinvalue" onChange="$hiddenvalue=$typedinvalue;" onFocus="$selectedindex=$selecttypeinindex-1;" /> - + ENDSELECTORTYPE } @@ -711,11 +795,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 +808,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)