--- loncom/homework/functionplotresponse.pm 2011/11/26 01:35:26 1.88 +++ loncom/homework/functionplotresponse.pm 2011/12/26 01:48:10 1.91 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # Functionplot responses # -# $Id: functionplotresponse.pm,v 1.88 2011/11/26 01:35:26 www Exp $ +# $Id: functionplotresponse.pm,v 1.91 2011/12/26 01:48:10 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1289,27 +1289,16 @@ sub start_functionplotresponse { ($env{'form.answer_output_mode'} ne 'tex') && ($Apache::lonhomework::viewgrades == 'F')) { my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); - my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); - my $start_page = &Apache::loncommon::start_page('Rules Log', undef, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF', - 'js_ready' => 1,}); - my $end_page = &Apache::loncommon::end_page({'js_ready' => 1,}); $uname =~s/\W//g; $udom =~s/\W//g; my $function_name = join('_','LONCAPA_scriptvars',$uname,$udom, $env{'form.counter'},$Apache::lonxml::curdepth); - my $rules_var ="".&mt('Rules Log')."
"; - &Apache::lonxml::add_script_result($rules_var); - } - + &Apache::lonxml::add_script_result( + &Apache::loncommon::modal_adhoc_window($function_name,700,500, + '
'.$Apache::functionplotresponse::ruleslog.'
', + &mt('Rules Log'))."
"); + } return $result; } @@ -1680,7 +1669,7 @@ sub functionplotrulecheck { # # Evaluate the value # - if ($value=~/\D/) { + if (($value=~/\D/) && ($value ne 'undef')) { $Apache::functionplotresponse::fpr_xmin=$xmin; $Apache::functionplotresponse::fpr_xmax=$xmax; $value=&Apache::run::run($value,$safeeval);