--- loncom/interface/lonsimplepage.pm 2005/11/22 00:01:41 1.31 +++ loncom/interface/lonsimplepage.pm 2006/03/15 19:41:26 1.32 @@ -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.32 2006/03/15 19:41:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,6 +38,15 @@ use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; +sub error { + my ($r,$msg) = @_; + $r->print(&Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag(). + &mt($msg). + &Apache::loncommon::end_page()); + return OK; +} + sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -46,12 +55,10 @@ sub handler { my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen if ($target ne 'tex') { + my $html= my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA -ENDDOCUMENT + $r->print(&Apache::lonxml::xmlbegin(). + &Apache::loncommon::headtag()); } else { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } @@ -59,8 +66,7 @@ ENDDOCUMENT # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { - $r->print('Not in a course'); - return OK; + return &error($r,'Not in a course'); } else { $r->print('\textbf{Not in a course}\end{document}'); } @@ -79,8 +85,7 @@ ENDDOCUMENT $namespace = 'grppage_'.$marker; my %curr_groups; if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { - $r->print('Invalid group name'); - return OK; + return &error($r,'Invalid group name'); } %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker}); } else { @@ -88,9 +93,8 @@ ENDDOCUMENT $namespace = 'smppage_'.$marker; } - unless ($marker) { - $r->print('Invalid call'); - return OK; + if (!$marker) { + return &error($r,'Invalid call'); } # --------------------------------------------------------- The syllabus fields @@ -130,8 +134,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 +149,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 +308,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}'); }