--- loncom/homework/structuretags.pm 2005/03/01 03:21:58 1.281 +++ loncom/homework/structuretags.pm 2005/11/08 21:09:08 1.318 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.281 2005/03/01 03:21:58 albertel Exp $ +# $Id: structuretags.pm,v 1.318 2005/11/08 21:09:08 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -68,6 +68,33 @@ sub end_tex { return ''; } +sub body_tag_start { + my ($target,$background,$bgcolor)=@_; + my $body_tag_start=''."\n"; - } - if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { + } elsif (!defined($found{'body'})) { + my $background=&Apache::lonxml::get_param('background',$parstack, + $safeeval); + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, + $safeeval); + $body_tag_start=&body_tag_start($target,$background,$bgcolor); + if ( ($target eq 'web' || $target eq 'webgrade') + && $env{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); if ($symb eq '' && !$publicuser) { @@ -135,8 +148,8 @@ sub page_start { my $form_tag_start; if (!defined($found{'form'})) { $form_tag_start='
'; } return ($result,$head_tag_start,$body_tag_start,$form_tag_start); @@ -155,7 +168,7 @@ sub get_resource_name { if ($name eq 'con_lost') { $name = ''; } } if ($name!~/\S+/) { - $name=$ENV{'request.uri'}; + $name=$env{'request.uri'}; $name=~s-.*/([^/]+)$-$1-; } $Apache::lonhomework::name=$name; @@ -166,26 +179,28 @@ 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'}; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['rndseed']); + $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')) { + if ($env{'form.resetdata'} eq &mt('New Problem Variation') || + $env{'form.newrandomization'} eq &mt('New Randomization')) { srand(time); $rndseed=int(rand(2100000000)); - $ENV{'form.rndseed'}=$rndseed; - delete($ENV{'form.resetdata'}); - delete($ENV{'form.newrandomization'}); + $env{'form.rndseed'}=$rndseed; + delete($env{'form.resetdata'}); + delete($env{'form.newrandomization'}); } if (defined($rndseed) && $rndseed ne int($rndseed)) { - $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); + $rndseed=join(':',&Apache::lonnet::digest($rndseed)); } if ($Apache::lonhomework::history{'resource.CODE'}) { $rndseed=&Apache::lonnet::rndseed(); @@ -200,9 +215,9 @@ sub setup_rndseed { sub remember_problem_state { return ' - - - '; + + + '; } sub problem_edit_header { @@ -216,7 +231,7 @@ sub problem_edit_header {
'. &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') .'
'. - '
'; + '
'; } sub problem_edit_footer { @@ -229,7 +244,7 @@ sub problem_edit_footer { sub option { my ($value,$name) = @_; my $result ="