--- loncom/interface/mydesk.tab	2016/10/22 20:13:14	1.149.2.21
+++ loncom/interface/mydesk.tab	2018/04/27 20:14:16	1.177
@@ -1,3 +1,4 @@
+# $Id: mydesk.tab,v 1.177 2018/04/27 20:14:16 raeburn Exp $
 # primary menu links
 # Apache::lonmenu::primary_menu() generates a menu from these elements
 # prim: item belongs to primary menu
@@ -21,6 +22,7 @@
 # prim:link:icon:alt:text:condition:position
 prim::::Personal::left
 prim:/adm/about.html:/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public:
+prim:/adm/menu:::Home::
 prim:/adm/communicate:::Messages:nonewmsg:
 prim:/adm/communicate:::New Messages:newmsg:
 prim:/adm/roles:::Roles:roles:
@@ -49,7 +51,7 @@ primsub:Personal:/adm/preferences:Prefer
 primsub:Personal:/adm/portfolio:Portfolio:portfolio
 primsub:Personal:/adm/wishlist:Stored Links:wishlist
 primsub:Personal:/adm/announcements:Calendar:
-primsub:Personal:/adm/[domain]/[user]/_rss.html:RSS Feeds:blog
+primsub:Personal:/adm/[domain]/[user]/_rss.html:Feeds:blog
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -60,43 +62,40 @@ primsub:Personal:/adm/[domain]/[user]/_r
 # text: link text
 # condition: when to show link, secondary_menu will act upon this
 #   possible conditions:
-#   - empty:
-#   - showsyllabus: course context: not mdc and syllabus exists
+#   - empty: 
+#   - showgroups: user is member of a group
+#   - showsyllabus: course context and user has mdc or cev priv, or syllabus exists
 #                   (and not included in course content).
-#   - showfeeds: course context: not mdc and course feeds exist
-#   - showresv: course context and user cannot manage grades, and slots exist
+#   - showfeeds: course context and user has mdc or cev priv, or course feeds 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
-#   - mdcCourse: user can modify content in a Course
-#   - mdcCommunity: user can modify content in a Community 
-#   - mdc: user can modify content in Course/Community 
+#   - whn: access what's new
 #   - vgr: user can view grades
-#   - cst: user can grant/revoke student/member roles
+#   - viewusers: user can grant/revoke student/member roles or can view classlists
 #   - params: Set and/or view assessment parameters
-#   - ncst: user can not grant/revoke student roles
-#   - nvcg: user can only groups in which he/she is a member
-#   - nvgr: user cannot view other people's grades
-#   - whn: user can access what's new
+#   - 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)
-# scnd:link:icon:alt:text:condition
-scnd:/adm/menu:::Main Menu:always
+#   - cca: Grant/revoke role of co-author (author only)
+# prim:link:icon:alt:text:condition
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
-scnd:/adm/quickgrades:::Grades:nvgr
-scnd:/adm/coursedocs?command=contents:::Course Editor:mdcCourse
-scnd:/adm/coursedocs?command=contents:::Community Editor:mdcCommunity
 scnd:/adm/whatsnew:::What's New:whn
+scnd:/adm/quickgrades:::Grades:nvgr
 scnd::::Grades:vgr
-scnd::::People:cst
+scnd::::People:viewusers
 scnd::::Settings:params
-scnd:/adm/viewclasslist:::People:ncst
-scnd:/adm/coursegroups:::Groups:nvcg
+scnd:/adm/viewclasslist:::People:noviewusers
+scnd:/adm/coursegroups:::Groups:showgroups
 scnd:/adm/slotrequest?command=manageresv:::Reservations:showresv
-scnd::::Public:mdc
+scnd::::Public:crsedit
 scnd:/public/[cdom]/[cnum]/syllabus:::Syllabus:showsyllabus
 scnd:/adm/[cdom]/[cnum]/_rss.html:::Feeds:showfeeds
 scnd:/adm/roles:::Roles:
 scnd:/priv/[udom]/[uname]/:::Authoring Space:author
 scnd:/res/[udom]/[uname]/?launch=1:::Browse:author
 scnd:/adm/createuser:::People:cca
+scnd::::Settings:author
 
 # secondary sub-menu links
 # Apache::lonmenu::secondary_menu() generates a sub-menus from these elements
@@ -107,22 +106,24 @@ scnd:/adm/createuser:::People:cca
 # condition: when to show link, secondary_menu() will act based on this
 #   possible conditions:
 #   - empty: link displayed if user is authenticated
-#   - mdc: user can modify content in Course/Community
+#   - crsedit: link displayed if user can access Course/Community Editor
 #   - vgr: link displayed if user can view grades
-#   - opa: link displayed if user can set assessment parameters
+#   - params: link displayed if user can set or view assessment parameters
 #   - mgr: link displayed if user can manage grades
-#   - cst: link displayed if user can grant/revoke student/member roles
-#   - vcg: link displayed if user can view groups to which he/she does not belong   
+#   - viewusers: link displayed if user can either grant/revoke student/member roles or view classlists
+#   - vcg: link displayed if user can view groups to which he/she does not belong
 # scndsub:parent:link:text:condition
 scndsub:Grades:/adm/statistics?reportSelected=student_assessment:Assessment Chart:vgr
 scndsub:Grades:/adm/statistics:Statistics and Reports:vgr
