--- loncom/homework/edit.pm 2010/06/04 23:03:55 1.126 +++ loncom/homework/edit.pm 2010/09/27 22:15:32 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.126 2010/06/04 23:03:55 www Exp $ +# $Id: edit.pm,v 1.129 2010/09/27 22:15:32 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -397,6 +397,12 @@ sub insert_formularesponse { </formularesponse>'; } +sub insert_functionplotresponse { + return ' +<functionplotresponse> +</functionplotresponse>'; +} + sub insert_numericalresponse { return ' <numericalresponse answer=""> @@ -592,6 +598,9 @@ sub insert_matchresponse { </matchresponse>'; } +sub insert_startpartmarker { return '<startpartmarker />'; } +sub insert_endpartmarker { return '<endpartmarker />'; } + sub insert_displayduedate { return '<displayduedate />'; } sub insert_displaytitle { return '<displaytitle />'; } sub insert_hintpart { @@ -728,19 +737,18 @@ sub editfield { my ($tag,$data,$description,$minwidth,$minheight,$usehtmlarea)=@_; my ($rows,$cols)=&textarea_sizes(\$data); - if (&Apache::lonhtmlcommon::htmlareabrowser() && - !&Apache::lonhtmlcommon::htmlareablocked()) { + 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."<br />"; } - if ($usehtmlarea) { - &Apache::lonhtmlcommon::add_htmlareafields('homework_edit_'. - $Apache::lonxml::curdepth); - } + # remove typesetting whitespace from between data and the end tag # to make the edit look prettier $data =~ s/\n?[ \t]*$//; @@ -748,7 +756,8 @@ sub editfield { return $description."\n".'<textarea style="width:100%" rows="'.$rows. '" cols="'.$cols.'" name="homework_edit_'. $Apache::lonxml::curdepth.'" id="homework_edit_'. - $Apache::lonxml::curdepth.'" '.&element_change_detection().'>'. + $Apache::lonxml::curdepth.'" '.&element_change_detection(). + $textareaclass.'>'. &HTML::Entities::encode($data,'<>&"').'</textarea>'. ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n";