[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm

[raeburn]

raeburn		Wed Nov  9 23:21:08 2016 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11
    - Backport 1.460, 1.461
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.64 loncom/interface/lonmenu.pm:1.369.2.65
--- loncom/interface/lonmenu.pm:1.369.2.64	Mon Oct 31 21:05:59 2016
+++ loncom/interface/lonmenu.pm	Wed Nov  9 23:21:08 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.64 2016/10/31 21:05:59 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.65 2016/11/09 23:21:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2502,8 +2502,14 @@
                     $include = 1;
                 }
                 if ($include) {
+                    my $rolename;
+                    if ($role =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)(?:/\w+|$)}) {
+                        $rolename = &mt('Helpdesk [_1]',$1);
+                    } else {
+                        $rolename = &Apache::lonnet::plaintext($role);
+                    }
                     push(@submenu,['javascript:adhocRole('."'$role'".')',
-                                   &Apache::lonnet::plaintext($role)]);
+                                   $rolename]);
                 }
             }
         }
@@ -2813,7 +2819,7 @@
              '/adm/parmset'      => 'opa,vpa',
              '/adm/courseprefs'  => 'opa,vpa',
              '/adm/whatsnew'     => 'whn',
-             '/adm/populate'     => 'cst',
+             '/adm/populate'     => 'cst,vpa,vcl',
              '/adm/trackstudent' => 'vsa',
              '/adm/statistics'   => 'mgr,vgr',
              '/adm/setblock'     => 'dcm,vcb',