-scndsub:Settings:/adm/courseprefs:Course Settings:opa
-scndsub:Settings:/adm/parmset:Content Settings:opa
-scndsub:Settings:/adm/slotrequest?command=showslots:Slots:mgr
-scndsub:People:/adm/createuser:Users:cst
+scndsub:Settings:/adm/courseprefs:Course Settings:params
+scndsub:Settings:/adm/parmset:Content Settings:params
+scndsub:Settings:/adm/slotrequest?command=showslots:Slots:vgr
+scndsub:Settings:/adm/preferences?action=authorsettings[returnurl]:Editing Options:author
+scndsub:Settings:/adm/preferences?action=changedomcoord[returnurl]:Domain Access:cca
+scndsub:People:/adm/createuser:Users:viewusers
 scndsub:People:/adm/coursegroups:Groups:vcg
-scndsub:Public:/public/[cdom]/[cnum]/syllabus:Syllabus:mdc
-scndsub:Public:/adm/[cdom]/[cnum]/_rss.html:Feeds:mdc
+scndsub:Public:/public/[cdom]/[cnum]/syllabus:Syllabus:crsedit
+scndsub:Public:/adm/[cdom]/[cnum]/_rss.html:Feeds:crsedit
 
 # Categories for main menu
 # cat:column,row:title
@@ -151,7 +152,7 @@ cat:2,6:oth:Other
 # img-> img for the button
 # top-> txt for the top row of the remote
 # bot-> txt for the bottom row of the remote
-# act-> javascript to excute when clicked
+# act-> javascript to execute when clicked
 # txt-> text to display in the extended remote or inline remote
 # cat-> category that this belongs into (or "none" if in top menus)
 #
@@ -199,6 +200,8 @@ cat:2,6:oth:Other
 1:1:nsc:any:roles.png:switch[_2]:role[_1]:go('/adm/roles');:Switch to another user role:rol
 1:1:nsc:rcm:roles.png:choose[_2]:role[_2]:go('/adm/roles');:Choose the user role:rol
 1:2:clear
+1:2:pcev:$crs:docs.png:course[_7]:editor[_1]:go('/adm/coursedocs?command=home');:Edit course contents:crc
+1:2:pcev:$cmty:docs.png:communi-[_1]:ty edit[_1]:go('/adm/coursedocs?command=home');:Edit community contents:cmc
 1:2:pmdc:$crs:docs.png:course[_7]:editor[_1]:go('/adm/coursedocs?command=home');:Edit course contents:crc
 1:2:pmdc:$cmty:docs.png:communi-[_1]:ty edit[_1]:go('/adm/coursedocs?command=home');:Edit community contents:cmc
 2:1:clear
@@ -207,9 +210,12 @@ cat:2,6:oth:Other
 2:2:community:any:nav.png:commun[_1]:contents[_2]:gopost('/adm/navmaps','');:Table of community contents:cmc
 2:3:clear
 3:1:clear
+3:1:pmgr:$crs:sprs.png:course[_4]:grades[_2]:go('/adm/grades');:Grading:grd
+3:1:pmgr:$cmty:sprs.png:communi-[_2]:ty grade[_1]:go('/adm/grades');:Grading:grd
+3:3:clear
+3:3:course:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
+3:3:community:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
 4:1:clear
-4:1:course:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
-4:1:community:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
 4:1:pvgr:$crs:sprs.png:course[_4]:grades[_2]:go('/adm/classcalc');:View calculated grades (Spreadsheet):grd
 4:1:pvgr:$cmty:sprs.png:communi-[_2]:ty grade[_1]:go('/adm/classcalc');:View calculated grades (Spreadsheet):grd
 4:2:clear
@@ -241,6 +247,8 @@ cat:2,6:oth:Other
 6:1:author:rca:cstr.png:coauthor[_1]:space[_2]:go('/priv/$cadom/$caname/');:Enter Authoring Space as a co-author:set
 6:1:author:raa:cstr.png:coauthor[_1]:space[_2]:go('/priv/$cadom/$caname/');:Enter Authoring Space as an assistant co-author:set
 6:1:pmau:$requested_domain:conf.png:domain[_1]:config[_1]:go('/adm/domainprefs');:Set domain configuration:dom
+6:1:courseenv_canuse_pdfforms:any:pdfupload.png:upload[_1]:pdf form[_1]:go('/adm/pdfupload'):Upload a PDF Form with filled Form Fields:grd
+6:1:community_canuse_pdfforms:any:pdfupload.png:upload[_1]:pdf form[_1]:go('/adm/pdfupload'):Upload a PDF Form with filled Form Fields:grd
 6:2:clear
 6:2:pbro:/res/:res.png:resource[_1]:space[_3]:go('/res/?launch=1');:Browse own authored or co-authored resources:cnt
 6:2:pbre:$requested_domain:res.png:resource[_1]:space[_3]:go('/res/$udom/?launch=1');:Browse published resources:cnt
@@ -261,7 +269,7 @@ cat:2,6:oth:Other
 8:1:clear
 8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
 8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:2:adv:any:slnk.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
+9:3:adv:any:wishlist.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
 10:1:clear
 10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course announcements and my calendar:com