--- loncom/interface/lonsimplepage.pm 2005/11/22 00:01:41 1.31 +++ loncom/interface/lonsimplepage.pm 2006/03/21 21:07:31 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.31 2005/11/22 00:01:41 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.34 2006/03/21 21:07:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -45,22 +45,15 @@ sub handler { return OK if $r->header_only; my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT - } else { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri); # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { - $r->print('Not in a course'); - return OK; + return &Apache::loncommon::simple_error_page($r,'', + 'Not in a course'); } else { $r->print('\textbf{Not in a course}\end{document}'); } @@ -79,18 +72,18 @@ ENDDOCUMENT $namespace = 'grppage_'.$marker; my %curr_groups; if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { - $r->print('Invalid group name'); - return OK; + return &Apache::loncommon::simple_error_page($r,'', + 'Invalid group name'); } - %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker}); + %groupinfo = + &Apache::loncommon::get_group_settings($curr_groups{$marker}); } else { $marker=~s/\D//g; $namespace = 'smppage_'.$marker; } - unless ($marker) { - $r->print('Invalid call'); - return OK; + if (!$marker) { + return &Apache::loncommon::simple_error_page($r,'','Invalid call'); } # --------------------------------------------------------- The syllabus fields @@ -130,8 +123,9 @@ ENDDOCUMENT $title = 'Group Page'; } $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). - ''.&Apache::loncommon::bodytag - ($title,$forcestudent,$addentries,'',$dom,$env{'form.register'})); + &Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag($title,$forcestudent,$addentries, + '',$dom,$env{'form.register'})); } if ($caller eq 'grppg') { @@ -144,9 +138,10 @@ ENDDOCUMENT } } else { if ($target ne 'tex') { - $r->print('You do not currently have rights to - view this group. - '); + $r->print(&Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag(). + 'You do not currently have rights to view this group.'. + &Apache::loncommon::end_page()); return OK; } else { $r->print('\textbf{You do not currently have rights to view this group}\end{document}'); @@ -302,7 +297,7 @@ ENDDOCUMENT $r->print('

No page information provided.

'); } if ($env{'form.grade_target'} ne 'tex') { - $r->print(''); + $r->print(&Apache::loncommon::end_page()); } else { $r->print('\end{document}'); }