--- loncom/homework/edit.pm 2005/08/30 15:36:07 1.94 +++ loncom/homework/edit.pm 2008/10/24 16:22:54 1.116 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.94 2005/08/30 15:36:07 albertel Exp $ +# $Id: edit.pm,v 1.116 2008/10/24 16:22:54 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,9 @@ use strict; 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 @@ -58,7 +61,7 @@ sub tag_start { if (!$description) { $description="<$tag>"; } } $result.= &start_table($token)."$description - Delete". + ".&mt('Delete?').' '. &deletelist($target,$token) ." ". @@ -87,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]; } @@ -114,17 +112,23 @@ sub end_table { 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; } -sub start_spanning_row { return '';} +sub start_spanning_row { return '';} sub start_row { return ''; } sub end_row { return ''; } @@ -141,7 +145,7 @@ sub deletelist { my ($target,$token) = @_; my $result = ""; return $result; } @@ -161,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); @@ -172,20 +176,21 @@ 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"; } @@ -210,7 +215,7 @@ sub innerinsertlist { if ($target eq 'edit') { my $optionlist= &get_insert_list($tagname); if ($optionlist) { - $result = "Insert: + $result = &mt('Insert:')." " @@ -223,40 +228,32 @@ 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 ".$Apache::lonxml::curdepth." ($tagnum) $newtag, func was not defined."); - } - } - return $result; + return &do_insert($tagnum); } sub handle_insertafter { my $tagname=shift; - if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') - { return ''; } - my $result; + if ($env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"} eq '') { + return ''; + } my $tagnum =$env{"form.insert_after_$tagname\_$Apache::lonxml::curdepth"}; - my $func=$Apache::lonxml::insertlist{"$tagnum.function"}; + return &do_insert($tagnum,1); +} + +sub do_insert { + my ($tagnum,$after) = @_; + my $result; + + 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)) { { @@ -264,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; @@ -309,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 ' @@ -477,6 +542,45 @@ 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 { + my ($extra_action) = @_; + return ' onclick="still_ask=true;'.$extra_action.'" '; +} + sub textarea_sizes { my ($data)=@_; my $count=0; @@ -494,11 +598,12 @@ sub textarea_sizes { sub editline { my ($tag,$data,$description,$size)=@_; $data=&HTML::Entities::encode($data,'<>&"'); - if ($description) { $description="
".$description."
"; } + if ($description) { $description=$description."
"; } + my $change_code = &element_change_detection(); my $result = <<"END"; $description + value="$data" size="$size" $change_code /> END return $result; } @@ -515,15 +620,19 @@ sub editfield { if ($cols > 80) { $cols = 80; } if ($cols < $minwidth ) { $cols = $minwidth; } if ($rows < $minheight) { $rows = $minheight; } - if ($description) { $description="
".$description."
"; } + if ($description) { $description=$description."
"; } if ($usehtmlarea) { - push @Apache::lonxml::htmlareafields,'homework_edit_'. - $Apache::lonxml::curdepth; + &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'. + $Apache::lonxml::curdepth); } - return $description."\n".'   '. ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; @@ -532,15 +641,17 @@ sub editfield { 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"}; 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; } @@ -562,6 +673,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; @@ -576,11 +691,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.=' />'; @@ -623,15 +740,15 @@ sub checked_arg { $text=$option; $value='value="'.$option.'"'; } - $result.="$text\n"; } return $result; } @@ -642,7 +759,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.''; } @@ -662,13 +780,13 @@ sub select_arg { $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; } else { - $optionlist.="\n"; + $optionlist.="\n"; } } - $result.=''.$description.'  '.$optionlist.' '; return $result; @@ -701,6 +819,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 +844,7 @@ $optionlist value="$typeinvalue" onChange="$hiddenvalue=$typedinvalue;" onFocus="$selectedindex=$selecttypeinindex-1;" /> - + ENDSELECTORTYPE } @@ -737,13 +856,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; @@ -761,7 +880,7 @@ sub entercoords { $data{"imagechoice.$id.formwidth"}=$width.'_'. $Apache::edit::bgimgsrccurdepth; } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); my $text="Click Coordinates"; my $result=''.$text.''; return $result; @@ -772,13 +891,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; @@ -794,7 +913,7 @@ sub entercoord { $data{"imagechoice.$id.formwidth"}=$width.'_'. $Apache::edit::bgimgsrccurdepth; } - &Apache::lonnet::appenv(%data); + &Apache::lonnet::appenv(\%data); my $text="Enter Coordinates"; if ($type eq 'polygon') { $text='Create Polygon Data'; } my $result=''.$text.''; @@ -808,18 +927,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 @@ -834,14 +955,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