--- loncom/homework/edit.pm 2004/02/17 22:02:43 1.80 +++ loncom/homework/edit.pm 2007/10/03 00:24:48 1.112 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.80 2004/02/17 22:02:43 albertel Exp $ +# $Id: edit.pm,v 1.112 2007/10/03 00:24:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,15 +25,16 @@ # # 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; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # Global Vars # default list of colors to use in editing @@ -70,10 +71,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; @@ -90,15 +90,10 @@ sub tag_end { sub start_table { my ($token)=@_; - my $tag = $token->[1]; - my $tagnum; - foreach my $namespace (reverse @Apache::lonxml::namespace) { - my $testtag=$namespace.'::'.$tag; - $tagnum=$Apache::lonxml::insertlist{"$testtag.num"}; - if (defined($tagnum)) { last; } - } - if (!defined ($tagnum)) {$tagnum=$Apache::lonxml::insertlist{"$tag.num"};} - my $color = $Apache::lonxml::insertlist{"$tagnum.color"}; + my $tag = &Apache::lonxml::get_tag($token); + + my $color = $Apache::lonxml::insertlist{"$tag.color"}; + &Apache::lonxml::debug(" $tag -- $color"); if (!defined($color)) { $color = $Apache::edit::colorlist[$Apache::edit::colordepth]; } @@ -112,18 +107,24 @@ sub start_table { sub end_table { $Apache::edit::colordepth--; my $result=''; - $result.="
"; + $result.='
'; my ($tagname,$closingtag); if (defined($Apache::edit::inserttag[-2])) { $tagname=$Apache::edit::inserttag[-2]; - } else {$tagname='problem';} + } else { + if ($Apache::lonhomework::parsing_a_task) { + $tagname='Task'; + } else { + $tagname='problem'; + } + } if (defined($Apache::edit::inserttag[-1])) { $closingtag=$Apache::edit::inserttag[-1]; } $result.=&innerinsertlist('edit',$tagname,$closingtag). - "
"; - pop(@Apache::edit::inserttag); + "
"; + my $last = pop(@Apache::edit::inserttag); return $result; } @@ -150,7 +151,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 +165,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); @@ -175,25 +176,26 @@ sub handle_delete { sub get_insert_list { my ($tagname) = @_; my $result=''; - my @tagnums= (); + my @tags= (); #&Apache::lonxml::debug("keys ".join("\n",sort(keys(%Apache::lonxml::insertlist)))); if ($Apache::lonxml::insertlist{"$tagname.which"}) { - push (@tagnums, @{ $Apache::lonxml::insertlist{"$tagname.which"} }); + push (@tags, @{ $Apache::lonxml::insertlist{"$tagname.which"} }); } foreach my $namespace (@Apache::lonxml::namespace) { if ($Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"}) { - push (@tagnums, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} }); + push (@tags, @{ $Apache::lonxml::insertlist{"$namespace".'::'."$tagname.which"} }); } } - if (@tagnums) { + if (@tags) { my %options; - foreach my $tagnum (@tagnums) { - my $descrip=$Apache::lonxml::insertlist{"$tagnum.description"}; + foreach my $tag (@tags) { + my $descrip=$Apache::lonxml::insertlist{"$tag.description"}; + my $tagnum =$Apache::lonxml::insertlist{"$tag.num"}; $options{$descrip} ="\n"; } foreach my $option (sort(keys(%options))) {$result.=$options{$option};} - if ($result) { $result=''.$result; } + if ($result) { $result=''.$result; } } return $result; } @@ -225,41 +227,33 @@ sub innerinsertlist { } sub handle_insert { - if ($ENV{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } - my $result; - 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"}; - my $namespace; - if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } - $result.="\n<$newtag>\n"; - } else { - if (defined(&$func)) { - { - no strict 'refs'; - $result.=&$func(); - } - } else { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined."); - } - } - return $result; + if ($env{"form.insert_$Apache::lonxml::curdepth"} eq '') { return ''; } + my $tagnum = $env{"form.insert_$Apache::lonxml::curdepth"}; + return &do_insert($tagnum); } sub handle_insertafter { my $tagname=shift; - if ($ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') - { return ''; } + if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') { + return ''; + } + my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; + return &do_insert($tagnum,1); +} + +sub do_insert { + my ($tagnum,$after) = @_; my $result; - my $tagnum =$ENV{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; - my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; + + my $newtag = $Apache::lonxml::insertlist{"$tagnum.tag"}; + my $func = $Apache::lonxml::insertlist{"$newtag.function"}; if ($func eq 'default') { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; my $namespace; if ($newtag =~ /::/) { ($namespace,$newtag) = split(/::/,$newtag); } - $result.="\n<$newtag>\n"; + my $depth = scalar(@Apache::lonxml::depthcounter); + $depth -- if ($after); + my $inset = "\t"x$depth; + $result.="\n$inset<$newtag>\n$inset"; } else { if (defined(&$func)) { { @@ -267,8 +261,7 @@ sub handle_insertafter { $result.=&$func(); } } else { - my $newtag=$Apache::lonxml::insertlist{"$tagnum.tag"}; - &Apache::lonxml::error("Unable to insert (after) tag $newtag, $func was not defined. ($tagname $tagnum)"); + &Apache::lonxml::error("Unable to insert tag $newtag, $func was not defined. ($tagnum)"); } } return $result; @@ -284,10 +277,16 @@ sub insert_responseparam { '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + @@ -297,6 +296,8 @@ sub insert_formularesponse { sub insert_numericalresponse { return ' + + @@ -304,6 +305,75 @@ sub insert_numericalresponse { '; } +sub insert_customresponse { + return ' + + + + + + + +'; +} + +sub insert_customresponse_answer { + return ' + + +'; +} + +sub insert_customhint { + return ' + + + + '; +} + +sub insert_customhint_answer { + return ' + + +'; +} + +sub insert_mathresponse { + return ' + + + + + + + + +'; +} + +sub insert_mathresponse_answer { + return ' + + +'; +} + +sub insert_mathhint { + return ' + + + + '; +} + +sub insert_mathhint_answer { + return ' + + +'; +} + sub insert_stringresponse { return ' @@ -325,6 +395,8 @@ sub insert_imageresponse { return ' + + @@ -336,6 +408,9 @@ sub insert_optionresponse { return ' + + + @@ -363,6 +438,9 @@ sub insert_radiobuttonresponse { return ' + + + @@ -384,6 +462,9 @@ sub insert_rankresponse { return ' + + + @@ -397,6 +478,9 @@ sub insert_matchresponse { + + + @@ -409,8 +493,7 @@ sub insert_displaytitle { return ' - - + '; } @@ -459,6 +542,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; @@ -475,42 +596,61 @@ sub textarea_sizes { sub editline { my ($tag,$data,$description,$size)=@_; - $data=&HTML::Entities::encode($data); - if ($description) { $description="
".$description."
"; } + $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}"); -# } -# &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"}; + $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; } + if ($bodytext=~/^\n/) { + $result="\n".$result; + } + # if there is typesetting whitespace from between the data and the end tag + # restore to keep the source looking pretty + if ($bodytext =~ /(\n?[ \t]*)$/) { + $result .= $1; + } return $result; } @@ -523,7 +663,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') { @@ -532,6 +672,10 @@ sub get_new_args { $token->[2]->{$arg}=$newvalue; } $rebuild=1; + # add new attributes to the of the attribute seq + if (!grep { $arg eq $_ } (@{ $token->[3] })) { + push(@{ $token->[3] },$arg); + } } elsif (!defined($newvalue) && defined($value)) { delete($token->[2]->{$arg}); $rebuild=1; @@ -546,11 +690,13 @@ sub rebuild_tag { my $result; if ($token->[0] eq 'S') { $result = '<'.$token->[1]; - while (my ($key,$val)= each(%{$token->[2]})) { - $val=~s:^\s+|\s+$::g; - $val=~s:"::g; #" - &Apache::lonxml::debug("setting :$key: to :$val:"); - $result.=' '.$key.'="'.$val.'"'; + foreach my $attribute (@{ $token->[3] }) { + my $value = $token->[2]{$attribute}; + next if ($value eq ''); + $value =~s/^\s+|\s+$//g; + $value =~s/\"//g; + &Apache::lonxml::debug("setting :$attribute: to :$value:"); + $result.=' '.$attribute.'="'.$value.'"'; } if ($token->[4] =~ m:/>$:) { $result.=' />'; @@ -593,15 +739,15 @@ sub checked_arg { $text=$option; $value='value="'.$option.'"'; } - $result.="$text\n"; } return $result; } @@ -612,7 +758,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.''; } @@ -624,21 +771,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; @@ -653,24 +800,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; @@ -695,7 +843,7 @@ $optionlist value="$typeinvalue" onChange="$hiddenvalue=$typedinvalue;" onFocus="$selectedindex=$selecttypeinindex-1;" /> - + ENDSELECTORTYPE } @@ -707,13 +855,13 @@ sub entercoords { unless ($Apache::edit::bgimgsrc) { return ''; } if ($idx) { $idx.='_'; } if ($idy) { $idy.='_'; } - my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc)); + my $bgfile=&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("$Apache::lonxml::curdepth"); + $element = &escape("$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... - $element = &Apache::lonnet::escape('homework_edit_'. + $element = &escape('homework_edit_'. $Apache::lonxml::curdepth); } my $id=$Apache::lonxml::curdepth; @@ -742,13 +890,13 @@ sub entercoords { sub entercoord { my ($idx,$mode,$width,$height,$type) = @_; unless ($Apache::edit::bgimgsrc) { return ''; } - my $bgfile=&Apache::lonnet::escape(&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$Apache::edit::bgimgsrc)); + my $bgfile=&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("$idx\_$Apache::lonxml::curdepth"); + $element = &escape("$idx\_$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... - $element = &Apache::lonnet::escape('homework_edit_'. + $element = &escape('homework_edit_'. $Apache::lonxml::curdepth); } my $id=$Apache::lonxml::curdepth; @@ -778,18 +926,20 @@ sub deletecoorddata { #----------------------------------------------------- browse sub browse { # insert a link to call up the filesystem browser (lonindexer) - my ($id, $mode, $titleid) = @_; + my ($id, $mode, $titleid, $only) = @_; my $form = 'lonhomework'; my $element; if (! defined($mode) || $mode eq 'attribute') { - $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); + $element = &escape("$id\_$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... - $element = &Apache::lonnet::escape('homework_edit_'. + $element = &escape('homework_edit_'. $Apache::lonxml::curdepth); } my $titleelement; if ($titleid) { - $titleelement=",'','','".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; + $titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } else { + $titleelement=",'$only'"; } my $result = <<"ENDBUTTON"; Select @@ -804,14 +954,14 @@ sub search { my $form = 'lonhomework'; my $element; if (! defined($mode) || $mode eq 'attribute') { - $element = &Apache::lonnet::escape("$id\_$Apache::lonxml::curdepth"); + $element = &escape("$id\_$Apache::lonxml::curdepth"); } elsif ($mode eq 'textnode') { # for data between ... - $element = &Apache::lonnet::escape('homework_edit_'. + $element = &escape('homework_edit_'. $Apache::lonxml::curdepth); } my $titleelement; if ($titleid) { - $titleelement=",'".&Apache::lonnet::escape("$titleid\_$Apache::lonxml::curdepth")."'"; + $titleelement=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'"; } my $result = <<"ENDBUTTON"; Search