--- loncom/interface/lonmenu.pm	2009/12/07 20:04:18	1.309.2.1
+++ loncom/interface/lonmenu.pm	2010/12/07 04:33:49	1.309.2.24
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.309.2.1 2009/12/07 20:04:18 raeburn Exp $
+# $Id: lonmenu.pm,v 1.309.2.24 2010/12/07 04:33:49 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();
 
@@ -150,7 +151,10 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
+    return '<li><a' 
+           # highlighting for new messages
+           . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') 
+           . qq| href="$$menuitem[0]" target="_top">$link</a></li>|;
 }
 
 # primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -161,8 +165,17 @@ sub prep_menuitem {
 sub primary_menu {
     my $menu;
     my $custommenu = &Apache::loncommon::needs_gci_custom();
+    my $numdc = &Apache::loncommon::check_for_gci_dc();
+    my %allnums = &Apache::loncommon::get_faculty_cnums();
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition)
+    my ($public,$faculty);
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
+        $public = 1;
+    } elsif (ref($allnums{$env{'user.domain'}}) eq 'HASH') {
+        $faculty = 1;
+    }
     foreach my $menuitem (@primary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)       ne 'ARRAY';    #
@@ -171,11 +184,18 @@ sub primary_menu {
         next if    $$menuitem[4]        eq 'newmsg'    # arrived or not
                 && !&Apache::lonmsg::mynewmail();      # 
         next if    $$menuitem[4]        !~ /public/    ##we've a public user, 
-                && $env{'user.name'}    eq 'public'    ##who should not see all 
-                && $env{'user.domain'}  eq 'public';   ##links
+                && $public;                            ##who should not see all 
+                                                       ##links
         next if    $$menuitem[4]        eq 'onlypublic'# hide links which are 
-                && $env{'user.name'}    ne 'public'    # only visible to public
-                && $env{'user.domain'}  ne 'public';   # users
+                && !$public;                           # only visible to public
+                                                       # users
+        next if    $$menuitem[4]        eq 'ci'
+                && (!$custommenu || $env{'request.role'} =~ m{^st\./\w+citest/});
+        next if    $$menuitem[4]        eq 'home'
+                && (($custommenu) || ($env{'user.domain'} =~ /^\w+citest$/) || 
+                    ($faculty && !$numdc));
+        next if    $$menuitem[4]        eq 'citest'
+                && ($faculty || ($env{'request.role'} eq 'cm'));
         next if    $$menuitem[4]        eq 'roles'     # hide links which are
                 && $custommenu;                        # not visible when GCI
         next if    $$menuitem[4]        eq 'courses'   # tabbed interface in use
@@ -187,11 +207,20 @@ sub primary_menu {
         
             
         if ($$menuitem[3] eq 'Help') { # special treatment for helplink
-            $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+            if ($public) {
+                my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+                my $defdom = &Apache::lonnet::default_login_domain();
+                my $to = &Apache::loncommon::build_recipient_list(undef,
+                                                                  'helpdeskmail',
+                                                                  $defdom,$origmail);
+                if ($to ne '') {
+                    $menu .= &prep_menuitem($menuitem);
+                }
+            } else {
+                $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+            }
         } else {
-            my @items = @{$menuitem};
-            $items[0] = 'javascript:'.$menuitem->[0].';';
-            $menu .= &prep_menuitem(\@items);
+            $menu .= &prep_menuitem($menuitem);
         }
     }
 
@@ -212,10 +241,16 @@ sub secondary_menu {
                      $env{'user.domain'}, $env{'user.name'},
                      $env{'course.' . $env{'request.course.id'} . '.domain'},
                      $env{'course.' . $env{'request.course.id'} . '.num'});
+    my $custommenu = &Apache::loncommon::needs_gci_custom();
+    my $numdc = &Apache::loncommon::check_for_gci_dc();
+    my $role = $env{'request.role'};
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
-        next if    $$menuitem[4]   ne 'always'
+        next if    $$menuitem[4]   eq 'showmenu'
+                && ($custommenu || (!$numdc && $role eq 'cm'));
+        next if    $$menuitem[4]   ne 'showmenu'
+                && $$menuitem[4]   ne 'author'
                 && !$env{'request.course.id'};
         next if    $$menuitem[4]   eq 'showreturn'
                 && !$showlink
@@ -237,8 +272,9 @@ sub secondary_menu {
         next if    $$menuitem[4]   =~ /showgroups$/
                 && !$canviewgrps
                 && !%groups;
-
-        if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
+        next if   $$menuitem[4]  eq 'showroles'
+                && ($custommenu || !$numdc || ($numdc && $env{'request.noversionuri'} eq '/adm/roles'));
+        if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'} && !$custommenu) {
             # special treatment for role selector
             my $roles_selector = &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
@@ -283,46 +319,63 @@ sub secondary_menu {
 }
 
 sub gci_secondary_menu {
-    my %courses = (
-        'review' => 'gci_9615072b469884921gcil1',
-        'submit' => 'gci_1H96711d710194bfegcil1',
-    );
+    my %courses;
+    my $inventory;
+    if ($env{'user.domain'} =~ /^(\w+ci)test$/) {
+        $inventory = $1;
+    } else {
+        $inventory = $env{'user.domain'};
+    }
+    my %allnums = &Apache::loncommon::get_faculty_cnums();
+    if (($inventory ne '') && (ref($allnums{$inventory}) eq 'HASH')) {
+        foreach my $key (keys(%{$allnums{$inventory}})) {
+            $courses{$key} = $inventory.'_'.$allnums{$inventory}->{$key};
+        }
+    }
+
     my %linktext = (
         'review'      => 'Review Questions',
         'submit'      => 'Submit Questions',
-        'createtest'  => 'Create a Test',
+        'managetest'  => 'Manage Tests',
+        'tutorial'    => 'Tutorials',
     );
-    my (%links,$current);
+    my (%links,@menutabs,$current,%can_request,%request_domains);
+    my %concepttests = &Apache::loncommon::existing_gcitest_courses('cc');
+    my $canreq = &Apache::lonnet::check_can_request($env{'user.domain'}.'test',
+                                                    \%can_request,\%request_domains);
+    if (($canreq) || (keys(%concepttests) > 0)) { 
+        %links = (
+                     'managetest' => '/adm/menu',
+                 );
+        $current = 'managetest';
+    }
+    if ($env{'form.destinationurl'} eq '/adm/ci_info') {
+        undef($current);
+    }
     foreach my $key (keys(%courses)) {
         $links{$key} = "javascript:switchpage('$key');";
         if ($env{'request.course.id'} eq $courses{$key}) {
-            $links{$key} = '/adm/navmaps';
-            $current = $key;
-        }
-    }
-    $links{'createtest'} = "javascript:switchpage('createtest');";
-    if (($ENV{'REQUEST_URI'} eq '/adm/requestcourse') ||
-        ($env{'form.orgurl'} eq '/adm/requestcourse')) {
-        $current = 'createtest';
-    }
-    my @menutabs = ('review','submit','createtest');
-    if ($env{'user.adv'}) {
-        my $key = 'managetest';
-        push(@menutabs,$key);
-        $linktext{$key} = 'Manage Tests';
-        $links{$key} = "javascript:switchpage('$key');";
-        if (($current eq '') && (($ENV{'REQUEST_URI'} eq '/adm/menu') ||
-            ($env{'form.orgurl'} eq '/adm/menu'))) {
+            if ($env{'environment.remotenavmap'} eq 'on') {
+                $links{$key} = "javascript:gonav('/adm/navmaps')";
+            } else {
+                $links{$key} = '/adm/navmaps';
+            }
             $current = $key;
+            if (($canreq) || (keys(%concepttests) > 0) {
+                $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
+            }
         }
     }
+    my @posstabs = ('review','submit','managetest','tutorial');
     my $tabs;
-    foreach my $item (@menutabs) {
+    foreach my $item (@posstabs) {
+        next if ($links{$item} eq '');
+        push(@menutabs,$item);
         if ($item eq $current) {
-            $tabs .= ' <li id="current"><a href="'.$links{$item}.'">'.
+            $tabs .= '<li id="current"><a href="'.$links{$item}.'">'.
                      $linktext{$item}.'</a></li>';
         } else {
-            $tabs .= ' <li><a href="'.$links{$item}.'">'.
+            $tabs .= '<li><a href="'.$links{$item}.'">'.
                      $linktext{$item}.'</a></li>';
         }
     }
@@ -522,6 +575,11 @@ ENDINLINEMENU
 }
 
 sub show_return_link {
+    return unless ($env{'request.course.id'});
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
+        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
+        return if ($env{'form.register'});
+    }
     return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
 	     $env{'request.symb'} eq '')
 	    ||
@@ -530,7 +588,7 @@ sub show_return_link {
 	    (($env{'request.noversionuri'}=~/^\/adm\//) &&
 	     ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
 	     ($env{'request.noversionuri'}!~
-	      m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
+	      m[^/adm/.*/(smppg|bulletinboard)($|\?)])
 	     ));
 }
 
@@ -603,9 +661,17 @@ sub innerregister {
         } else {
             $contentstext = &mt('Course Contents');
         }
-        my @crumbs = ({text  => $contentstext, 
-                       href  => "Javascript:gonav('/adm/navmaps')"});
-
+        my @crumbs;
+        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
+                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+            my $link = "javascript:gopost('/adm/navmaps','')";
+            if ($env{'environment.remotenavmap'} eq 'on') {
+                $link = "javascript:gonav('/adm/navmaps','')"
+            }
+            @crumbs = ({text  => Apache::loncommon::course_type()
+                                . ' Contents',
+                        href  => $link});
+        }
         if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
             push(@crumbs, {text  => '...',
                            no_mt => 1});
@@ -849,7 +915,7 @@ $menuitems.="Make notes and annotations
                                 "&go('/adm/requestcourse')&Course requests\n";
                 }
             }
