--- loncom/homework/structuretags.pm 2010/08/16 17:51:02 1.465.2.2 +++ loncom/homework/structuretags.pm 2010/03/10 21:25:36 1.466 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.465.2.2 2010/08/16 17:51:02 raeburn Exp $ +# $Id: structuretags.pm,v 1.466 2010/03/10 21:25:36 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,7 +66,7 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA; BEGIN { - &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag')); + &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag')); } sub start_web { @@ -209,9 +209,6 @@ sub page_start { } elsif (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { if ($target eq 'web' || $target eq 'edit') { - if ($env{'environment.remote'} ne 'off') { - $body_args{'only_body'} = 1; - } # Breadcrumbs for Construction Space &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb({ @@ -245,8 +242,7 @@ sub page_start { # $body_args{'no_title'} = 1; $body_args{'force_register'} = 1; $body_args{'add_entries'} = \%add_entries; - if ($env{'environment.remote'} eq 'off' - && $env{'request.state'} eq 'construct') { + if ( $env{'request.state'} eq 'construct') { $body_args{'only_body'} = 1; } } @@ -1494,7 +1490,7 @@ sub start_instructorcomment { if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') { - $result=($env{'request.role'}=~/^(in|cc|co|au|ca|li)/); + $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/); if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) { my $skip=&Apache::lonxml::get_all_text("/instructorcomment", $parser,$style); @@ -1699,44 +1695,6 @@ sub ordered_show_check { return $in_order_show; } -sub start_startpartmarker { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=''; - if ($target eq 'edit') { - $result=&Apache::edit::tag_start($target,$token); - $result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').''; - $result.=&Apache::edit::end_table(); - - } - return $result; -} - -sub end_startpartmarker { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my @result; - if ($target eq 'edit') { $result[1]='no'; } - return @result; -} - -sub start_endpartmarker { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=''; - if ($target eq 'edit') { - $result=&Apache::edit::tag_start($target,$token); - $result.=&mt('Marker for the end of a part. Place start marker above to wrap in-between tags into a new part.').''; - $result.=&Apache::edit::end_table(); - - } - return $result; -} - -sub end_endpartmarker { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my @result; - if ($target eq 'edit') { $result[1]='no'; } - return @result; -} - sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; if (!$Apache::lonxml::metamode) {