--- loncom/interface/mydesk.tab	2010/03/18 13:16:11	1.130
+++ loncom/interface/mydesk.tab	2010/05/28 13:21:13	1.134
@@ -15,16 +15,18 @@
 #   - roles: show Roles instead of Courses
 #   - courses: show Courses instead of Roles
 # prim:link:icon:alt:text:condition
-prim:gotop('/adm/about.html'):/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public
-prim:gotop('/adm/communicate'):::Messages:nonewmsg
-prim:gotop('/adm/communicate'):::New Messages:newmsg
-prim:gotop('/adm/preferences'):::Preferences:
-prim:gotop('/adm/portfolio'):::Portfolio:
-prim:gotop('/adm/roles'):::Roles:roles
-prim:gotop('/adm/roles'):::Courses:courses
-prim:gotop('/adm/roles'):::Log In:onlypublic
+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:/adm/roles:::Roles:roles
+prim:/adm/roles:::Courses:courses
+prim:/adm/roles:::Log In:onlypublic
 prim::::Help:
-prim:gotop('/adm/logout'):::Logout:
+prim:/adm/logout:::Logout:
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -41,20 +43,22 @@ prim:gotop('/adm/logout'):::Logout:
 #   - mdcCourse: user can modify course contents and course is a regular course
 #   - showgroups: user is member of a group
 #   - 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
+#   - cst: Grant/revoke role of Student:Grant/revoke role of Member 
+#   - opa: Set assessment parameters
 # 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/whatsnew:::What's New:whn
+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/coursegroups:::Groups:showgroups
+scnd:/adm/courseprefs:::Settings:opa
 scnd:/adm/roles:::Roles:
+scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn
 
 
-# Categories
+# Categories for main menu
 # cat:column,row:title
 cat:0,0:none:No category, inline menu
 cat:1,2:com:Communication
@@ -129,14 +133,14 @@ 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:docs.png:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental course documents:crc
+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
 2:2:clear
-2:2:course:any:nav.png:course[_3]:contents[_1]:gonav('/adm/navmaps');:Table of course contents:crc
-2:2:community:any:nav.png:commun[_1]:contents[_2]:gonav('/adm/navmaps');:Table of community contents:cmc
+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
 4:1:clear
@@ -198,7 +202,7 @@ cat:2,6:oth:Other
 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.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
+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: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