-            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|portfolio)(\?|$)/) {
 		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
@@ -889,41 +955,32 @@ ENDMENUITEMS
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
 	    my $inlinebuttons='';
+
     if ($addremote) {
 
-        #SD START (work in progress!)
         Apache::lonhtmlcommon::clear_breadcrumb_tools();
-        # Arrows for navigation
-        Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[21] );
-        Apache::lonhtmlcommon::add_breadcrumb_tool( 'A', $inlineremote[23] );
-        if(hidden_button_check() ne 'yes'){
-            # notes
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[93]);
-            # bookmark
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[91]);
-            # evaluate
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[81]);
-            # feedback
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[82]);
-            # print
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[83]);
-            # metadata
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'B', $inlineremote[63]);
-
-            # ?
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[61]);
-            # ?
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[71]);
-            # ?
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[72]);
-            # ?
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[73]);
-            # ?
-            Apache::lonhtmlcommon::add_breadcrumb_tool( 'C', $inlineremote[92]);
 
+            Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'navigation', @inlineremote[21,23]);
+        if(hidden_button_check() ne 'yes') {
+            Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'tools', @inlineremote[93,91,81,82,83]);
+
+            #publish button in construction space
+            if ($env{'request.state'} eq 'construct'){
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'advtools', @inlineremote[63]);
+            }else{
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'tools', @inlineremote[63]);
+            }
+
+            unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'advtools', @inlineremote[61,71,72,73,92]);
+            }
         }
 
