--- loncom/interface/lonsyllabus.pm 2006/03/07 21:36:20 1.47 +++ loncom/interface/lonsyllabus.pm 2006/03/15 19:41:26 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.47 2006/03/07 21:36:20 www Exp $ +# $Id: lonsyllabus.pm,v 1.48 2006/03/15 19:41:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,7 +56,9 @@ sub handler { if ($homeserver eq 'no_host') { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(''.&mt('No syllabus available').''); + $r->print(&Apache::loncommon::startpage('No syllabus available'). + &mt('No syllabus available'). + &Apache::loncommon::end_page()); return OK; } # ------------------------------------- There is such a course, get environment @@ -66,10 +68,10 @@ sub handler { my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss'; if ($target ne 'tex') { my $html=&Apache::lonxml::xmlbegin(); + my $head=&Apache::loncommon::headtag('The LearningOnline Network with CAPA'); $r->print(< -The LearningOnline Network with CAPA +$head ENDDOCUMENT } else { @@ -85,27 +87,29 @@ ENDDOCUMENT # -------------------------------------------------- Let's see who handles this my $externalsyllabus=$courseenv{'externalsyllabus'}; if ($externalsyllabus=~/\w/) { - $r->print(''); + $r->print(&Apache::loncommon::endheadtag()); if ($env{'form.wrapperdisplay'} eq 'menu') { # # Producing the menu buttons # $r->print(''. - &Apache::lonmenu::menubuttons(1,'web',1).''); + &Apache::lonmenu::menubuttons(1,'web',1). + &Apache::loncommon::end_page()); } else { if ($env{'browser.interface'} eq 'textual') { # # ssi-based rendering for text-based interface # $r->print(''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($externalsyllabus).''); + &Apache::lonmenu::menubuttons(1). + &Apache::lonnet::ssi_body($externalsyllabus). + &Apache::loncommon::end_page()); } elsif ($env{'environment.remote'} eq 'off') { # # This is inline remote # $r->print(< + @@ -116,7 +120,7 @@ ENDDOCUMENTINL # frame-based rendering for graphical interface # $r->print(< + @@ -154,8 +158,8 @@ ENDDOCUMENT # ----------------------------------------------------------------- Make header if ($target ne 'tex') { $r->print(&Apache::lonhtmlcommon::htmlareaheaders(). - ''.&Apache::loncommon::bodytag - ("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); + &Apache::loncommon::endheadtag(). + &Apache::loncommon::bodytag("Syllabus",$forcestudent,$addentries,'',$cdom,$env{'form.register'})); $r->print('

'.$courseenv{'description'}.'

'. $Apache::lonnet::domaindescription{$cdom}.'

'); } else { @@ -373,7 +377,11 @@ ENDDOCUMENT $r->print('No syllabus information provided.'); if ($target ne 'tex') {$r->print('

');} } - if ($target ne 'tex') {$r->print('');} else {$r->print('\end{document}');} + if ($target ne 'tex') { + $r->print(&Apache::loncommon::end_page()); + } else { + $r->print('\end{document}'); + } return OK; }