--- loncom/interface/mydesk.tab	2012/12/28 17:14:18	1.149.2.10
+++ loncom/interface/mydesk.tab	2014/04/06 18:46:51	1.149.2.20
@@ -14,17 +14,21 @@
 #   - 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::::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:
+# 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/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
@@ -40,12 +44,12 @@ prim:/adm/logout:::Logout:
 #   - 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:RSS Feeds:blog
-primsub:Personal:/adm/requestcourse:Course Requests:reqcrs
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -57,33 +61,40 @@ primsub:Personal:/adm/requestcourse:Cour
 # condition: when to show link, secondary_menu will act upon this
 #   possible conditions:
 #   - empty:
+#   - showsyllabus: course context: not mdc and syllabus exists
+#                   (and not included in course content).
+#   - showfeeds: course context: not mdc and course feeds exist
+#   - showresv: course context and user cannot manage grades, and slots exist
 #   - always: show this link even if user hasn't selected a role
 #   - mdcCourse: user can modify content in a Course
 #   - mdcCommunity: user can modify content in a Community 
+#   - mdc: user can modify content in Course/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/coursedocs:::Course Editor:mdcCourse
-scnd:/adm/coursedocs:::Community Editor:mdcCommunity
+scnd:/adm/quickgrades:::Grades:nvgr
+scnd:/adm/coursedocs?command=contents:::Course Editor:mdcCourse
+scnd:/adm/coursedocs?command=contents:::Community Editor:mdcCommunity
+scnd:/adm/whatsnew:::What's New:whn
 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/slotrequest?command=manageresv:::Reservations:showresv
+scnd::::Public:mdc
+scnd:/public/[cdom]/[cnum]/syllabus:::Syllabus:showsyllabus
+scnd:/adm/[cdom]/[cnum]/_rss.html:::Feeds:showfeeds
 scnd:/adm/roles:::Roles:
-scnd:/priv/[udom]/[uname]/:::Construction Space:author
+scnd:/priv/[udom]/[uname]/:::Authoring Space:author
 scnd:/res/[udom]/[uname]/?launch=1:::Browse:author
 scnd:/adm/createuser:::People:cca
 
@@ -96,6 +107,7 @@ scnd:/adm/createuser:::People:cca
 # condition: when to show link, secondary_menu() will act based on this
 #   possible conditions:
 #   - empty: link displayed if user is authenticated
+#   - mdc: user can modify content in Course/Community
 #   - 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
@@ -109,6 +121,8 @@ scndsub:Settings:/adm/parmset:Content Se
 scndsub:Settings:/adm/slotrequest?command=showslots:Slots:mgr
 scndsub:People:/adm/createuser:Users:cst
 scndsub:People:/adm/coursegroups:Groups:vcg
+scndsub:Public:/public/[cdom]/[cnum]/syllabus:Syllabus:mdc
+scndsub:Public:/adm/[cdom]/[cnum]/_rss.html:Feeds:mdc
 
 # Categories for main menu
 # cat:column,row:title
@@ -185,8 +199,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
@@ -220,15 +234,15 @@ 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/$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: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: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:pccc:$requested_domain:mcrs.png:modify[_1]:course[_15]:go('/adm/modifycourse');:View or modify a course or community:ccm
 7:1:clear
@@ -246,7 +260,7 @@ cat:2,6:oth:Other
 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: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