--- loncom/interface/mydesk.tab	2010/04/14 13:58:11	1.133
+++ loncom/interface/mydesk.tab	2016/10/26 14:51:45	1.172
@@ -14,18 +14,43 @@
 #   - nonewmsg: only display if there aren't any new messages
 #   - roles: show Roles instead of Courses
 #   - courses: show Courses instead of Roles
-# prim:link:icon:alt:text:condition
-prim:/adm/about.html:/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public
-prim:/adm/communicate:::Messages:nonewmsg
-prim:/adm/communicate:::New Messages:newmsg
-prim:/adm/preferences:::Preferences:
-prim:/adm/portfolio:::Portfolio:
-prim:/adm/[domain]/[user]/_rss.html:::Feeds:
-prim:/adm/roles:::Roles:roles
-prim:/adm/roles:::Courses:courses
-prim:/adm/roles:::Log In:onlypublic
-prim::::Help:
-prim:/adm/logout:::Logout:
+# position: where link is to be displayed
+#   possible positions: 
+#   - empty (will be displayed on right side -- default location).
+#   - left
+# 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:
+prim:/adm/roles:::Courses:courses:
+prim:/adm/helpdesk:::Help:onlypublic:
+prim:/adm/roles:::Log In:onlypublic:
+prim::::Help::
+prim:/adm/logout:::Logout::
+
+# primary sub-menu links
+# Apache::lonmenu::primary_menu() generates a sub-menus from these elements
+# primsub: item belongs to primary sub-menu
+# parent: name of primary menu item, for which this is a sub-menu
+# link: references the url
+# text: link text
+# condition: when to show link, primary_menu() will act based on this
+#   possible conditions:
+#   - empty: link displayed if user is authenticated
+#   - portfolio: link displayed if portfolio access
+#   - blogs: link displayed if blog access
+#   - wishlist: link displayed if user has privileges to use Stored Links
+#   - reqcrs: link displayed if user can request Course or Community creation
+# primsub:parent:link:text:condition
+primsub:Personal:/adm/[domain]/[user]/aboutme:Information:
+primsub:Personal:/adm/preferences:Preferences:
+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:Feeds:blog
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -37,22 +62,38 @@ prim:/adm/logout:::Logout:
 # condition: when to show link, secondary_menu will act upon this
 #   possible conditions:
 #   - empty: 
-#   - showreturn: link is displayed if return link is wanted
-#   - mdcCommunity: user can modify course contents and course is of type Community
-#   - mdcCourse: user can modify course contents and course is a regular course
 #   - showgroups: user is member of a group
+#   - 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 view or manage grades, and slots exist
 #   - always: show this link even if user hasn't selected a role
-#   - Community: course is of type Community
-#   - Course: course is of type Course
+#   - whn: access what's new
+#   - 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)
+#   - cca:  Grant/revoke role of co-author (author only)
 # prim:link:icon:alt:text:condition
-scnd:/adm/menu:::Main Menu:always
-scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:Course
-scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Community Contents:Community
-scnd:/adm/coursedocs:::Course Editor:mdcCourse
-scnd:/adm/coursedocs:::Community Editor:mdcCommunity
+scnd:/adm/whatsnew:::What's New:whn
+scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
+scnd:/adm/quickgrades:::Grades:nvgr
+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:vgr
+scnd:/adm/grades:::Grades:vgr
+scnd:/adm/parmset:::Settings:params
+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
 
 
 # Categories for main menu
@@ -82,7 +123,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-> javascrtip 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)
 #
@@ -130,19 +171,20 @@ 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:course:any:subdocs.png:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental course documents:crc
-1:2:community:any:docs.png:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental community documents:cmc
-1:2:pmdc:$crs:docs.png:course[_7]:editor[_1]:go('/adm/coursedocs');:Edit course contents:crc
-1:2:pmdc:$cmty:docs.png:communi-[_1]:ty edit[_1]:go('/adm/coursedocs');: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
 2:2:clear
 2:2:course:any:nav.png:course[_3]:contents[_1]:gopost('/adm/navmaps','');:Table of course contents:crc
 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
@@ -160,25 +202,29 @@ cat:2,6:oth:Other
 5:2:pcst:$crs:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:Manage course users:umn
 5:2:pcst:$cmty:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:Manage community users:umn
 5:2:pcca:$requested_domain:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:Manage co-authors:umn
+5:2:pvac:$requested_domain:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:View information about users:umn
 5:2:pcdc:/:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:Create users or modify the roles and privileges of users:umn
 5:2:pmau:$requested_domain:cprv.png:user[_1]:privs[_1]:go('/adm/createuser');:Create users or modify the roles and privileges of users:umn
 5:3:clear
 5:3:pccc:$requested_domain:ccrs.png:course[_8]:creation[_1]:go('/adm/createcourse');:Course and community creation:ccm
