--- loncom/homework/structuretags.pm 2004/02/06 22:36:40 1.232 +++ loncom/homework/structuretags.pm 2004/06/03 16:42:02 1.255 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.232 2004/02/06 22:36:40 albertel Exp $ +# $Id: structuretags.pm,v 1.255 2004/06/03 16:42:02 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,9 +25,7 @@ # # http://www.lon-capa.org/ # -# 2/19 Guy -# 6/26/2001 fixed extra web display at end of tags -# 8/17,8/18,8/20 Gerd Kortemeyer +### package Apache::structuretags; @@ -40,8 +38,7 @@ use Apache::lonlocal; use Apache::lonxml; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext', -'simpleeditbutton','definetag')); + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); } sub start_web { @@ -85,7 +82,9 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack, $parstack,$parser,$safeeval); - $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); + $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target). + &Apache::lonhtmlcommon::htmlareaheaders(); + @Apache::lonxml::htmlareafields=(); } my $body_tag_start; if (!defined($found{'body'})) { @@ -120,6 +119,7 @@ sub page_start { $body_tag_start.=$help; } } + $body_tag_start.=&Apache::lonxml::message_location(); } my $form_tag_start; if (!defined($found{'form'})) { @@ -152,14 +152,15 @@ sub setup_rndseed { my ($safeeval)=@_; my $rndseed; my ($symb)=&Apache::lonxml::whichuser(); - if ($ENV{'request.state'} eq "construct" || $symb eq '') { + if ($ENV{'request.state'} eq "construct" || $symb eq '' || + $Apache::lonhomework::history{'resource.CODE'}) { $rndseed=$ENV{'form.rndseed'}; if (!$rndseed) { $rndseed=$Apache::lonhomework::history{'rndseed'}; if (!$rndseed) { $rndseed=time; - $ENV{'form.rndseed'}=$rndseed; } + $ENV{'form.rndseed'}=$rndseed; } if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') || $ENV{'form.newrandomization'} eq &mt('New Randomization')) { @@ -172,9 +173,12 @@ sub setup_rndseed { if (defined($rndseed) && $rndseed ne int($rndseed)) { $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); } + if ($Apache::lonhomework::history{'resource.CODE'}) { + $rndseed=&Apache::lonnet::rndseed(); + } if ($safeeval) { &Apache::lonxml::debug("Setting rndseed to $rndseed"); - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval); } } return $rndseed; @@ -183,11 +187,11 @@ sub setup_rndseed { sub problem_edit_header { return ' - - -
- -
'. + + +
+ +
'. &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index', 'Problem Editing Help').''. &Apache::loncommon::help_open_faq(5). @@ -197,16 +201,28 @@ sub problem_edit_header { sub problem_edit_footer { return '

- '; + '. + &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields). + "\n\n\n"; +} + +sub option { + my ($value,$name) = @_; + my $result ="