--- loncom/homework/edit.pm 2010/10/09 22:31:49 1.130 +++ loncom/homework/edit.pm 2012/02/28 22:42:31 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.130 2010/10/09 22:31:49 www Exp $ +# $Id: edit.pm,v 1.141 2012/02/28 22:42:31 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -400,11 +400,82 @@ sub insert_formularesponse { sub insert_functionplotresponse { return ' <functionplotresponse> -<spline /> -<splinerule /> +<functionplotelements> +</functionplotelements> +<functionplotruleset> +</functionplotruleset> </functionplotresponse>'; } +sub insert_spline { + return ' +<spline />'; +} + +sub insert_backgroundplot { + return ' +<backgroundplot />'; +} + +sub insert_plotobject { + return ' +<plotobject />'; +} + +sub insert_plotvector { + return ' +<plotvector />'; +} + +sub insert_drawvectorsum { + return ' +<drawvectorsum />'; +} + + +sub insert_functionplotrule { + return ' +<functionplotrule />'; +} + +sub insert_functionplotvectorrule { + return ' +<functionplotvectorrule />'; +} + +sub insert_functionplotvectorsumrule { + return ' +<functionplotvectorsumrule />'; +} + +sub insert_functionplotcustomrule { + return ' +<functionplotcustomrule> +<answer type="loncapa/perl"> +# &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; +</answer> +</functionplotcustomrule>'; +} + +sub insert_functionplotruleset { + return ' +<functionplotruleset> +<functionplotrule /> +</functionplotruleset>'; +} + +sub insert_functionplotelements { + return ' +<functionplotelements> +<spline /> +</functionplotelements>'; +} + sub insert_numericalresponse { return ' <numericalresponse answer=""> @@ -708,6 +779,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; @@ -755,7 +832,7 @@ sub editfield { # to make the edit look prettier $data =~ s/\n?[ \t]*$//; - return $description."\n".'<textarea style="width:100%" rows="'.$rows. + return $description."\n".'<textarea style="width:99%" rows="'.$rows. '" cols="'.$cols.'" name="homework_edit_'. $Apache::lonxml::curdepth.'" id="homework_edit_'. $Apache::lonxml::curdepth.'" '.&element_change_detection(). @@ -881,13 +958,16 @@ sub checked_arg { } 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=&mt($description).' <input name="'.&html_element_name($name). - '" type="text" value="'.$arg.'" size="'.$size.'" '. - &element_change_detection().'/>'; + '" type="text" value="'.$arg.'" size="'.$size.'" '; + if (defined $class) { + $result .= 'class="' . $class . '" '; + } + $result .= &element_change_detection().'/>'; return '<span class="LC_nobreak">'.$result.'</span>'; }