--- loncom/interface/mydesk.tab	2007/04/28 23:13:56	1.83
+++ loncom/interface/mydesk.tab	2008/05/30 20:45:14	1.92
@@ -29,6 +29,8 @@ cat:2,6:oth:Other
 # pro = any      any permission level is allowed this button
 # pro = smp      allowed if $ENV{'user.adv'} is undefined
 # pro = adv      allowed if $ENV{'user.adv'} is defined
+# pro = shc      allowed if should use 'course' rather than 'role'
+# pro = nsc      allowed if should not use 'course' rather than 'role'
 # pro = author   prt = rca and user is a co-author
 # pro = author   prt = any 
 # pro = p???     allowed if the user has the permissions given in ???
@@ -37,10 +39,10 @@ cat:2,6:oth:Other
 # courseenv_????   allowed if in course and course environment key exists
 # author         allowed if an author
 #
-1:1:smp:any:courses.gif:choose[_1]:course[_1]:go('/adm/roles');:Choose the course to work on:rcr
-1:1:smp:rst:courses.gif:switch[_1]:course[_2]:go('/adm/roles');:Switch to another course:rcr
-1:1:adv:any:roles.gif:switch[_2]:role[_1]:go('/adm/roles');:Switch to another user role:rol
-1:1:adv:rcm:roles.gif:choose[_2]:role[_2]:go('/adm/roles');:Choose the user role:rol
+1:1:shc:any:courses.gif:choose[_1]:course[_1]:go('/adm/roles');:Choose the course to work on:rcr
+1:1:shc:rst:courses.gif:switch[_1]:course[_2]:go('/adm/roles');:Switch to another course:rcr
+1:1:nsc:any:roles.gif:switch[_2]:role[_1]:go('/adm/roles');:Switch to another user role:rol
+1:1:nsc:rcm:roles.gif:choose[_2]:role[_2]:go('/adm/roles');:Choose the user role:rol
 1:2:clear
 1:2:course:any:docs.gif:course[_3]:docs[_1]:go('/adm/coursedocs');:View documents included in this course:crc
 1:2:pmdc:$crs:docs.gif:edit crs[_1]:docs[_2]:go('/adm/coursedocs');:Edit and view documents included in this course:crc
@@ -57,33 +59,35 @@ cat:2,6:oth:Other
 4:3:clear
 4:3:pvgr:$crs:stat.gif:course[_6]:stats[_1]:gopost('/adm/statistics','Problem Statistics');:View course assessment statistics:grd
 5:1:clear
-5:1:courseenv_student_classlist_view:any:clst.gif:course[_12]:roster[_1]:go('/adm/viewclasslist');:View course roster:umn
-5:1:pcst:$crs:enrl.gif:course[_7]:enroll[_1]:go('/adm/dropadd');:Manage student enrollment:umn
-#and groups in this course
 5:1:pmky:$requested_domain:keys.gif:manage[_1]:acc keys[_1]:go('/adm/managekeys');:Manage Access Keys:dom
 5:2:clear
-5:2:pcst:$crs:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
-5:2:pcca:$requested_domain:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
-5:2:pcdc:/:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
-5:2:pmau:$requested_domain:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user:umn
+5:2:courseenv_student_classlist_view:any:clst.gif:course[_12]:roster[_1]:go('/adm/viewclasslist');:View course roster:umn
+5:2:pvcl:$crs:clst.gif:course[_12]:roster[_1]:go('/adm/createuser?action=listusers');:View class lists:umn
+5:2:pcst:$crs:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Manage course users:umn
+5:2:pcca:$requested_domain:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Manage co-authors:umn
+5:2:pcdc:/:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create users or modify the roles and privileges of users:umn
+5:2:pmau:$requested_domain:cprv.gif:user[_1]:roles[_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:create[_1]:course[_8]:go('/adm/createcourse');:Create a new course:dom
+5:3:pccc:$requested_domain:ccrs.gif:create[_1]:course[_8]:go('/adm/createcourse');:Create a new course:cmn
 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
 6:1:clear
-6:1:author:rau:cstr.gif:con-[_1]:struct[_1]:go('/priv/$uname/');:Enter my resource construction space:set
+6:1:author:rau:cstr.gif:con-[_1]:struct[_1]:go('/priv/$uname/');:Enter my construction space:set
 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:2:clear
 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:course:go('/adm/modifycourse');:Modify course settings:cmn
+6:3:pccc:$requested_domain:mcrs.gif:modify:course:go('/adm/modifycourse');:View or modify a course:cmn
 7:1:clear
 7:1:pwhn:$crs:new.gif:what is[_1]:new[_1]:go('/adm/whatsnew');:What's new?:cmn
 7:2:clear
 7:2:adv:rcm:egrd.gif:enter[_1]:grades[_2]:go('/adm/grades');:Enter grades from check-out assessment resources:oth
 7:2:pusc:$requested_domain:sctr.gif:send[_1]:scantron[_1]:gocmd('/adm/grades','scantronupload');:Send Scantron data to a course:oth
+7:3:clear
+7:3:pccc:$requested_domain:ccat.gif:course[_13]:catalog[_1]:go('/adm/coursecatalog');:Display catalog of courses:cmn
 9:2:any:any:vbkm.gif:view[_1]:bookmark[_1]:edit_bookmarks():Use or edit my bookmark collection:set
 10:1:clear
 10:1:any:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Course announcements and my calendar:com