--- loncom/interface/lonmenu.pm 2006/02/21 20:14:49 1.165 +++ loncom/interface/lonmenu.pm 2006/03/28 20:11:52 1.168 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.165 2006/02/21 20:14:49 raeburn Exp $ +# $Id: lonmenu.pm,v 1.168 2006/03/28 20:11:52 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -279,9 +279,9 @@ $groups Logo LON-CAPA -$form +$form @@ -1235,7 +1235,6 @@ sub handler { $env{'browser.interface'} ne 'textual') { $form=&serverform(); } - my $bodytag=&Apache::loncommon::bodytag('Main Menu'); my $function='student'; if ($env{'request.role'}=~/^(cc|in|ta|ep)/) { $function='coordinator'; @@ -1265,40 +1264,32 @@ ENDSCRIPT $env{'browser.interface'}='faketextual'; $env{'environment.remote'}='off'; } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(< -LON-CAPA Main Menu -$script_tag - -$bodytag -ENDHEADER + $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag)); $r->print(''.&inlinemenu().'
'.$form); - $r->print(''); + $r->print(&Apache::loncommon::end_page()); return OK; } # ================================================================ Main Program BEGIN { - if (! defined($readdesk)) { - { - my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; - if ( CORE::open( my $config,"<$tabfile") ) { - while (my $configline=<$config>) { - $configline=(split(/\#/,$configline))[0]; - $configline=~s/^\s+//; - chomp($configline); - if ($configline) { - $desklines[$#desklines+1]=$configline; - } - } - CORE::close($config); + if (! defined($readdesk)) { + { + my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab'; + if ( CORE::open( my $config,"<$tabfile") ) { + while (my $configline=<$config>) { + $configline=(split(/\#/,$configline))[0]; + $configline=~s/^\s+//; + chomp($configline); + if ($configline) { + push(@desklines,$configline); + } + } + CORE::close($config); + } + } + $readdesk='done'; } - } - $readdesk='done'; - } } 1;