--- loncom/interface/lonannounce.pm 2006/03/15 21:55:43 1.46 +++ loncom/interface/lonannounce.pm 2006/03/23 22:32:10 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.46 2006/03/15 21:55:43 albertel Exp $ +# $Id: lonannounce.pm,v 1.48 2006/03/23 22:32:10 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -366,12 +366,8 @@ sub handler { 'dlsav' => -1 )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -The LearningOnline Network with CAPA - - ENDDOCUMENT + if ($pickdatemode) { # no big header in pickdate mode - $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1). + $r->print(&Apache::loncommon::start_page("Pick a Date",$js, + {'only_body' => 1,}). &dialscript(). ''); } else { - $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + $r->print(&Apache::loncommon::start_page("Announcements and Calendar", + $js)); } # does this user have privileges to post, etc? my $allowed=0; @@ -507,7 +505,8 @@ SERVERANNOUNCE if (($year<1970) || ($year>2037)) { $r->print('

No calendar available for this date.

'. 'Current Month'); + '&year='.$todayhash{'year'}.'">Current Month'. + &Apache::loncommon::end_page()); return OK; } $r->print( @@ -572,8 +571,7 @@ SERVERANNOUNCE '   '.&mt('Current Month').'

'. - ($pickdatemode?'':''). - ''); + ($pickdatemode?'':'').&Apache::loncommon::end_page()); return OK; }