--- loncom/interface/lonwhatsnew.pm 2006/03/04 05:59:01 1.51 +++ loncom/interface/lonwhatsnew.pm 2006/05/01 19:37:34 1.54 @@ -1,5 +1,5 @@ # -# $Id: lonwhatsnew.pm,v 1.51 2006/03/04 05:59:01 albertel Exp $ +# $Id: lonwhatsnew.pm,v 1.54 2006/05/01 19:37:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -100,32 +100,32 @@ sub handler { ({href=>'/adm/whatsnew?command=chgthreshold&refpage='.$refpage, text=>"Change thresholds"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Thresholds' + ("What's New?",#'Course_Action_Items_Thresholds' )); } elsif (($command eq 'chginterval') && $checkallowed{'versionchanges'} ) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=chginterval&refpage='.$refpage, text=>"Change interval"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Intervals' + ("What's New?",#'Course_Action_Items_Intervals' )); } elsif (($command eq 'chgdisc') && $checkallowed{'coursediscussion'}) { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=chgdisc&refpage='.$refpage, text=>"Change discussion display"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Intervals' + ("What's New?",#'Course_Action_Items_Intervals' )); } elsif ($command eq 'courseinit') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/whatsnew?command=courseinit&refpage='.$refpage, text=>"Course initialization preference"}); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Initialization' + ("What's New?",#'Course_Action_Items_Initialization' )); } else { $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,"What's New?",#'Course_Action_Items_Display' + ("What's New?",#'Course_Action_Items_Display' )); } &display_main_box($r,$command,$refpage,\%checkallowed); @@ -183,12 +183,12 @@ sub display_main_box { &display_actions_box($r,$tabbg,$command,$refpage,\%threshold_titles, \%interval_titles,\%initpage,$cdom,$crs,$checkallowed); } + my $end_page = &Apache::loncommon::end_page(); $r->print(<
- - +$end_page END_OF_BLOCK } @@ -201,8 +201,7 @@ END_OF_BLOCK sub display_header { my ($command,$checkallowed) = @_; - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag('Course Action Items'); + my $scripttag; unless ($command eq 'chgthreshold' || $command eq 'chginterval') { $scripttag = <<"END"; @@ -226,14 +225,7 @@ END '; } - return(< -Course Action Items -$scripttag - -$bodytag -ENDHEAD + return &Apache::loncommon::start_page('Course Action Items',$scripttag); } #------------------------------- @@ -1037,7 +1029,6 @@ sub getnormalmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$newmsgs}, { msgid => $msgid, sendtime => $sendtime, @@ -1069,7 +1060,6 @@ sub getcritmail { if ($shortsubj eq '') { $shortsubj = &mt('No subject'); } - $shortsubj = &Apache::lonnet::unescape($shortsubj); push(@{$critmsgs}, { msgid => $msgid, sendtime => $sendtime,