--- loncom/homework/structuretags.pm 2005/04/07 06:56:22 1.284 +++ loncom/homework/structuretags.pm 2006/04/11 18:42:58 1.341 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.284 2005/04/07 06:56:22 albertel Exp $ +# $Id: structuretags.pm,v 1.341 2006/04/11 18:42:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,15 +36,16 @@ use Apache::File(); use Apache::lonmenu; use Apache::lonlocal; use Apache::lonxml; +use Apache::lonenc(); use Time::HiRes qw( gettimeofday tv_interval ); BEGIN { &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 { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); - if ($target eq 'web') { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); + if ($target eq 'web' || $target eq 'webgrade') { return $bodytext; } return ''; @@ -55,9 +56,9 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); if ($target eq 'tex') { return $bodytext.' '; } @@ -68,6 +69,31 @@ sub end_tex { return ''; } +sub body_tag_start { + my ($target,$background,$bgcolor)=@_; + my $body_tag_start=''; + } + if ($target eq 'edit') { + $head_tag_start.=&Apache::edit::js_change_detection(); + } } my $body_tag_start; - if (!defined($found{'body'}) && $env{'request.state'} eq 'construct' - && $env{'environment.remote'} eq 'off') { - $body_tag_start=&Apache::loncommon::bodytag(); - $body_tag_start.=&Apache::lonxml::message_location(); - } elsif (!defined($found{'body'})) { - $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) { @@ -134,10 +155,13 @@ sub page_start { } my $form_tag_start; if (!defined($found{'form'})) { - $form_tag_start='
'; + $form_tag_start=' - +
'. @@ -238,9 +266,11 @@ sub option { sub problem_web_to_edit_header { my ($rndseed)=@_; - my $result.=' - - + my $result.=''; + if (!$Apache::lonhomework::parsing_a_task) { + $result .= ''; + } + $result .= ' @@ -248,11 +278,17 @@ sub problem_web_to_edit_header { $rndseed.'" onchange="javascript:document.lonhomework.changerandseed.click()" />