--- loncom/homework/edit.pm 2003/09/17 15:44:19 1.65 +++ loncom/homework/edit.pm 2013/12/03 17:22:08 1.150 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.65 2003/09/17 15:44:19 matthew Exp $ +# $Id: edit.pm,v 1.150 2013/12/03 17:22:08 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,14 +25,120 @@ # # http://www.lon-capa.org/ # -# 3/20 Guy -# 01/10/02 Matthew -# 03/06/02 Matthew + +=pod + +=head1 NAME + +Apache::edit - edit mode helpers + +=head1 SYNOPSIS + +Invoked by many homework and xml related modules. + + &Apache::edit::SUBROUTINENAME(ARGUMENTS); + +=head1 INTRODUCTION + +This module outputs HTML syntax helpful for the rendering of edit +mode interfaces. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 SUBROUTINES + +=over 4 + +=item initialize_edit() + +initialize edit (set colordepth to zero) + +=item tag_start($target,$token,$description) + +provide deletion and insertion lists +for the manipulation of a start tag; return a scalar string + +=item tag_end($target,$token,$description) + +ending syntax corresponding to +&tag_start. return a scalar string. + +=item start_table($token) + +start table; update colordepth; return scalar string. + +=item end_table() + +reduce color depth; end table; return scalar string + +=item start_spanning_row() + +start a new table row spanning the 'edit' environment. + +=item start_row() + +start a new table row and element. + +=item end_row() + +end current table element and row. + +=item movebuttons($target,$token) + +move-up and move-down buttons; return scalar string + +=item deletelist($target,$token) + +provide a yes option in an HTML select element; return scalar string + +=item handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval, +$style) + +respond to a user delete request by passing relevant stack +and array information to various rendering functions; return a scalar string + +=item get_insert_list($token) + +provide an insertion list based on possibilities from lonxml; return a scalar string + +=item insertlist($target,$token) + +api that uses get_insert_list; return a scalar string + +=item handleinsert($token) + +provide an insertion list based on possibilities from lonxml; return a scalar string + +=item get_insert_list($token) + +provide an insertion list based on possibilities from lonxml; return a scalar string + +=item browse($elementname) + +provide a link which will open up the filesystem browser (lonindexer) and, once a file is selected, place the result in the form element $elementname. + +=item search($elementname) + +provide a link which will open up the filesystem searcher (lonsearchcat) and, once a file is selected, place the result in the form element $elementname. + +=item editline(tag,data,description,size) + +Provide a for single-line text entry. This is to be used for text enclosed by tags, not arguements/parameters associated with a tag. + +=back + +=cut + 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 @@ -55,11 +161,11 @@ sub tag_start { if ($target eq "edit") { my $tag=$token->[1]; if (!$description) { - $description=&Apache::lonxml::description($token); + $description=&mt(&Apache::lonxml::description($token)); if (!$description) { $description="<$tag>"; } } $result.= &start_table($token)."$description - Delete". + ".&mt('Delete?').' '. &deletelist($target,$token) ." ". @@ -67,12 +173,11 @@ sub tag_start { #". # &movebuttons($target,$token). # "\n"; - my @help;# = Apache::lonxml::helpinfo($token); + 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; @@ -89,44 +194,45 @@ 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]; } $Apache::edit::colordepth++; push(@Apache::edit::inserttag,$token->[1]); - my $result='
'; - $result.=''; + my $result='
'; + $result.='
'; return $result; } 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; } -sub start_spanning_row { return '';} +sub start_spanning_row { return '';} sub start_row { return ''; } sub end_row { return ''; } @@ -143,13 +249,13 @@ sub deletelist { my ($target,$token) = @_; my $result = ""; return $result; } 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) { @@ -163,7 +269,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); @@ -174,25 +280,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; } @@ -212,7 +319,7 @@ sub innerinsertlist { if ($target eq 'edit') { my $optionlist= &get_insert_list($tagname); if ($optionlist) { - $result = "Insert: + $result = &mt('Insert:')." " @@ -224,41 +331,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>"; } else { if (defined(&$func)) { { @@ -266,41 +365,211 @@ 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; } +sub insert_img { + return ' + '; +} + sub insert_responseparam { return ' '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + + '; } +sub insert_functionplotresponse { + return ' + + + + + +'; +} + +sub insert_spline { + return ' +'; +} + +sub insert_backgroundplot { + return ' +'; +} + +sub insert_plotobject { + return ' +'; +} + +sub insert_plotvector { + return ' +'; +} + +sub insert_drawvectorsum { + return ' +'; +} + + +sub insert_functionplotrule { + return ' +'; +} + +sub insert_functionplotvectorrule { + return ' +'; +} + +sub insert_functionplotvectorsumrule { + return ' +'; +} + +sub insert_functionplotcustomrule { + return ' + + +# &fpr_val("label"), &fpr_f($x), &fpr_dfdx($x), &fpr_d2fdx2($x) +# ($xs,$xe,$ys,$ye)=&fpr_vectorcoords("Name"), ($x,$y)=&fpr_objectcoords("Name") +# &fpr_vectorlength("Name"), &fpr_vectorangle("Name") + +# Return 0 or 1 +return 1; + +'; +} + +sub insert_functionplotruleset { + return ' + + +'; +} + +sub insert_functionplotelements { + return ' + + +'; +} + sub insert_numericalresponse { return ' + + + '; } +sub insert_externalresponse { + return ' + + +'; +} + +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 ' + '; } @@ -316,8 +585,11 @@ sub insert_imageresponse { return ' + + + '; } @@ -326,28 +598,66 @@ sub insert_optionresponse { return ' + + + + '; } +sub insert_organicresponse { + return ' + + + + + +'; +} + +sub insert_organicstructure { + return ' + +'; +} + sub insert_radiobuttonresponse { return ' + + + + '; } +sub insert_reactionresponse { + return ' + + + + + +'; +} + sub insert_rankresponse { return ' + + + + '; } @@ -357,29 +667,57 @@ sub insert_matchresponse { + + + + + + + '; } +sub insert_startpartmarker { return ''; } +sub insert_endpartmarker { return ''; } + sub insert_displayduedate { return ''; } sub insert_displaytitle { return ''; } sub insert_hintpart { return ' - - + '; } +sub insert_hintgroup { + return ' + + +'; +} + sub insert_numericalhint { return ' '; } +sub insert_reactionhint { + return ' + +'; +} + +sub insert_organichint { + return ' + +'; +} + sub insert_stringhint { return ' @@ -405,13 +743,60 @@ 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 (< +// + +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 submit_dont_ask { + my ($extra_action) = @_; + return ' onclick="is_submit=true;'.$extra_action.'" '; +} + + sub textarea_sizes { my ($data)=@_; my $count=0; @@ -428,39 +813,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); + my $textareaclass; + + if (&Apache::lonhtmlcommon::htmlareabrowser() && $usehtmlarea) { + $rows+=7; # make room for HTMLarea + $minheight+=7; # make room for HTMLarea + $textareaclass = ' class="LC_richDefaultOff"'; + } 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(). + $textareaclass.'>'. + &HTML::Entities::encode($data,'<>&"').''. + ($usehtmlarea?'
'.&Apache::lonhtmlcommon::spelllink('lonhomework', + 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; } sub modifiedfield { - my ($token) = @_; + 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 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; } @@ -473,7 +880,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') { @@ -482,6 +889,13 @@ 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; } } return $rebuild; @@ -493,11 +907,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.=' />'; @@ -529,38 +945,42 @@ sub checked_arg { my $result; my $optionlist=""; my $allselected=$token->[2]{$name}; - $result=$description; + $result=&mt($description); foreach my $option (@$list) { my ($value,$text); if ( ref($option) eq 'ARRAY') { $value='value="'.$$option[0].'"'; - $text=$$option[1]; + $text=&mt($$option[1]); $option=$$option[0]; } else { - $text=$option; + $text=&mt($option); $value='value="'.$option.'"'; } - $result.="'.$text.''."\n"; } return $result; } sub text_arg { - my ($description,$name,$token,$size) = @_; + my ($description,$name,$token,$size, $class) = @_; my $result; if (!defined $size) { $size=20; } my $arg=$token->[2]{$name}; - $result=$description.' '; - return ''.$result.''; + $result=&mt($description).' '; + return ' '.$result.''; } sub select_arg { @@ -568,26 +988,28 @@ sub select_arg { my $result; my $optionlist=""; my $selected=$token->[2]{$name}; - foreach my $option (@$list) { - my ($text,$value); - if ( ref($option) eq 'ARRAY') { - $value='value="'.$$option[0].'"'; - $text=$$option[1]; - $option=$$option[0]; - } else { - $text=$option; - $value='value="'.$option.'"'; - } - if ( $selected eq $option ) { - $optionlist.="\n"; - } else { - $optionlist.="\n"; - } + if (ref($list) eq 'ARRAY') { + foreach my $option (@{$list}) { + my ($text,$value); + if (ref($option) eq 'ARRAY') { + $value='value="'.&HTML::Entities::encode($option->[0]).'"'; + $text=$option->[1]; + $option=$option->[0]; + } else { + $text=$option; + $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; + } + if ( $selected eq $option ) { + $optionlist.="\n"; + } else { + $optionlist.="\n"; + } + } } - $result.=''.$description.'  '.$optionlist.' - '; + '; return $result; } @@ -597,27 +1019,30 @@ sub select_or_text_arg { my $optionlist=""; my $found=0; my $selected=$token->[2]{$name}; - foreach my $option (@$list) { - my ($text,$value); - if ( ref($option) eq 'ARRAY') { - $value='value="'.$$option[0].'"'; - $text=$$option[1]; - $option=$$option[0]; - } else { - $text=$option; - $value='value="'.$option.'"'; - } - if ( $selected eq $option ) { - $optionlist.="\n"; - $found=1; - } else { - $optionlist.="\n"; - } + if (ref($list) eq 'ARRAY') { + foreach my $option (@{$list}) { + my ($text,$value); + if (ref($option) eq 'ARRAY') { + $value='value="'.&HTML::Entities::encode($option->[0]).'"'; + $text=$option->[1]; + $option=$option->[0]; + } else { + $text=$option; + $value='value="'.&HTML::Entities::encode($option,'\'"&<>').'"'; + } + if ( $selected eq $option ) { + $optionlist.="\n"; + $found=1; + } else { + $optionlist.="\n"; + } + } } $optionlist.="\n"; + ((!$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; @@ -629,95 +1054,119 @@ sub select_or_text_arg { '.options['.$selectedindex.'].value'; my $typedinvalue='this.form.'.$typeinelement.'.value'; my $selecttypeinindex='this.form.'.$selectelement.'.options.length'; + $description=&mt($description); # return (< + $description   - - +onchange="$hiddenvalue=$typedinvalue;" +onfocus="$selectedindex=$selecttypeinindex-1;" /> + + 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=&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 $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=&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 = &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 $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) - my ($id, $mode) = @_; + 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_'. - $Apache::lonxml::curdepth); + $element = &escape('homework_edit_'. + $Apache::lonxml::curdepth); + } + my $titleelement; + if ($titleid) { + $titleelement=",'$only','','".&escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } else { + $titleelement=",'$only'"; } my $result = <<"ENDBUTTON"; -Select +Select ENDBUTTON return $result; } @@ -725,17 +1174,21 @@ ENDBUTTON #----------------------------------------------------- browse sub search { # insert a link to call up the filesystem browser (lonindexer) - my ($id, $mode) = @_; + my ($id, $mode, $titleid) = @_; 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=",'".&escape("$titleid\_$Apache::lonxml::curdepth")."'"; + } my $result = <<"ENDBUTTON"; -Search +Search ENDBUTTON return $result; } @@ -744,119 +1197,4 @@ ENDBUTTON 1; __END__ -=head1 NAME - -Apache::edit - edit mode helpers - -=head1 SYNOPSIS - -Invoked by many homework and xml related modules. - - &Apache::edit::SUBROUTINENAME(ARGUMENTS); - -=head1 INTRODUCTION - -This module outputs HTML syntax helpful for the rendering of edit -mode interfaces. - -This is part of the LearningOnline Network with CAPA project -described at http://www.lon-capa.org. - -=head1 HANDLER SUBROUTINE - -There is no handler subroutine. - -=head1 OTHER SUBROUTINES - -=over 4 - -=item * -initialize_edit() : initialize edit (set colordepth to zero) - -=item * - -tag_start($target,$token,$description) : provide deletion and insertion lists -for the manipulation of a start tag; return a scalar string - -=item * - -tag_end($target,$token,$description) : ending syntax corresponding to -&tag_start. return a scalar string. - -=item * - -start_table($token) : start table; update colordepth; return scalar string. - -=item * - -end_table() : reduce color depth; end table; return scalar string - -=item * - -start_spanning_row() : start a new table row spanning the 'edit' environment. - -=item * - -start_row() : start a new table row and element. - -=item * - -end_row() : end current table element and row. - -=item * - -movebuttons($target,$token) : move-up and move-down buttons; return scalar -string - -=item * - -deletelist($target,$token) : provide a yes option in an HTML select element; -return scalar string - -=item * - -handle_delete($space,$target,$token,$tagstack,$parstack,$parser,$safeeval, -$style) : respond to a user delete request by passing relevant stack -and array information to various rendering functions; return a scalar string - -=item * - -get_insert_list($token) : provide an insertion list based on possibilities -from lonxml; return a scalar string - -=item * - -insertlist($target,$token) : api that uses get_insert_list; -return a scalar string - -=item * - -handleinsert($token) : provide an insertion list based on possibilities -from lonxml; return a scalar string - -=item * - -get_insert_list($token) : provide an insertion list based on possibilities -from lonxml; return a scalar string - -=item * -browse($elementname) : provide a link which will open up the filesystem -browser (lonindexer) and, once a file is selected, place the result in -the form element $elementname. - -=item * -search($elementname) : provide a link which will open up the filesystem -searcher (lonsearchcat) and, once a file is selected, place the result in -the form element $elementname. - -=item * -editline(tag,data,description,size): Provide a for -single-line text entry. This is to be used for text enclosed by tags, not -arguements/parameters associated with a tag. - -=back - -incomplete... - -=cut