--- loncom/homework/edit.pm 2010/10/10 00:14:15 1.131 +++ loncom/homework/edit.pm 2013/07/04 16:35:07 1.147 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.131 2010/10/10 00:14:15 www Exp $ +# $Id: edit.pm,v 1.147 2013/07/04 16:35:07 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -400,8 +400,10 @@ sub insert_formularesponse { sub insert_functionplotresponse { return ' - - + + + + '; } @@ -415,12 +417,64 @@ sub insert_backgroundplot { '; } -sub insert_splinerule { +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 ' @@ -434,6 +488,13 @@ sub insert_numericalresponse { '; } +sub insert_externalresponse { + return ' + + +'; +} + sub insert_customresponse { return ' @@ -606,6 +667,9 @@ sub insert_matchresponse { + + + @@ -690,6 +754,7 @@ sub js_change_detection { my $unsaved=&mt("There are unsaved changes"); return (< +// SCRIPT } @@ -725,6 +791,12 @@ sub submit_ask_anyway { 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; @@ -766,20 +838,20 @@ sub editfield { if ($cols > 80) { $cols = 80; } if ($cols < $minwidth ) { $cols = $minwidth; } if ($rows < $minheight) { $rows = $minheight; } - if ($description) { $description=$description."
"; } + if ($description) { $description='
'.&mt($description).'
'; } # remove typesetting whitespace from between data and the end tag # to make the edit look prettier $data =~ s/\n?[ \t]*$//; - return $description."\n".''. - ($usehtmlarea?&Apache::lonhtmlcommon::spelllink('lonhomework', - 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; + ($usehtmlarea?'
'.&Apache::lonhtmlcommon::spelllink('lonhomework', + 'homework_edit_'.$Apache::lonxml::curdepth):'')."\n"; } sub modifiedfield { @@ -884,7 +956,7 @@ sub checked_arg { $text=$option; $value='value="'.$option.'"'; } - $result.='