--- loncom/interface/lonmenu.pm	2010/08/24 09:11:38	1.337
+++ loncom/interface/lonmenu.pm	2011/01/16 22:45:05	1.342
@@ -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.342 2011/01/16 22:45:05 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,8 +107,6 @@ entries from mydesk.tab
 
 Same as primary_menu() but operates on @secondary_menu.
 
-=item show_return_link()
-
 =item innerregister()
 
 This gets called in order to register a URL in the body of the document
@@ -214,7 +212,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,10 +270,10 @@ 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();
     my %groups = &Apache::lonnet::get_active_groups(
                      $env{'user.domain'}, $env{'user.name'},
                      $env{'course.' . $env{'request.course.id'} . '.domain'},
@@ -276,15 +285,12 @@ sub secondary_menu {
         next if    $$menuitem[4]   ne 'always'
                 && $$menuitem[4]   ne 'author'
                 && !$env{'request.course.id'};
-        next if    $$menuitem[4]   eq 'showreturn'
-                && !$showlink
-                && !($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'
@@ -334,24 +340,6 @@ sub secondary_menu {
     return "<ul id=\"LC_secondary_menu\">$menu</ul>";
 }
 
-sub show_return_link {
-    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 '')
-	    ||
-	    ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
-	    ||
-	    (($env{'request.noversionuri'}=~/^\/adm\//) &&
-	     ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-	     ($env{'request.noversionuri'}!~
-	      m{^/adm/.*/(smppg|bulletinboard)($|\?)})
-           ));
-}
-
 sub innerregister {
     my ($forcereg,$bread_crumbs) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
@@ -601,8 +589,8 @@ ENDMENUITEMS
 #
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
-s&2&1&back.png&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&&1
-s&2&3&forw.png&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&&3
+s&2&1&back.png&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
 c&8&1
 c&8&2
@@ -674,34 +662,34 @@ ENDMENUITEMS
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
     if ($addremote) {
 
-        Apache::lonhtmlcommon::clear_breadcrumb_tools();
+        &Apache::lonhtmlcommon::clear_breadcrumb_tools();
 
-            Apache::lonhtmlcommon::add_breadcrumb_tool(
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
                 'navigation', @inlineremote[21,23]);
 
         if(hidden_button_check() ne 'yes') {
-            Apache::lonhtmlcommon::add_breadcrumb_tool(
+            &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(
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
                      'advtools', @inlineremote[63]);
-            }else{
-                Apache::lonhtmlcommon::add_breadcrumb_tool(
+            } else {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
                      'tools', @inlineremote[63]);
             }
             
             unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
-                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
                     'advtools', @inlineremote[61,71,72,73,92]);
             }
         }
     }
 
-    return   Apache::lonhtmlcommon::scripttag('', 'start')
-           . Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
-           . Apache::lonhtmlcommon::scripttag('', 'end');
+    return   &Apache::lonhtmlcommon::scripttag('', 'start')
+           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+           . &Apache::lonhtmlcommon::scripttag('', 'end');
 }
 
 sub is_course_upload {
@@ -1123,6 +1111,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 +1132,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 +1552,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;