--- loncom/homework/edit.pm 2004/06/08 01:32:01 1.84 +++ loncom/homework/edit.pm 2005/03/17 13:56:32 1.91 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.84 2004/06/08 01:32:01 www Exp $ +# $Id: edit.pm,v 1.91 2005/03/17 13:56:32 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,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; @@ -191,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; } @@ -240,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; @@ -282,10 +281,16 @@ sub insert_responseparam { '; } +sub insert_parameter { + return ' + '; +} + sub insert_formularesponse { return ' - + + @@ -295,6 +300,8 @@ sub insert_formularesponse { sub insert_numericalresponse { return ' + + @@ -323,6 +330,8 @@ sub insert_imageresponse { return ' + + @@ -334,6 +343,9 @@ sub insert_optionresponse { return ' + + + @@ -361,6 +373,9 @@ sub insert_radiobuttonresponse { return ' + + + @@ -382,6 +397,9 @@ sub insert_rankresponse { return ' + + + @@ -395,6 +413,9 @@ sub insert_matchresponse { + + + @@ -407,8 +428,7 @@ sub insert_displaytitle { return ' - - + '; } @@ -500,11 +520,13 @@ sub editfield { push @Apache::lonxml::htmlareafields,'homework_edit_'. $Apache::lonxml::curdepth; } - return $description."\n".'   '."\n"; + &HTML::Entities::encode($data,'<>&"').''. + ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', + 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; } sub modifiedfield { @@ -605,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; } } @@ -640,7 +662,7 @@ sub select_arg { $value='value="'.$option.'"'; } if ( $selected eq $option ) { - $optionlist.="\n"; + $optionlist.="\n"; } else { $optionlist.="\n"; } @@ -669,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);