--- loncom/interface/mydesk.tab	2013/05/11 00:19:45	1.149.2.13
+++ loncom/interface/mydesk.tab	2013/06/07 16:07:46	1.162
@@ -14,17 +14,22 @@
 #   - 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/menu:::Home::
+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,11 +45,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/[domain]/[user]/_rss.html:Feeds:blog
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -55,64 +61,39 @@ primsub:Personal:/adm/[domain]/[user]/_r
 # text: link text
 # condition: when to show link, secondary_menu will act upon this
 #   possible conditions:
-#   - empty:
+#   - empty: 
+#   - showgroups: user is member of a group
 #   - showsyllabus: course context and user has mdc priv, or syllabus exists
 #                   (and not included in course content).
 #   - showfeeds: course context and user has mdc priv, or course feeds 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 
-#   - 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
+#   - 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
 #   - author: authors (au, ca, aa)
-# scnd:link:icon:alt:text:condition
-scnd:/adm/menu:::Main Menu:always
+#   - cca:  Grant/revoke role of co-author (author only)
+# prim:link:icon:alt:text:condition
+scnd:/adm/whatsnew:::What's New:whn
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
 scnd:/adm/quickgrades:::Grades:nvgr
-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/createuser:::People:cst
 scnd:/adm/viewclasslist:::People:ncst
-scnd:/adm/coursegroups:::Groups:nvcg
+scnd:/adm/coursegroups:::Groups:showgroups
 scnd:/adm/slotrequest?command=manageresv:::Reservations:nmgr
-scnd:/adm/whatsnew:::What's New:whn
+scnd:/adm/slotrequest?command=showslots:::Slots:mgr
+scnd:/adm/grades:::Grades:vgr
+scnd:/adm/parmset:::Settings:opa
 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
 
-# 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
@@ -197,9 +178,12 @@ cat:2,6:oth:Other
 2:2:community:any:nav.png:commun[_1]:contents[_2]:gopost('/adm/navmaps','');:Table of community contents:cmc
 2:3:clear
 3:1:clear
+3:1:pmgr:$crs:sprs.png:course[_4]:grades[_2]:go('/adm/grades');:Grading:grd
+3:1:pmgr:$cmty:sprs.png:communi-[_2]:ty grade[_1]:go('/adm/grades');:Grading:grd
+3:3:clear
+3:3:course:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
+3:3:community:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
 4:1:clear
-4:1:course:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
-4:1:community:any:grds.png:my[_1]:grades[_1]:go('/adm/quickgrades');:View current problem status and grading information:grd
 4:1:pvgr:$crs:sprs.png:course[_4]:grades[_2]:go('/adm/classcalc');:View calculated grades (Spreadsheet):grd
 4:1:pvgr:$cmty:sprs.png:communi-[_2]:ty grade[_1]:go('/adm/classcalc');:View calculated grades (Spreadsheet):grd
 4:2:clear
@@ -224,10 +208,12 @@ 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:con-[_1]:struct[_1]:go('/priv/$udom/$uname/');:Enter my Authoring Space:set
+6:1:author:rca:cstr.png:co con-[_1]:struct[_2]:go('/priv/$cadom/$caname/');:Enter Authoring Space as a co-author:set
+6:1:author:raa:cstr.png:co con-[_1]:struct[_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: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
@@ -247,7 +233,7 @@ 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:adv:any:slnk.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
+9:3:adv:any:wishlist.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