--- loncom/homework/edit.pm 2005/03/17 13:56:32 1.91 +++ loncom/homework/edit.pm 2005/12/22 22:06:54 1.99 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.91 2005/03/17 13:56:32 albertel Exp $ +# $Id: edit.pm,v 1.99 2005/12/22 22:06:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,7 +29,7 @@ package Apache::edit; use strict; -use Apache::lonnet(); +use Apache::lonnet; use HTML::Entities(); use Apache::lonlocal; @@ -92,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]; } @@ -109,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])) { @@ -119,7 +121,7 @@ sub end_table { $closingtag=$Apache::edit::inserttag[-1]; } $result.=&innerinsertlist('edit',$tagname,$closingtag). - "
"; + "
"; pop(@Apache::edit::inserttag); return $result; } @@ -147,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) { @@ -161,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); @@ -222,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"}; @@ -247,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"}; @@ -309,6 +311,25 @@ sub insert_numericalresponse { '; } +sub insert_customresponse { + return ' + + + + + + + +'; +} + +sub insert_customresponse_answer { + return ' + + +'; +} + sub insert_stringresponse { return ' @@ -477,6 +498,44 @@ sub insert_script { 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 { my ($data)=@_; my $count=0; @@ -495,10 +554,11 @@ sub editline { my ($tag,$data,$description,$size)=@_; $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; } @@ -523,7 +583,7 @@ sub editfield { return $description."\n".'   '. ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; @@ -532,12 +592,12 @@ sub editfield { 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; } @@ -553,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') { @@ -631,7 +691,7 @@ sub checked_arg { last; } } - $result.=" />$text\n"; + $result.=&element_change_detection()." />$text\n"; } return $result; } @@ -642,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.''; } @@ -654,12 +715,12 @@ 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"; @@ -668,7 +729,7 @@ sub select_arg { } } $result.=''.$description.' '; return $result; @@ -683,12 +744,12 @@ 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"; @@ -701,6 +762,7 @@ sub select_or_text_arg { ((!$found)?' selected="selected"':''). ">".&mt('Type-in value')."\n"; # + my $change_code=&element_change_detection(); my $element=&html_element_name($name); my $selectelement='select_list_'.$element; my $typeinelement='type_in_'.$element; @@ -725,7 +787,7 @@ $optionlist value="$typeinvalue" onChange="$hiddenvalue=$typedinvalue;" onFocus="$selectedindex=$selecttypeinindex-1;" /> - + ENDSELECTORTYPE }