--- loncom/interface/lonmenu.pm	2010/08/24 09:11:38	1.337
+++ loncom/interface/lonmenu.pm	2011/01/13 19:43:12	1.341
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.337 2010/08/24 09:11:38 wenzelju Exp $
+# $Id: lonmenu.pm,v 1.341 2011/01/13 19:43:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,7 +214,18 @@ 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 {
             $menu .= prep_menuitem($menuitem);
         }
@@ -261,7 +272,8 @@ sub secondary_menu {
     my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec); 
     my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); 
     my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec); 
-    my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec); 
+    my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
+    my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec); 
     my $author        = getauthor();
 
     my $showlink = &show_return_link();
@@ -281,10 +293,10 @@ sub secondary_menu {
                 && !($env{'request.state'} eq 'construct');
         next if    $$menuitem[4]   =~ /^mdc/
                 && !$canedit;
-        next if    $$menuitem[4]  eq 'mdcCourse'
-                && $crstype eq 'Community';
-        next if    $$menuitem[4]  eq 'mdcCommunity'
-                && $crstype ne 'Community';
+        next if    $$menuitem[4]  eq 'nvgr'
+                && $canvgr;
+        next if    $$menuitem[4]  eq 'vgr'
+                && !$canvgr;
         next if    $$menuitem[4]   eq 'cst'
                 && !$canmodifyuser;
         next if    $$menuitem[4]   eq 'whn'
@@ -1123,6 +1135,10 @@ sub utilityfunctions {
     # it is split into 3 parts and the inputfields for title and path are left out
     # these fields are inserted later to set the values for title and path
     # automatically via JavaScript (document.title and location.pathname) 
+    my %folders = &Apache::lonnet::get('wishlist',['folders']);
+    if ($folders{'folders'} eq '') {
+        $folders{'folders'} = '<option value="" selected="selected">('.&mt('Top level').')</option>';
+    }
     my $in_page_wishlistlink1 = '<h1>'.&mt('Set a link to wishlist').'</h1>'.
                                 '<form method="post" name="newlink" action="/adm/wishlist?mode=set" '.
                                 'onsubmit="return newlinksubmit();" >'.
@@ -1140,7 +1156,7 @@ sub utilityfunctions {
                                 '<br/><br/>'.
                                 '<input type="submit" value="'.&mt('Save in').'" />'.
                                 '<select name="folders">'.
-                                &Apache::lonwishlist::getfoldersOption().
+                                $folders{'folders'}.
                                 '</select>'.
                                 '<input type="button" value="'.&mt('cancel').'" onclick="javascript:window.close();" />'.
                                 '</form>';
@@ -1560,7 +1576,7 @@ function adhocRole(roleitem) {
             secok = 0;
             var numrolesec = rolesections[selidx].length;
             var msgidx = numsec[selidx] - numrolesec;
-            secchoice = prompt("$lt{'this'}\\n"+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
+            secchoice = prompt("$lt{'this'} "+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
             if (secchoice == '') {
                 if (msgidx > 0) {
                     secok = 1;