--- loncom/interface/mydesk.tab	2012/05/14 13:23:15	1.149.2.1
+++ loncom/interface/mydesk.tab	2013/01/03 20:20:05	1.149.2.12
@@ -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/wishlist:Stored Links:wishlist
+primsub:Personal:/adm/announcements:Calendar:
+primsub:Personal:/adm/[domain]/[user]/_rss.html:RSS Feeds:blog
+
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
 # scnd: item belongs to secondary menu
@@ -38,32 +55,59 @@ 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?command=contents:::Course Editor:mdcCourse
+scnd:/adm/coursedocs?command=contents:::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
+scnd:/adm/createuser:::People:cca
 
+# 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
@@ -140,8 +184,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: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
@@ -179,8 +223,6 @@ cat:2,6:oth:Other
 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
@@ -200,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:2:adv:any:slnk.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: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