--- loncom/interface/lonmenu.pm 2009/12/14 23:03:27 1.309.2.3 +++ loncom/interface/lonmenu.pm 2010/01/05 13:18:11 1.309.2.6 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.309.2.3 2009/12/14 23:03:27 raeburn Exp $ +# $Id: lonmenu.pm,v 1.309.2.6 2010/01/05 13:18:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -296,6 +296,9 @@ sub gci_secondary_menu { 'managetest' => '/adm/menu', ); my $current = 'managetest'; + if ($env{'form.destinationurl'} eq '/adm/gci_info') { + undef($current); + } foreach my $key (keys(%courses)) { $links{$key} = "javascript:switchpage('$key');"; if ($env{'request.course.id'} eq $courses{$key}) { @@ -1386,11 +1389,11 @@ sub inlinemenu { ''. '
'. '

'.&mt('Utilities').'

'. - ''; + '
choose role'.$createtext.'
'; if ($switcher) { - $output .= ''; + $output .= ''; } - $output .= '
choose role'.$createtext.'
choose role'.$switcher.'
choose role'.$switcher.'
communication'.&mt('Send/Display Messages').'
'; + $output .= 'communication'.&mt('Send/Display Messages').''; if (($env{'request.course.id'}) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { $output.= ''. @@ -1398,8 +1401,8 @@ sub inlinemenu { '

'.&mt('Test Management').'

'. ''."\n". ''."\n". - ''."\n". - '
course contentsConcept Test Contents
assemble testAssemble Concept Test
user privs'.&mt('Manage Enrollment').'
what is new'.&mt("What's New?").'
'; + 'user privs'.&mt('Manage Enrollment').''."\n". + 'what is new'.&mt("What's New?").''; } $output.=''; } else { @@ -2010,7 +2013,9 @@ sub hidden_button_check { return; } if ($env{'request.role.adv'}) { - return; + unless (&Apache::loncommon::needs_gci_custom()) { + return; + } } my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide'); return $buttonshide;