--- loncom/interface/lonmenu.pm	2009/12/07 21:48:37	1.309.2.2
+++ loncom/interface/lonmenu.pm	2010/02/25 04:21:01	1.309.2.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.309.2.2 2009/12/07 21:48:37 raeburn Exp $
+# $Id: lonmenu.pm,v 1.309.2.13 2010/02/25 04:21:01 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();
 
@@ -290,32 +291,24 @@ sub gci_secondary_menu {
     my %linktext = (
         'review'      => 'Review Questions',
         'submit'      => 'Submit Questions',
-        'createtest'  => 'Create a Test',
+        'managetest'  => 'Manage Tests',
     );
-    my (%links,$current);
+    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}) {
             $links{$key} = '/adm/navmaps';
             $current = $key;
+            $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
         }
     }
-    $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'))) {
-            $current = $key;
-        }
-    }
+    my @menutabs = ('review','submit','managetest');
     my $tabs;
     foreach my $item (@menutabs) {
         if ($item eq $current) {
@@ -1388,25 +1381,58 @@ sub inlinemenu {
     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 (($context eq 'gcicustom') || ($context eq 'gcistudent') ||
+        ($context eq 'gcinorole')) {
+        $output='<table><tr>'.
+                '<td class="LC_mainmenu_col_fieldset">'.
+                '<div class="LC_Box LC_400Box">'.
+                '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
+                '<table>';
+        if ($context eq 'gcicustom') {
+            my $createtext = &mt('Create Concept Test');
+            if ($switcher) {
+                $createtext = &mt('Create New Test');
+            }
+            $output .= '<tr><td align="left"><a href="javascript:switchpage('."'createtest'".');"><img alt="choose role" src="/res/adm/pages/rcrs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');"><span class="LC_menubuttons_inline_text">'.$createtext.'</span></a></td></tr>';
+        }
         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>';
+            $output .= '<tr><td align="left"><a href="javascript:courseswitcher('."'icon'".');"><img alt="choose role" src="/res/adm/pages/roles.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="2">'.$switcher.'</td></tr>';
         }
-        $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>';
+        $output .= '<tr><td align="left"><a href="javascript:go('."'/adm/communicate'".');"><img alt="communication" src="/res/adm/pages/com.png" align="left" class="LC_icon" /></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/Display Messages').'</span></a></td></tr>'.
+'<tr><td align="left"><a href="javascript:go('."'/adm/preferences'".');"><img alt="user preferences" src="/res/adm/pages/pref.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/preferences'".');"><span class="LC_menubuttons_inline_text">'.&mt('Set my user preferences').'</span></a></td></tr>';
+        if ($env{'request.course.id'}) {
+            if (($context eq 'gcicustom') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+                $output.= '</td></tr></table></div></td>'.
+                          '<td class="LC_mainmenu_col_fieldset">'.
+                          '<div class="LC_Box LC_400Box">'.
+                          '<h3 class="LC_hcell">'.&mt('Test Management').'</h3>'.
+                          '<table><tr><td align="left"><a href="javascript:gonav('."'/adm/navmaps'".');"><img alt="course contents" src="/res/adm/pages/nav.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:gonav('."'/adm/navmaps'".');"><span class="LC_menubuttons_inline_text">Concept Test Contents</span></a></td></tr>'."\n".
+                          '<tr><td align="left"><a href="javascript:go('."'/adm/coursedocs'".');"><img alt="assemble test" src="/res/adm/pages/docs.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/coursedocs'".');"><span class="LC_menubuttons_inline_text">Assemble Concept Test</span></a></td></tr>'."\n".
+                          '<tr><td align="left"><a href="javascript:go('."'/adm/createuser'".');"><img alt="user privs" src="/res/adm/pages/cprv.png" align="left" class="LC_icon" /></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 align="left"><a href="javascript:go('."'/adm/whatsnew'".');"><img alt="what is new" src="/res/adm/pages/new.png" align="left" class="LC_icon" /></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>'.
+                         '<tr><td align="left"><a href="javascript:go('."'/adm/printout'".');"><img alt="print concept test" src="/res/adm/pages/prnt.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/printout'".');"><span class="LC_menubuttons_inline_text">'.&mt("Prepare Printable Concept Test").'</span></a></td></tr>'.
+                         '<tr><td align="left"><a href="javascript:go('."'/adm/statistics'".');"><img alt="Test Statistics" src="/res/adm/pages/chrt.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:go('."'/adm/statistics'".');"><span class="LC_menubuttons_inline_text">'.&mt("Concept Test Statistics").'</span></a></td></tr></table></div></td>';
+            } else {
+                my $navtext = &mt('Table of Contents');
+                if ($env{'request.role.domain'} eq 'gcitest') {
+                    $navtext = &mt('Display Test Contents');
+                }
+                $output .= '<tr><td align="left"><a href="javascript:gonav('."'/adm/navmaps'".');"><img alt="course contents" src="/res/adm/pages/nav.png" align="left" class="LC_icon" /></a></td><td class="LC_menubuttons_text" colspan="3"><a class="LC_menubuttons_link" href="javascript:gonav('."'/adm/navmaps'".');"><span class="LC_menubuttons_inline_text">'.$navtext.'</span></a></td></tr></table></div></td>';
+            }
+        } else {
+            $output.='</td></tr></table></div></td>';
         }
-        $output.='<br clear="all />';
+        if ($context eq 'gcinorole') {
+            my $queued =  &Apache::loncoursequeueadmin::queued_selfenrollment('notitle');
+            if ($queued) {
+                $output .= '<td class="LC_mainmenu_col_fieldset">'.
+                           '<div class="LC_Box LC_400Box">'.
+                           '<h3 class="LC_hcell">'.&mt('Pending Enrollment Requests').'</h3>'.
+                           $queued.
+                           '</td></tr></table></div></td>';
+            }
+        }
+        $output.='</tr></table>';
     } else {
         # calling rawconfig with "1" will evaluate mydesk.tab, 
         # even if there is no active remote control
@@ -1738,7 +1764,7 @@ sub utilityfunctions {
      
     my $gcimenujs;
     if ($custommenu) {
-        my %concepttests = &Apache::loncommon::existing_gcitest_courses();
+        my %concepttests = &Apache::loncommon::existing_gcitest_courses('cc');
         my $managetesturl = '/adm/menu';
         my $createtesturl = '/adm/requestcourse';
         if (($env{'request.course.id'}) &&
@@ -2015,7 +2041,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;