[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm mydesk.tab

[raeburn]

raeburn		Wed Oct 26 14:51:45 2016 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  - "Slots" item inn inline menu for either vgr or mgr privs.
  - "People" > Users points at /adm/createuser for either cst or vcl privs.  
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.455 loncom/interface/lonmenu.pm:1.456
--- loncom/interface/lonmenu.pm:1.455	Sun Oct 16 21:49:51 2016
+++ loncom/interface/lonmenu.pm	Wed Oct 26 14:51:44 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.455 2016/10/16 21:49:51 raeburn Exp $
+# $Id: lonmenu.pm,v 1.456 2016/10/26 14:51:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -416,7 +416,7 @@
                 $showfeeds = 1;
             }
         }
-        unless ($canmgr) {
+        unless (($canmgr || $canvgr)) {
             my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
             if (keys(%slots) > 0) {
                 $showresv = 1;
@@ -458,9 +458,9 @@
                 && $canvgr;
         next if    $$menuitem[4]  eq 'vgr'
                 && !$canvgr;
-        next if    $$menuitem[4]   eq 'cst'
+        next if    $$menuitem[4]   eq 'viewusers'
                 && !$canmodifyuser && !$canviewusers;
-        next if    $$menuitem[4]   eq 'ncst'
+        next if    $$menuitem[4]   eq 'noviewusers'
                 && ($canmodifyuser || $canviewusers || !$canviewroster);
         next if    $$menuitem[4]   eq 'mgr'
                 && !$canmgr;
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.171 loncom/interface/mydesk.tab:1.172
--- loncom/interface/mydesk.tab:1.171	Sat Oct 22 20:05:19 2016
+++ loncom/interface/mydesk.tab	Wed Oct 26 14:51:45 2016
@@ -66,12 +66,13 @@
 #   - showsyllabus: course context and user has mdc priv, or syllabus exists
 #                   (and not included in course content).
 #   - showfeeds: course context and user has mdc priv, or course feeds exist
-#   - showresv: course context and user cannot manage grades, and slots exist
+#   - showresv: course context and user cannot view or manage grades, and slots exist
 #   - always: show this link even if user hasn't selected a role
 #   - whn: access what's new
-#   - cst: Grant/revoke role of Student:Grant/revoke role of Member 
-#   - ncst: Not grant/revoke roles
+#   - vgr: user can view grades
+#   - viewusers: user can grant/revoke student/member roles or can view classlists
 #   - params: Set and/or view assessment parameters
+#   - noviewusers: user can neither grant/revoke student roles nor view classlists
 #   - nvgr: cannot view other people's grades 
 #   - mgr: Manage grades
 #   - author: authors (au, ca, aa)
@@ -80,11 +81,11 @@
 scnd:/adm/whatsnew:::What's New:whn
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
 scnd:/adm/quickgrades:::Grades:nvgr
-scnd:/adm/createuser:::People:cst
-scnd:/adm/viewclasslist:::People:ncst
+scnd:/adm/createuser:::People:viewusers
+scnd:/adm/viewclasslist:::People:noviewusers
 scnd:/adm/coursegroups:::Groups:showgroups
 scnd:/adm/slotrequest?command=manageresv:::Reservations:showresv
-scnd:/adm/slotrequest?command=showslots:::Slots:mgr
+scnd:/adm/slotrequest?command=showslots:::Slots:vgr
 scnd:/adm/grades:::Grades:vgr
 scnd:/adm/parmset:::Settings:params
 scnd:/public/[cdom]/[cnum]/syllabus:::Syllabus:showsyllabus