--- loncom/homework/structuretags.pm 2003/07/17 18:42:13 1.198 +++ loncom/homework/structuretags.pm 2006/04/20 19:07:09 1.352 @@ -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.352 2006/04/20 19:07:09 albertel 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,19 @@ use strict; use Apache::lonnet; 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','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 ($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 ''; } @@ -56,14 +56,11 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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,$style); + if ($target eq 'tex') { + return $bodytext.' '; } return $result;; } @@ -73,67 +70,116 @@ sub end_tex { } sub page_start { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name, + $extra_head)=@_; my %found; - foreach my $taginside ($tagstack) { + foreach my $taginside (@$tagstack) { foreach my $taglookedfor ('html','body','form') { if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;} } } - my $result; - my $head_tag_start; - if (!defined($found{'html'})) { - $result=&Apache::londefdef::start_html($target,$token,$tagstack, - $parstack,$parser,$safeeval); - $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); + if ($target eq 'tex') { + return + &Apache::londefdef::start_html($target,$token,$tagstack, + $parstack,$parser,$safeeval); } - my $body_tag_start; - if (!defined($found{'body'})) { - $body_tag_start=''; + } + if ($target eq 'edit') { + $extra_head.=&Apache::edit::js_change_detection(). + "\n"; + } + } + + if (defined($found{'body'})) { + $body_args{'skip_phases'}{'body'}=1; + } elsif (!defined($found{'body'}) + && $env{'request.state'} eq 'construct') { + if ($target eq 'web' || $target eq 'edit') { + # no extra args to bodytag + } + } elsif (!defined($found{'body'})) { + my %add_entries; my $background=&Apache::lonxml::get_param('background',$parstack, $safeeval); - if ($background) { - $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= - $background; - $body_tag_start.='background="'.$background.'" '; - } else { - my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, - $safeeval); - if ($bgcolor) { - $body_tag_start.='bgcolor="'.$bgcolor.'" '; - } else { - $body_tag_start.='bgcolor="#ffffff"'; - } + if ($background ne '' ) { + $add_entries{'background'} = $background; } - $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.
"; - $body_tag_start.=$help; - } + + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, + $safeeval); + if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } + + $body_args{'bgcolor'} = $bgcolor; + $body_args{'no_title'} = 1; + $body_args{'force_register'} = 1; + $body_args{'add_entries'} = \%add_entries; + } + + my $page_start = &Apache::loncommon::start_page($name,$extra_head, + \%body_args); + + if (!defined($found{'body'}) + && $env{'request.state'} ne 'construct' + && ($target eq 'web' || $target eq 'webgrade')) { + + my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser(); + if ($symb eq '' && !$publicuser) { + my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); + $help=&mt("Browsing resource, all submissions are temporary.")."
"; + $page_start .= $help; } } + + if (!defined($found{'body'})) { + $page_start .= &Apache::lonxml::message_location(); + } + my $form_tag_start; if (!defined($found{'form'})) { - $form_tag_start='
'; + $form_tag_start=' + + '; +} + sub problem_edit_header { - return ' - - - -
- -

 

- '; + return ''. + &Apache::structuretags::remember_problem_state().' + + + +
+ +
'. + &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help') + .'
'. + '
'; } sub problem_edit_footer { - return '

- '; + return '

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