--- loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198 +++ loncom/homework/structuretags.pm 2004/06/12 01:09:30 1.256 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.198 2003/07/17 18:42:13 sakharuk Exp $ +# $Id: structuretags.pm,v 1.256 2004/06/12 01:09:30 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; @@ -36,17 +34,18 @@ use strict; use Apache::lonnet; use Apache::File(); use Apache::lonmenu; +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 { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); + if ($target eq 'web') { + return $bodytext; } return ''; } @@ -58,12 +57,9 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; - if (!($target eq 'edit' || $target eq 'modified' || - $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { - &Apache::lonxml::debug("tex 1"); - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); - } elsif ($target eq 'tex') { - $result=&Apache::lonxml::get_all_text("/tex",$parser); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); + if ($target eq 'tex') { + return $bodytext.' '; } return $result;; } @@ -75,7 +71,7 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my %found; - foreach my $taginside ($tagstack) { + foreach my $taginside (@$tagstack) { foreach my $taglookedfor ('html','body','form') { if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;} } @@ -86,7 +82,8 @@ 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(); } my $body_tag_start; if (!defined($found{'body'})) { @@ -94,6 +91,7 @@ sub page_start { 'onUnload="'.&Apache::lonmenu::unloadevents().'" '; my $background=&Apache::lonxml::get_param('background',$parstack, $safeeval); + if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; } if ($background) { $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= $background; @@ -101,22 +99,26 @@ sub page_start { } else { my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, $safeeval); - if ($bgcolor) { + if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) { $body_tag_start.='bgcolor="'.$bgcolor.'" '; } else { $body_tag_start.='bgcolor="#ffffff"'; } } + if ($ENV{'browser.fontenhance'} eq 'on') { + $body_tag_start.=' style="font-size: x-large;" '; + } $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); if ($symb eq '' && !$publicuser) { my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); - $help="Browsing resource, all submissions are temporary.
"; + $help=&mt("Browsing resource, all submissions are temporary.")."
"; $body_tag_start.=$help; } } + $body_tag_start.=&Apache::lonxml::message_location(); } my $form_tag_start; if (!defined($found{'form'})) { @@ -129,11 +131,18 @@ sub page_start { #use Time::HiRes(); sub get_resource_name { my ($parstack,$safeeval)=@_; + if (defined($Apache::lonhomework::name)) { + return $Apache::lonhomework::name; + } my $name=&Apache::lonnet::gettitle(); if ($name eq '') { $name=&Apache::lonnet::EXT('resource.title'); if ($name eq 'con_lost') { $name = ''; } } + if ($name!~/\S+/) { + $name=$ENV{'request.uri'}; + $name=~s-.*/([^/]+)$-$1-; + } $Apache::lonhomework::name=$name; return $name; } @@ -142,17 +151,18 @@ 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 'New Problem Variation' || - $ENV{'form.newrandomization'} eq '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; @@ -162,51 +172,105 @@ sub setup_rndseed { if (defined($rndseed) && $rndseed ne int($rndseed)) { $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed)); } - &Apache::lonxml::debug("Setting rndseed to $rndseed"); - &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); + 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); + } } return $rndseed; } sub problem_edit_header { return ' - - - -
- -

 

- '; + + + +
+ +
'. + &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index', + 'Problem Editing Help').''. + &Apache::loncommon::help_open_faq(5). + &Apache::loncommon::help_open_bug('Authoring').'
'. + '
'; } sub problem_edit_footer { - return '

- '; + return '

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