--- loncom/interface/lonmenu.pm 2005/12/01 19:00:46 1.164 +++ loncom/interface/lonmenu.pm 2006/03/16 22:12:17 1.166 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.164 2005/12/01 19:00:46 albertel Exp $ +# $Id: lonmenu.pm,v 1.166 2006/03/16 22:12:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,7 +64,8 @@ sub initlittle { 'Roles':'Courses'), 'docs' => 'Course Documents', 'exit' => 'Exit', - 'launch' => 'Launch Remote Control'); + 'launch' => 'Launch Remote Control', + 'groups' => 'Groups'); } # ============================= This gets called at the top of the body section @@ -82,6 +83,8 @@ sub menubuttons { my $navmaps=''; my $reloadlink=''; my $docs=''; + my $groups=''; + my $showgroups=0; my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'})); my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'})); my $face= 'face="Arial,Helvetica,sans-serif"'; @@ -92,6 +95,18 @@ sub menubuttons { $escurl = &Apache::lonnet::escape($returnurl); } } + if ($env{'request.course.id'}) { + my %coursegroups; + my $viewgrps_permission = + &Apache::lonnet::allowed('vcg',$env{'request.course.id'}); + if (!$viewgrps_permission) { + %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'}); + } + if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) { + $showgroups = 1; + } + } + if ($env{'browser.interface'} eq 'textual') { # Textual display only $pgbg='#FFFFFF'; @@ -114,6 +129,12 @@ ENDRELOAD $lt{'docs'} ENDDOCS } + if ($showgroups) { + $groups =(< +$lt{'groups'} +ENDGROUPS + } } my $form=&serverform(); my $utility=&utilityfunctions(); @@ -123,7 +144,7 @@ ENDDOCS $utility $lt{'main'} -$reloadlink $navmaps $docs +$reloadlink $navmaps $docs $groups $lt{'roles'} $lt{'exit'}
@@ -192,6 +213,12 @@ ENDNAV $lt{'docs'} ENDDOCS } + if ($showgroups) { + $groups =(< +$lt{'groups'} +ENDGROUPS + } if ( ($env{'request.noversionuri'}=~m[^/(res|public)/] && $env{'request.symb'} eq '') @@ -239,6 +266,7 @@ $utility $reloadlink $navmaps $docs +$groups $lt{'launch'} @@ -1207,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'; @@ -1237,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')); $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;