+5:3:pdcc:$requested_domain:ccrs.png:course[_8]:creation[_1]:go('/adm/createcourse');:Course and community creation:ccm
+5:3:pvpa:$crs:parm.png:course[_9]:parms[_1]:go('/adm/parmset');:View parameter settings (due dates, etc) for resources and the course:cmn
 5:3:popa:$crs:parm.png:course[_9]:parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the course:cmn
 5:3:popa:$cmty:parm.png:communi-[_6]:ty parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the community:cmm
 6:1:clear
-6:1:author:rau:cstr.png:con-[_1]:struct[_1]:go('/priv/$uname/');:Enter my construction space:set
-6:1:author:rca:cstr.png:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as a co-author:set
-6:1:author:raa:cstr.png:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as an assistant co-author:set
+6:1:author:rau:cstr.png:author[_1]:space[_1]:go('/priv/$udom/$uname/');:Enter my Authoring Space:set
+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[_1]:go('/res/?launch=1');:Browse own authored or co-authored resources:cnt
-6:2:pbre:$requested_domain:res.png:resource[_1]:space[_1]:go('/res/$udom/?launch=1');:Browse published resources:cnt
-6:2:author:rau:res.png:resource[_1]:space[_1]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
-6:2:author:rca:res.png:co res[_1]:space[_2]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
+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
+6:2:author:rau:res.png:resource[_1]:space[_3]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
+6:2:author:rca:res.png:co res[_1]:space[_4]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
 6:3:clear
+6:3:prar:$requested_domain:mcrs.png:view[_2]:course[_17]:go('/adm/modifycourse');:View a course or community:ccm
 6:3:pccc:$requested_domain:mcrs.png:modify[_1]:course[_15]:go('/adm/modifycourse');:View or modify a course or community:ccm
 7:1:clear
 7:1:pmau:$requested_domain:srvr.png:server[_1]:status[_1]:go('/adm/domainstatus');:Status of domain servers:dom
@@ -192,14 +238,14 @@ 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:any:any:vbkm.png:view[_1]:bookmark[_1]:edit_bookmarks():Use or edit my bookmark collection: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 anouncements and my calendar:com
+10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course announcements and my calendar:com
 10:1:community:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Community announcements and my calendar:com
 10:2:any:any:com.png:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and display messages:com
 10:3:clear
-10:3:ppsa:$requested_domain:mail-reply-all.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
+10:3:ppsa:$requested_domain:mail.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.png:course[_10]:chatroom[_1]:chat_win();:Enter the chat room for the course:com
 10:3:community_plc:any:bchat.png:communi-[_7]:ty chat[_1]:chat_win();:Enter the chat room for the community:com
 11:1:clear
@@ -213,8 +259,6 @@ cat:2,6:oth:Other
 11:3:tools:blog:blog.png:edit[_1]:blogs[_1]:go('/adm/$udom/$uname/_rss.html');:Edit blogs, RSS feeds, and podcasts:set
 12:1:clear
 12:1:any:any:src.png:search[_3]:prtfolio[_1]:go('/adm/searchcat');:Search the database of accessible portfolio files:cnt
-12:1:course:any:src.png:search[_1]:course[_11]:go('/adm/searchcat');:Search the contents of this course or accessible portfolio files:cnt
-12:1:community:any:src.png:search[_2]:commun[_1]:go('/adm/searchcat');:Search the contents of this community or accessible portfolio files:cnt
 12:1:pbre:$requested_domain:src.png:search[_2]:library[_1]:go('/adm/searchcat');:Search the database of published resources and accessible portfolio files:cnt
 12:2:any:any:pref.png:prefer-[_1]:ences[_1]:go('/adm/preferences');:Set my user preferences:set
 12:3:clear
@@ -223,6 +267,6 @@ cat:2,6:oth:Other
 12:3:pmgr:$crs:rsrv.png:reserv-[_1]:ations[_1]:gocmd('/adm/slotrequest','showslots');:Manage slots:cmn
 12:3:pmgr:$cmty:rsrv.png:reserv-[_1]:ations[_1]:gocmd('/adm/slotrequest','showslots');:Manage slots:cmm
 13:1:clear
-13:1:popa:$crs:conf.png:course[_17]:config[_2]:go('/adm/courseprefs');:Modify course configuration:cmn
-13:1:popa:$cmty:conf.png:communi-[_9]:ty config[_1]:go('/adm/courseprefs');:Modify community configuration:cmm
+13:1:popa:$crs:crsconf.png:course[_17]:config[_2]:go('/adm/courseprefs');:Modify course configuration:cmn
+13:1:popa:$cmty:crsconf.png:communi-[_9]:ty config[_1]:go('/adm/courseprefs');:Modify community configuration:cmm
 13:2:any:any:logout.png:logout[_1]: [_1]:go('/adm/logout');:Logout:oth