--- loncom/interface/lonmenu.pm 2009/12/14 23:03:27 1.309.2.3 +++ loncom/interface/lonmenu.pm 2010/09/03 19:20:47 1.309.2.15 @@ -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.15 2010/09/03 19:20:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -131,6 +131,7 @@ use Apache::lonhtmlcommon(); use Apache::loncommon(); use Apache::lonenc(); use Apache::lonlocal; +use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); use HTML::Entities(); @@ -286,16 +287,21 @@ sub gci_secondary_menu { my %courses = ( 'review' => 'gci_9615072b469884921gcil1', 'submit' => 'gci_1H96711d710194bfegcil1', + 'tutorial' => 'gci_5422913620b814c90gcil1', ); my %linktext = ( 'review' => 'Review Questions', 'submit' => 'Submit Questions', 'managetest' => 'Manage Tests', + 'tutorial' => 'Tutorials', ); my %links = ( '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}) { @@ -304,7 +310,7 @@ sub gci_secondary_menu { $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu'; } } - my @menutabs = ('review','submit','managetest'); + my @menutabs = ('review','submit','managetest','tutorial'); my $tabs; foreach my $item (@menutabs) { if ($item eq $current) { @@ -1377,29 +1383,56 @@ sub inlinemenu { undef(@inlineremote); undef(%category_members); my $output; - if ($context eq 'gcicustom') { - my $createtext = &mt('Create Concept Test'); - if ($switcher) { - $createtext = &mt('Create New Test'); - } + if (($context eq 'gcicustom') || ($context eq 'gcistudent') || + ($context eq 'gcinorole')) { $output='