--- loncom/homework/structuretags.pm 2002/11/10 15:39:37 1.134 +++ loncom/homework/structuretags.pm 2006/04/14 20:16:23 1.343 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.134 2002/11/10 15:39:37 albertel Exp $ +# $Id: structuretags.pm,v 1.343 2006/04/14 20:16:23 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; @@ -35,19 +33,22 @@ package Apache::structuretags; 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','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); -# &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) + &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[$#$parser]); - if ($target eq 'web') { - return $bodytext; - } - return ''; + 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 ''; } sub end_web { @@ -55,12 +56,13 @@ sub end_web { } sub start_tex { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); - if ($target eq 'tex') { - return $bodytext.' '; - } - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); + if ($target eq 'tex') { + return $bodytext.' '; + } + return $result;; } sub end_tex { @@ -68,446 +70,933 @@ sub end_tex { } sub page_start { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my %found; - 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::lonxml::registerurl(undef,$target); - } - my $body_tag_start; - if (!defined($found{'body'})) { - $body_tag_start='ambiguous reference, submissions ignored $help
"; - $body_tag_start.=$help; + + + if ($target eq 'tex') { + return + &Apache::londefdef::start_html($target,$token,$tagstack, + $parstack,$parser,$safeeval); + } + + my $page_start; + if (!defined($found{'html'})) { + + my $extra_head = &Apache::lonhtmlcommon::spellheader(); + + my $css_href = &Apache::lonnet::EXT('resource.0.cssfile'); + if ($css_href =~ /\S/) { + &Apache::lonxml::extlink($css_href); + $extra_head .= + ''; + } + if ($target eq 'edit') { + $extra_head.=&Apache::edit::js_change_detection(). + "\n"; + } + $page_start .= + &Apache::loncommon::head($name,$extra_head, + {'force_register' => + ($target ne 'edit') }); } - } - my $form_tag_start; - if (!defined($found{'form'})) { - $form_tag_start='
'; - } - return ($result,$head_tag_start,$body_tag_start,$form_tag_start); + + if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { + if ($target eq 'web' || $target eq 'edit') { + $page_start.=&Apache::loncommon::bodytag(); + $page_start.=&Apache::lonxml::message_location(); + } + } elsif (!defined($found{'body'})) { + my %add_entries; + my $background=&Apache::lonxml::get_param('background',$parstack, + $safeeval); + if ($background ne '' ) { + $add_entries{'background'} = $background; + } + my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack, + $safeeval); + + if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } + $page_start .= + &Apache::loncommon::bodytag(undef,undef,\%add_entries,undef,undef, + 1,undef,undef,$bgcolor,$target,1); + + 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) { + my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); + $help=&mt("Browsing resource, all submissions are temporary.")."
"; + $page_start .= $help; + } + } + $page_start .= &Apache::lonxml::message_location(); + } + + my $form_tag_start; + if (!defined($found{'form'})) { + $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::lonxml::htmlareafields). + "\n
\n".&Apache::loncommon::end_page(); +} + +sub option { + my ($value,$name) = @_; + my $result ="