--- loncom/interface/mydesk.tab	2010/05/28 13:21:13	1.134
+++ loncom/interface/mydesk.tab	2012/08/02 15:11:25	1.149.2.7
@@ -16,18 +16,37 @@
 #   - 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/menu:::Home:
 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::::Personal:
 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/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:RSS Feeds:blog
+primsub:Personal:/adm/requestcourse:Course Requests:reqcrs
+
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
 # scnd: item belongs to secondary menu
@@ -37,26 +56,58 @@ prim:/adm/logout:::Logout:
 # text: link text
 # 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
+#   - empty:
 #   - 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 
-#   - opa: Set assessment parameters
-# prim:link:icon:alt:text:condition
-scnd:/adm/whatsnew:::What's New:whn
+#   - mdcCourse: user can modify content in a Course
+#   - mdcCommunity: user can modify content in a Community 
+#   - vgr: user can view grades
+#   - cst: user can grant/revoke student/member roles
+#   - opa: user can set assessment parameters
+#   - ncst: user can not grant/revoke student roles
+#   - nvcg: user can only groups in which he/she is a member
+#   - nmgr: user cannot manage grades
+#   - nvgr: user cannot view other people's grades
+#   - whn: user can access what's new
+#   - author: authors (au, ca, aa)
+# scnd:link:icon:alt:text:condition
+scnd:/adm/menu:::Main Menu:always
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
-scnd:/adm/createuser:::People:cst
-scnd:/adm/coursegroups:::Groups:showgroups
 scnd:/adm/coursedocs:::Course Editor:mdcCourse
 scnd:/adm/coursedocs:::Community Editor:mdcCommunity
-scnd:/adm/courseprefs:::Settings:opa
+scnd::::Grades:vgr
+scnd::::People:cst
+scnd::::Settings:opa
+scnd:/adm/viewclasslist:::People:ncst
+scnd:/adm/coursegroups:::Groups:nvcg
+scnd:/adm/slotrequest?command=manageresv:::Reservations:nmgr
+scnd:/adm/quickgrades:::Grades:nvgr
+scnd:/adm/whatsnew:::What's New:whn
 scnd:/adm/roles:::Roles:
-scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn
+scnd:/priv/[udom]/[uname]/:::Construction Space:author
+scnd:/res/[udom]/[uname]/?launch=1:::Browse:author
 
+# secondary sub-menu links
+# Apache::lonmenu::secondary_menu() generates a sub-menus from these elements
+# scndsub: item belongs to secondary sub-menu
+# parent: name of secondary menu item, for which this is a sub-menu
+# link: references the url
+# text: link text
+# condition: when to show link, secondary_menu() will act based on this
+#   possible conditions:
+#   - empty: link displayed if user is authenticated
+#   - vgr: link displayed if user can view grades
+#   - opa: link displayed if user can set 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   
+# 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:People:/adm/coursegroups:Groups:vcg
 
 # Categories for main menu
 # cat:column,row:title
@@ -133,8 +184,6 @@ 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
 2:1:clear
@@ -170,12 +219,10 @@ cat:2,6:oth:Other
 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:con-[_1]:struct[_1]:go('/priv/$udom/$uname/');:Enter my construction space:set
+6:1:author:rca:cstr.png:co con-[_1]:struct[_2]:go('/priv/$cadom/$caname/');:Enter construction space as a co-author:set
+6:1:author:raa:cstr.png:co con-[_1]:struct[_2]:go('/priv/$cadom/$caname/');:Enter construction 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
@@ -195,14 +242,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:pbre:$requested_domain:wishlist.png:view[_1]:wishlist[_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: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
@@ -216,8 +263,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
@@ -226,6 +271,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