--- loncom/interface/lonmainmenu.pm 2009/12/15 05:17:52 1.8.4.5
+++ loncom/interface/lonmainmenu.pm 2010/01/05 15:27:31 1.8.4.6
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# displays the main menu
#
-# $Id: lonmainmenu.pm,v 1.8.4.5 2009/12/15 05:17:52 raeburn Exp $
+# $Id: lonmainmenu.pm,v 1.8.4.6 2010/01/05 15:27:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,15 +67,19 @@ sub handler {
$utility
ENDSCRIPT
- } elsif ($custommenu) {
+ } elsif (($custommenu) || ($env{'user.domain'} eq 'gcitest')) {
+ my $role = 'st';
+ if ($custommenu) {
+ $role = 'cc';
+ }
my $switcher_js;
- my %courses = &Apache::loncommon::existing_gcitest_courses();
+ my %courses = &Apache::loncommon::existing_gcitest_courses($role);
my $numcourses = keys(%courses);
if ($numcourses > 0) {
- $switcher = &gcitest_switcher(%courses);
+ $switcher = &gcitest_switcher($role,%courses);
my $current;
if ($env{'request.course.id'}) {
- $current = 'cc./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
+ $current = $role.'./'.$env{'course.'.$env{'request.course.id'}.'.domain'}.
'/'.$env{'course.'.$env{'request.course.id'}.'.num'};
}
$switcher_js = &gcitest_switcher_js($current,$numcourses);
@@ -101,6 +105,8 @@ ENDSCRIPT
{'bread_crumbs' => 1}));
if ($custommenu) {
$r->print(&Apache::lonmenu::inlinemenu('gcicustom',$switcher).$form);
+ } elsif ($env{'user.domain'} eq 'gcitest') {
+ $r->print(&Apache::lonmenu::inlinemenu('gcistudent',$switcher).$form);
} else {
$r->print(&Apache::lonmenu::inlinemenu().$form);
}
@@ -109,7 +115,7 @@ ENDSCRIPT
}
sub gcitest_switcher {
- my (%courses) = @_;
+ my ($role,%courses) = @_;
my $output;
my %Sortby;
foreach my $course (sort(keys(%courses))) {
@@ -141,7 +147,7 @@ sub gcitest_switcher {
foreach my $item (@sorted_courses) {
foreach my $course (@{$Sortby{$item}}) {
my ($cdom,$cnum) = split('_',$course);
- $output .= '';
+ $output .= '';
}
}
$output .= '';