--- loncom/interface/lonmsg.pm 2006/01/30 07:32:20 1.174 +++ loncom/interface/lonmsg.pm 2006/03/16 22:12:17 1.178 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging # -# $Id: lonmsg.pm,v 1.174 2006/01/30 07:32:20 raeburn Exp $ +# $Id: lonmsg.pm,v 1.178 2006/03/16 22:12:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -774,7 +774,7 @@ sub discourse { for (i=0; iprint(""); } - $r->print(''.&Apache::loncommon::endbodytag().''); + $r->print(''.&Apache::loncommon::end_page()); } elsif ($numblocked == 0) { $r->print("

".&mt('You have no unread messages')."

"); } @@ -1259,8 +1259,9 @@ sub compout { &mt('and return receipt') . '' . $crithelp . '

'. -''; } +'

'; + } my %message; my %content; my $defdom=$env{'user.domain'}; @@ -1620,14 +1621,13 @@ sub examblock { $r->print($lt{'ncbc'}.'

'); } &display_addblocker_table($r,$parmcount,\%ltext); - my $endbody=&Apache::loncommon::endbodytag(); + my $end_page=&Apache::loncommon::end_page(); $r->print(<<"END");
-$endbody - +$end_page END return; } @@ -2081,17 +2081,15 @@ sub displayresource { sub header { my ($r,$title,$baseurl)=@_; - $r->print(&Apache::lonxml::xmlbegin(). - ''.&Apache::lonxml::fontsettings(). - 'Communication and Messages'. - &Apache::lonhtmlcommon::htmlareaheaders()); + + my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { - $r->print(""); + $extra .= ""; } - $r->print(&Apache::loncommon::studentbrowser_javascript().''. - &Apache::loncommon::bodytag('Communication and Messages')); - $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,($title?$title:'Communication and Messages'))); + $r->print(&Apache::loncommon::start_page('Communication and Messages', + $extra)); + $r->print(&Apache::lonhtmlcommon::breadcrumbs + (undef,($title?$title:'Communication and Messages'))); } @@ -2124,8 +2122,8 @@ sub storedcommentlisting { my ($r)=@_; my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef, '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($env{'form.showcommentbaseurl'}))); - $r->print(&Apache::lonxml::xmlbegin().''. - &Apache::lonxml::fontsettings().''); + $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef, + {'onlybody' => 1})); if ((keys %msgs)[0]=~/^error\:/) { $r->print(&mt('No stored comments yet.')); } else { @@ -2474,7 +2472,7 @@ sub handler { &Apache::loncommunicate::menu($r); &disall($r,($folder?$folder:$dismode)); } - $r->print(&Apache::loncommon::endbodytag().''); + $r->print(&Apache::loncommon::end_page()); return OK; } # ================================================= Main program, reset counter