--- loncom/homework/structuretags.pm 2009/12/02 18:22:12 1.444.4.2.2.2 +++ loncom/homework/structuretags.pm 2009/05/15 14:48:35 1.445 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.444.4.2.2.2 2009/12/02 18:22:12 raeburn Exp $ +# $Id: structuretags.pm,v 1.445 2009/05/15 14:48:35 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -225,7 +225,7 @@ sub page_start { if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; } $body_args{'bgcolor'} = $bgcolor; - $body_args{'no_title'} = 1; +# $body_args{'no_title'} = 1; $body_args{'force_register'} = 1; $body_args{'add_entries'} = \%add_entries; if ($env{'environment.remote'} eq 'off' @@ -236,18 +236,17 @@ sub page_start { $body_args{'no_auto_mt_title'} = 1; my $page_start = &Apache::loncommon::start_page($name,$extra_head, \%body_args); - unless ($env{'request.gcicontext'} eq 'buildtest') { - if (!defined($found{'body'}) - && $env{'request.state'} ne 'construct' - && ($target eq 'web' || $target eq 'webgrade')) { - - my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser(); - if ($symb eq '' && !$publicuser) { - $page_start .= '

' - .&mt('Browsing resource, all submissions are temporary.') - .'

'; - } - } + + if (!defined($found{'body'}) + && $env{'request.state'} ne 'construct' + && ($target eq 'web' || $target eq 'webgrade')) { + + my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::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'}) && $env{'request.state'} ne 'construct') { @@ -419,16 +418,14 @@ sub problem_web_to_edit_header { ''; } - my $show_all_foils_text = - ($Apache::lonhomework::parsing_a_task) ? - &mt('Show All Instances') - : &mt('Show All Foils'); + my $show_all_foils_text = + ($Apache::lonhomework::parsing_a_task) ? + &mt(' Show All Instances') + : &mt(' Show All Foils'); - my $show_all= ''; + $show_all.= ' />'.$show_all_foils_text.''; @@ -677,7 +674,9 @@ sub checkout_msg { return (<$lt{'resource'}

$lt{'id_expln'}

-

$lt{'warning'}

+ +

$lt{'warning'}

+
@@ -895,34 +894,27 @@ sub start_problem { if ($env{'request.state'} ne "construct" && ($symb eq '' || $Apache::lonhomework::type eq 'practice')) { $form_tag_start.=''; - unless ($env{'request.gcicontext'} eq 'buildtest') { - $form_tag_start .= ''. + ''; - } if (exists($env{'form.username'})) { $form_tag_start.= ''; } - unless ($env{'request.gcicontext'} eq 'buildtest') { - if ($env{'request.role.adv'}) { - $form_tag_start.= '