--- loncom/homework/edit.pm 2011/02/06 18:43:10 1.134 +++ loncom/homework/edit.pm 2012/02/13 11:23:11 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # edit mode helpers # -# $Id: edit.pm,v 1.134 2011/02/06 18:43:10 www Exp $ +# $Id: edit.pm,v 1.140 2012/02/13 11:23:11 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -401,10 +401,8 @@ sub insert_functionplotresponse { return ' <functionplotresponse> <functionplotelements> -<spline /> </functionplotelements> <functionplotruleset> -<functionplotrule /> </functionplotruleset> </functionplotresponse>'; } @@ -419,11 +417,45 @@ sub insert_backgroundplot { <backgroundplot />'; } +sub insert_plotobject { + return ' +<plotobject />'; +} + +sub insert_plotvector { + return ' +<plotvector />'; +} + 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> @@ -794,7 +826,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(). @@ -920,13 +952,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>'; }