--- loncom/interface/mydesk.tab	2009/10/26 21:19:22	1.117
+++ loncom/interface/mydesk.tab	2010/10/04 23:00:46	1.125.4.1
@@ -15,14 +15,18 @@
 #   - roles: show Roles instead of Courses
 #   - courses: show Courses instead of Roles
 # prim:link:icon:alt:text:condition
-prim:go('/adm/about.html'):/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public
-prim:go('/adm/communicate'):::Message:nonewmsg
-prim:go('/adm/communicate'):::Message (new):newmsg
-prim:go('/adm/roles'):::Roles:roles
-prim:go('/adm/roles'):::Courses:courses
-prim:go('/adm/roles'):::Log In:onlypublic
+prim:gotop('/adm/about.html'):/adm/lonIcons/minilogo.gif:LON-CAPA Logo:About:public
+prim:gotop('/adm/menu'):::Home:home
+prim:gotop('/adm/roles?destinationurl=/adm/gci_info'):::Home:gci
+prim:gotop('/adm/menu'):::Home:gcitest
+prim:gotop('/adm/communicate'):::Messages:nonewmsg
+prim:gotop('/adm/communicate'):::New Messages:newmsg
+prim:gotop('/adm/preferences'):::Preferences:
+prim:gotop('/adm/roles'):::Roles:roles
+prim:gotop('/adm/roles'):::Courses:courses
+prim:gotop('/adm/roles'):::Log In:onlypublic
 prim::::Help:
-prim:go('/adm/logout'):::Logout:
+prim:gotop('/adm/logout'):::Logout:
 
 # secondary menu links
 # Apache::lonmenu::secondary_menu() generates a menu from these elements
@@ -46,8 +50,7 @@ prim:go('/adm/logout'):::Logout:
 #   - noremotenavCommunity: remote navmap is _not_ activated 
 #                          and course is of type Community
 # 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/menu:::Main Menu:showmenu
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:noremotenav
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Course Contents:remotenav
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Community Contents:noremotenavCommunity
@@ -55,7 +58,8 @@ scnd:/adm/navmaps?postdata=[url]&pos
 scnd:/adm/coursedocs:::Course Editor:mdcCourse
 scnd:/adm/coursedocs:::Community Editor:mdcCommunity
 scnd:/adm/coursegroups:::Groups:showgroups
-scnd:/adm/roles:::Roles:
+scnd:/adm/roles:::Roles:showroles
+scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn
 
 
 # Categories
@@ -135,7 +139,7 @@ cat:2,6:oth:Other
 1:2:clear
 1:2:course:any:docs.gif:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental course documents:crc
 1:2:community:any:docs.gif:supplem-[_1]:entaldoc[_1]:go('/adm/coursedocs');:View supplemental community documents:cmc
-1:2:pmdc:$crs:docs.gif:course[_7]:editor[_1]:go('/adm/coursedocs');::Edit course contents:crc
+1:2:pmdc:$crs:docs.gif:course[_7]:editor[_1]:go('/adm/coursedocs');:Edit course contents:crc
 1:2:pmdc:$cmty:docs.gif:communi-[_1]:ty edit[_1]:go('/adm/coursedocs');:Edit community contents:cmc
 2:1:clear
 2:2:clear
@@ -166,7 +170,7 @@ cat:2,6:oth:Other
 5:2:pcdc:/:cprv.gif:user[_1]:privs[_1]:go('/adm/createuser');:Create users or modify the roles and privileges of users:umn
 5:2:pmau:$requested_domain:cprv.gif:user[_1]:privs[_1]:go('/adm/createuser');:Create users or modify the roles and privileges of users:umn
 5:3:clear
-5:3:pccc:$requested_domain:ccrs.gif:course[_8]:creation[_1]:go('/adm/createcourse');:Course Creation:ccm
+5:3:pccc:$requested_domain:ccrs.gif:course[_8]:creation[_1]:go('/adm/createcourse');:Course and community creation:ccm
 5:3:popa:$crs:parm.gif:course[_9]:parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the course:cmn
 5:3:popa:$cmty:parm.gif:communi-[_6]:ty parms[_1]:go('/adm/parmset');:Modify parameter settings (due dates, etc) for resources and the community:cmm
 6:1:clear
@@ -174,14 +178,15 @@ cat:2,6:oth:Other
 6:1:author:rca:cstr.gif:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as a co-author:set
 6:1:author:raa:cstr.gif:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as an assistant co-author:set
 6:1:pmau:$requested_domain:conf.gif:domain[_1]:config[_1]:go('/adm/domainprefs');:Set domain configuration:dom
-6:1:course:any:pdfupload.gif:upload[_1]:pdf form[_1]:go('/pdfupload'):Upload a PDF Form with filled Form Fields:grd
-6:1:community:any:pdfupload.gif:upload[_1]:pdf form[_1]:go('/pdfupload'):Upload a PDF Form with filled Form Fields:grd
+6:1:courseenv_canuse_pdfforms:any:pdfupload.gif:upload[_1]:pdf form[_1]:go('/pdfupload'):Upload a PDF Form with filled Form Fields:grd
+6:1:community_canuse_pdfforms:any:pdfupload.gif:upload[_1]:pdf form[_1]:go('/pdfupload'):Upload a PDF Form with filled Form Fields:grd
 6:2:clear
+6:2:pbro:/res/:res.gif:resource[_1]:space[_1]:go('/res/?launch=1');:Browse own authored or co-authored resources:cnt
 6:2:pbre:$requested_domain:res.gif:resource[_1]:space[_1]:go('/res/$udom/?launch=1');:Browse published resources:cnt
 6:2:author:rau:res.gif:resource[_1]:space[_1]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
 6:2:author:rca:res.gif:co res[_1]:space[_2]:go('/res/$udom/$uname/?launch=1');:Browse published resources:cnt
 6:3:clear
-6:3:pccc:$requested_domain:mcrs.gif:modify[_1]:course[_15]:go('/adm/modifycourse');:View or modify a course:cmn
+6:3:pccc:$requested_domain:mcrs.gif:modify[_1]:course[_15]:go('/adm/modifycourse');:View or modify a course or community:ccm
 7:1:clear
 7:1:pmau:$requested_domain:srvr.gif:server[_1]:status[_1]:go('/adm/domainstatus');:Status of domain servers:dom
 7:1:pwhn:$crs:new.gif:what is[_1]:new[_1]:go('/adm/whatsnew');:What's New?:cmn
@@ -199,7 +204,7 @@ cat:2,6:oth:Other
 10:1:any:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com
 10:1:community:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Community announcements and my calendar:com
-10:2:any:any:com.gif:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and receive messages:com
+10:2:any:any:com.gif:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and display messages:com
 10:3:clear
 10:3:ppsa:$requested_domain:mail.gif:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.gif:course[_10]:chatroom[_1]:chat_win();:Enter the chat room for the course:com