-        #SD END
 #       # Registered, textual output
 #        if ( $env{'environment.icons'} eq 'iconsonly' ) {
 #            $inlinebuttons = (<<ENDARROWSINLINE);
@@ -1384,34 +1441,147 @@ sub openmenu {
 }
 
 sub inlinemenu {
-    my ($context,$switcher) = @_;
+    my ($context) = @_;
     undef(@inlineremote);
     undef(%category_members);
     my $output;
     if ($context eq 'gcicustom') {
-        $output.='<div class="LC_left_float">'.
-                 '<fieldset id="LC_mainmenu_fieldset">'.
-                 '<legend class="LC_mainmenu_fieldset_category">'.&mt('Utilities').'</legend>'.
-                '<table id="LC_menubuttons_mainmenu">';
-        if ($switcher) {
-            $output .= '<tr><td class="LC_menubuttons_img" align="left"><a href="javascript:courseswitcher('."'icon'".');"><img alt="choose role" src="/res/adm/pages/roles.png" align="left" /></a></td><td class="LC_menubuttons_text" colspan="3"><span class="LC_menubuttons_inline_text">'.$switcher.'</span></td></tr>';
+        my (%can_request,%request_domains,$canreq,$createtext);
+        my $role = 'st';
+        my $custommenu = &Apache::loncommon::needs_gci_custom();
+        if ($custommenu) {
+            $role = 'cc';
+        }
+        my %courses = &Apache::loncommon::existing_gcitest_courses($role);
+        my $numcourses = keys(%courses);
+        my ($switcher_js,$switcher);
+        my $formname = 'testpicker';
+        if ($numcourses > 0) {
+            $switcher = &Apache::loncommon::gcitest_switcher($role,$formname,%courses);
+            my $current;
+            my $cid = $env{'request.course.id'};
+            if ($cid) {
+                $current = $role.'./'.$env{'course.'.$cid.'.domain'}.
+                           '/'.$env{'course.'.$cid.'.num'};
+            }
+            $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses,$formname);
+            if ($switcher_js) {
+                $switcher_js= <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+
+$switcher_js
+
+// ]]>
+</script>
+
+ENDSCRIPT
+            }
+            $switcher = $switcher_js.$switcher;
         }
-        $output .= '<tr><td class="LC_menubuttons_img" align="left"><a href="javascript:go('."'/adm/communicate'".');"><img alt="communication" src="/res/adm/pages/com.png" align="left" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/communicate'".');"><span class="LC_menubuttons_inline_text">'.&mt('Send and display messages').'</span></a></td></tr></table></fieldset></div>';
-        if (($env{'request.course.id'}) &&
-            (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
-            $output.= '<div class="LC_left_float">'.
-                '<fieldset id="LC_mainmenu_fieldset">'.
-                '<legend class="LC_mainmenu_fieldset_category">'.&mt('Test Management').'</legend>'.
-                '<table id="LC_menubuttons_mainmenu">'.
-                '<tr><td class="LC_menubuttons_img" align="left"><a href="javascript:go('."'/adm/createuser'".');"><img alt="user privs" src="/res/adm/pages/cprv.png" align="left" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/createuser'".');"><span class="LC_menubuttons_inline_text">'.&mt('Manage Enrollment').'</span></a></td></tr>'."\n".
-                '<tr><td class="LC_menubuttons_img" align="left"><a href="javascript:go('."'/adm/whatsnew'".');"><img alt="what is new" src="/res/adm/pages/new.png" align="left" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/whatsnew'".');"><span class="LC_menubuttons_inline_text">'.&mt("What's New?").'</span></a></td></tr></table></fieldset></div>';
+        if ($env{'user.domain'} !~ /^\w+citest$/) {
+            $canreq =
+                &Apache::lonnet::check_can_request($env{'user.domain'}.'test',\%can_request,\%request_domains);
+            $createtext = &mt('Create Concept Test');
+            if ($numcourses) {
+                $createtext = &mt('Create New Test');
+            }
+        }
+        if ($env{'request.course.id'}) {
+            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                my $navlink;
+                if ($env{'environment.remotenavmap'} eq 'on') {
+                    $navlink = "javascript:gonav('/adm/navmaps')";
+                } else {
+                    $navlink = '/adm/navmaps';
+                }
+                $output .= 
+                  '<br /><br clear="all" /><div class="LC_Box LC_GCI_Menu">'.
+                  '<h3 class="LC_hcell">'.&mt('Management').'</h3>'.
+                  '<div class="LC_GCI_Menu_left">'.
+                  '<dl class="LC_GCI_Menu">'.
+                  '<dt><a href="'.$navlink.'">'.&mt('Concept Test Contents').'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/nav.png\');"><a class="LC_menubuttons_link" href="'.$navlink.'">'.&mt('Display the table of contents for your Concept Test.').'</a></dd>'.
+                  '<dt><a href="/adm/coursedocs">'.&mt('Assemble Concept Test').'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/docs.png\');"><a class="LC_menubuttons_link" href="/adm/coursedocs">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</a></dd>'.
+                  '<dt><a href="/adm/createuser">'.&mt('Enrollment and Student Activity').'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');"><a class="LC_menubuttons_link" href="/adm/createuser">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</a></dd></dl></div>'.
+                  '<div class="LC_GCI_Menu_right"><dl class="LC_GCI_Menu">'.
+                  '<dt><a href="/adm/whatsnew">'.&mt("What's New?").'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/new.png\');"><a class="LC_menubuttons_link" href="/adm/whatsnew">'.&mt('View information about changes in your Concept Test course.').'</a></dd>'.
+                  '<dt><a href="/adm/printout">'.&mt('Prepare Printable Concept Test').'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');"><a class="LC_menubuttons_link" href="/adm/printout">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</a></dd>'.
+                  '<dt><a href="/adm/statistics">'.&mt('Concept Test Statistics').'</a></dt>'.
+                  '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');"><a class="LC_menubuttons_link" href="/adm/statistics">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</a></dd>';
+                if ($canreq) {
+                    $output .= '<dt><a href="javascript:switchpage('."'createtest'".');">'.&mt('Create New Test').'</a></dt>'.
+                               '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.
+                               &mt('Create a new Concept Test Course Container. Choose GCI questions  to include in the test and upload a student roster.').'</a></dd>';
+                }
+                $output .= '</dl></div></div><br clear="all"/>';
+            } else {
+                my $navtext = &mt('Table of Contents');
+                my $navdesc = &mt('Display Table of Contents for Geoscience Concept Inventory');
+                if ($env{'request.role.domain'} =~ /^\w+citest$/) {
+                    $navtext = &mt('Display Test Contents');
+                    $navdesc = &mt('Display the table of contents for this Concept Test');
+                }
+                my $navlink;
+                if ($env{'environment.remotenavmap'} eq 'on') {
+                    $navlink = "javascript:gonav('/adm/navmaps');"
+                } else {
+                    $navlink = '/adm/navmaps';
+                }
+                $output .= 
+                           '<div class="LC_Box LC_GCI_Menu">'.
+                           '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
+                           '<div class="LC_GCI_Menu_left">'.
+                           '<dl class="LC_GCI_Menu">'.
+                           '<dt><a href="'.$navlink.'">'.$navtext.'</dt>'.
+                           '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.
+                           '<a class="LC_menubuttons_link" href="'.$navlink.'">'.$navdesc.'</a></dd></dl></div>';
+                if ($canreq) {
+                    $output .= '<div class="LC_GCI_Menu_right">'.
+                               '<dl class="LC_GCI_Menu">'.
+                               '<dt><a href="javascript:switchpage('."'createtest'".');">'.$createtext.'</a></dt>'.
+                               '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.&mt('Create a new Concept Test Course Container').'</a>. '.&mt('Choose GCI questions to include in the test and upload a student roster.').'</dd></dl></div>';
+                }
+                $output .= '</div><br clear="all"/>';
+            }
+        } elsif ($switcher || $canreq) {
+            $output .= '<br /><br />'.
+                       '<div class="LC_Box LC_GCI_Menu">'.
+                       '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
+                       '<div class="LC_GCI_Menu_left">'.
+                       '<dl class="LC_GCI_Menu">';
+            if ($canreq) {
+                $output .= '<dt><a href="javascript:switchpage('."'createtest'".');">'.$createtext.'</a></dt>'.
+                           '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.&mt('Create a new Concept Test Course Container. Choose GCI questions to include in the test and upload a student roster.').'</a></dd></dl></div>';
+                if ($switcher) {
+                    $output .= '<div class="LC_GCI_Menu_right">'.
+                               '<dl class="LC_GCI_Menu">';
+                }
+            }
+            if ($switcher) {
+                $output .= '<dt>'.&mt('Select Concept Test').'</dt>'.
+                           '<dd style="background-image:url(\'/res/adm/pages/roles.png\');">'.$switcher.'<br /><br /></dd></dl></div>';
+            }
+            $output .= '</div><br clear="all"/>';
+        }
+    } elsif ($context eq 'gcinorole') {
+        my $queued =  &Apache::loncoursequeueadmin::queued_selfenrollment('notitle');
+        if ($queued) {
+            $output .= 
+                       '<div class="LC_Box">'.
+                       '<h3 class="LC_hcell">'.&mt('Pending Enrollment Requests').'</h3>'.
+                       $queued.
+                       '</div>';
         }
-        $output.='<br clear="all />';
-    } else 
+    } else {
         # calling rawconfig with "1" will evaluate mydesk.tab, 
         # even if there is no active remote control
         &rawconfig(1);
-        my $output='<table><tr>';
+        $output='<table><tr>';
         for (my $col=1; $col<=2; $col++) {
             $output.='<td class="LC_mainmenu_col_fieldset">';
             for (my $row=1; $row<=8; $row++) {
@@ -1431,6 +1601,7 @@ sub inlinemenu {
                     }
                     $output.='</table>';
                     $output.='</div>';
+                }
             }
             $output.="</td>";
         }
