--- loncom/homework/edit.pm 2004/03/30 08:20:49 1.81 +++ loncom/homework/edit.pm 2005/04/07 06:56:21 1.92 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.81 2004/03/30 08:20:49 albertel Exp $ +# $Id: edit.pm,v 1.92 2005/04/07 06:56:21 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; @@ -150,7 +147,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) { @@ -193,7 +190,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 +222,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 +239,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 +247,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,10 +281,16 @@ sub insert_responseparam { '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + @@ -297,6 +300,8 @@ sub insert_formularesponse { sub insert_numericalresponse { return ' + + @@ -325,6 +330,8 @@ sub insert_imageresponse { return ' + + @@ -336,6 +343,9 @@ sub insert_optionresponse { return ' + + + @@ -363,6 +373,9 @@ sub insert_radiobuttonresponse { return ' + + + @@ -384,6 +397,9 @@ sub insert_rankresponse { return ' + + + @@ -397,6 +413,9 @@ sub insert_matchresponse { + + + @@ -409,8 +428,7 @@ sub insert_displaytitle { return ' - - + '; } @@ -486,28 +504,40 @@ END } 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"; + &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; } @@ -523,7 +553,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') { @@ -597,7 +627,7 @@ sub checked_arg { &html_element_name($name)."'"; foreach my $selected (split(/,/,$allselected)) { if ( $selected eq $option ) { - $result.=" checked='on' "; + $result.=" checked='checked' "; last; } } @@ -632,7 +662,7 @@ sub select_arg { $value='value="'.$option.'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; } else { $optionlist.="\n"; } @@ -661,14 +691,14 @@ sub select_or_text_arg { $value='value="'.$option.'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; $found=1; } else { $optionlist.="\n"; } } $optionlist.="\n"; # my $element=&html_element_name($name);