--- loncom/interface/mydesk.tab	2012/05/14 13:23:15	1.149.2.1
+++ loncom/interface/mydesk.tab	2012/05/23 00:29:22	1.149.2.3
@@ -16,12 +16,9 @@
 #   - 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
@@ -29,6 +26,26 @@ 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/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
@@ -38,32 +55,58 @@ prim:/adm/logout:::Logout:
 # text: link text
 # condition: when to show link, secondary_menu will act upon this
 #   possible conditions:
-#   - empty: 
-#   - 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 
-#   - ncst: Not grant/revoke roles
-#   - opa: Set assessment parameters
-#   - nvgr: cannot view other people's grades 
-#   - mgr: Manage grades
-#   - nmgr: cannot manage grade
+#   - 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)
-# prim:link:icon:alt:text:condition
-scnd:/adm/whatsnew:::What's New:whn
+# 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/coursedocs:::Course Editor:mdcCourse
+scnd:/adm/coursedocs:::Community Editor:mdcCommunity
+scnd::::Grades:vgr
+scnd::::People:cst
+scnd::::Settings:opa
 scnd:/adm/viewclasslist:::People:ncst
-scnd:/adm/coursegroups:::Groups:showgroups
+scnd:/adm/coursegroups:::Groups:nvcg
 scnd:/adm/slotrequest?command=manageresv:::Reservations:nmgr
-scnd:/adm/slotrequest?command=showslots:::Slots:mgr
 scnd:/adm/quickgrades:::Grades:nvgr
-scnd:/adm/grades:::Grades:vgr
-scnd:/adm/parmset:::Settings:opa
+scnd:/adm/whatsnew:::What's New:whn
 scnd:/adm/roles:::Roles:
 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 Configuration:opa
+scndsub:Settings:/adm/parmset:Content Parameters:opa
+scndsub:Settings:/adm/slotrequest?command=showslots:Slot Management:mgr
+scndsub:People:/adm/createuser:User Management:cst
+scndsub:People:/adm/coursegroups:Group Management:vcg
 
 # Categories for main menu
 # cat:column,row:title