--- loncom/homework/structuretags.pm 2005/06/13 20:20:33 1.294 +++ loncom/homework/structuretags.pm 2005/09/23 18:39:55 1.301 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.294 2005/06/13 20:20:33 albertel Exp $ +# $Id: structuretags.pm,v 1.301 2005/09/23 18:39:55 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,11 +88,10 @@ sub body_tag_start { $body_tag_start.=' style="font-size: x-large;" '; } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); + + &Apache::lontexconvert::jsMath_reset(); if ($env{'environment.texengine'} eq 'jsMath') { - $body_tag_start.=''."\n". - ''."\n"; + $body_tag_start.=&Apache::lontexconvert::jsMath_header(); } return $body_tag_start; } @@ -119,14 +118,16 @@ sub page_start { 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(); + if ($target eq 'web' || $target eq 'edit') { + $body_tag_start=&Apache::loncommon::bodytag(); + $body_tag_start.=&Apache::lonxml::message_location(); + } } 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($background,$bgcolor); + $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)= @@ -522,6 +523,7 @@ sub start_problem { &Apache::lonxml::debug("Using default type, problem, :$uri:"); } } + $Apache::lonhomework::default_type = $Apache::lonhomework::type; #added vars to the scripting enviroment my $expression='$external::part=\''.$Apache::inputtags::part.'\';'; @@ -564,11 +566,12 @@ sub start_problem { value="'.$env{'form.username'}.'" />'; if ($env{'user.adv'}) { $form_tag_start.= - ' '.&mt(' Show All Foils'); + $form_tag_start.= ' />'.&mt(' Show All Foils'). + ''; } $form_tag_start.='