@@ -1737,42 +1908,55 @@ sub utilityfunctions {
      
     my $gcimenujs;
     if ($custommenu) {
-        my %concepttests = &Apache::loncommon::existing_gcitest_courses();
-        my $managetesturl = '/adm/menu';
-        my $createtesturl = '/adm/requestcourse';
+        my %concepttests = &Apache::loncommon::existing_gcitest_courses('cc');
+        my (@calls,%switchpage_call,%canrequest,%request_domains);
+        my $canreq = &Apache::lonnet::check_can_request($env{'user.domain'}.'test',
+                                                        \%canrequest,\%request_domains);
+        if ($canreq) {
+            foreach my $call ('createtest','managetest') {
+                push(@calls,$call);
+            }
+            $switchpage_call{'managetest'} = '/adm/menu';
+            $switchpage_call{'createtest'} = '/adm/requestcourse';
+            if ($env{'request.course.id'}) {
+                $switchpage_call{'createtest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2frequestcourse';
+            }
+        }
         if (($env{'request.course.id'}) &&
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gci')) {
+            ($env{'course.'.$env{'request.course.id'}.'.domain'} !~ /^\w+citest$/)) {
             my @items = keys(%concepttests);
-            if (@items== 1) {
+            if (@items==1) {
                 my $newrole = $items[0];
                 $newrole =~ s{_}{/};
-                $managetesturl = '/adm/roles?selectrole=1&cc./'.$newrole.'=1';
+                $switchpage_call{'managetest'} = '/adm/roles?selectrole=1&cc./'.$newrole.'=1';
             } else {
-                $managetesturl = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
+                $switchpage_call{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
             }
         }
-        if ($env{'request.course.id'}) {
-            $createtesturl = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2frequestcourse';
+        my %allnums = &Apache::loncommon::get_faculty_cnums();
+        my $udom = $env{'user.domain'};
+        if (ref($allnums{$udom}) eq 'HASH') {
+            foreach my $key (keys(%{$allnums{$udom}})) {
+                $switchpage_call{$key} = '/adm/roles?selectrole=1&'.
+                                         'st./'.$udom.'/'.$allnums{$udom}->{$key}.'=1';
+                push(@calls,$key);
+            }
         }
-        $gcimenujs = <<"ENDCUSTOM";
-
+        if (@calls > 0) {
+            $gcimenujs = '
 function switchpage(caller) {
-    if (caller == 'review') {
-        document.location.href = '/adm/roles?selectrole=1&st./gci/9615072b469884921gcil1=1';
-    }
-    if (caller == 'submit') {
-        document.location.href = '/adm/roles?selectrole=1&st./gci/1H96711d710194bfegcil1=1';
-    }
-    if (caller == 'createtest') {
-        document.location.href = '$createtesturl';
-    }
-    if (caller == 'managetest') {
-        document.location.href = '$managetesturl';
-    }
+';
+            foreach my $call (@calls) {
+                $gcimenujs .= " 
+    if (caller == '$call') {
+        document.location.href = '$switchpage_call{$call}';
+    }";
+            }
+            $gcimenujs .= '
     return;
 }
-
-ENDCUSTOM
+';
+        }
     }
        
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
@@ -1832,12 +2016,6 @@ function go(url) {
    }
 }
 
-function gotop(url) {
-    if (url!='' && url!= null) {
-        top.location.href = url;
-    }
-}
-
 function gopost(url,postdata) {
    if (url!='') {
       this.document.server.action=url;
@@ -2014,7 +2192,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;