--- loncom/interface/mydesk.tab	2009/11/04 18:30:17	1.123
+++ loncom/interface/mydesk.tab	2010/12/05 17:28:50	1.125.4.4
@@ -15,14 +15,19 @@
 #   - 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'):::Message:nonewmsg
-prim:gotop('/adm/communicate'):::Message (new):newmsg
-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:home
+prim:/adm/roles?destinationurl=/adm/ci_info:::Home:ci
+prim:/adm/menu:::Home:citest
+prim:/adm/communicate:::Messages:nonewmsg
+prim:/adm/communicate:::New Messages:newmsg
+prim:/adm/preferences:::Preferences:
+prim:/adm/roles:::Roles:roles
+prim:/adm/roles:::Courses:courses
+prim:/adm/helpdesk:::Help:onlypublic
+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
@@ -46,8 +51,7 @@ prim:gotop('/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 +59,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
@@ -174,8 +179,8 @@ 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