--- loncom/interface/mydesk.tab	2002/10/10 17:17:11	1.30
+++ loncom/interface/mydesk.tab	2005/10/10 15:38:18	1.66
@@ -9,49 +9,64 @@
 # pro = author   prt = any 
 # pro = p???     allowed if the user has the permissions given in ???
 # course         allowed if in course
+# course_p???    allowed if in course and have permissions
+# courseenv_????   allowed if in course and course environment key exists
 # author         allowed if an author
 #
-1:1:smp:any:courses.gif:choose:course:go('/adm/roles');:Choose Course
-1:1:smp:rst:courses.gif:switch:course:go('/adm/roles');:Switch Course
-1:1:adv:any:roles.gif:switch:role:go('/adm/roles');:Switch Role
-1:1:adv:rcm:roles.gif:choose:role:go('/adm/roles');:Choose Role
+1:1:smp:any:courses.gif:choose[_1]:course[_1]:go('/adm/roles');:Choose the course to work on
+1:1:smp:rst:courses.gif:switch[_1]:course[_2]:go('/adm/roles');:Switch to another course
+1:1:adv:any:roles.gif:switch[_2]:role[_1]:go('/adm/roles');:Switch to another user role
+1:1:adv:rcm:roles.gif:choose[_2]:role[_2]:go('/adm/roles');:Choose the user role
 1:2:clear
-1:2:course:any:docs.gif:course:docs:go('/adm/coursedocs');:Course Documents
+1:2:course:any:docs.gif:course[_3]:docs[_1]:go('/adm/coursedocs');:View documents included in this course
+1:2:pmdc:$crs:docs.gif:edit crs[_1]:docs[_2]:go('/adm/coursedocs');:Edit and view documents included in this course
 2:1:clear
 2:2:clear
-2:2:course:any:nav.gif:navigate:contents:gopost('/adm/navmaps',currentURL);:Navigate Contents
+2:2:course:any:nav.gif:navigate[_1]:contents[_1]:gonav('/adm/navmaps');:Navigate the table of contents for this course
 2:3:clear
 3:1:clear
 4:1:clear
-4:1:course:any:grds.gif:my:grades:go('/adm/studentcalc');:Check My Grades
-4:1:pvgr:$crs:sprs.gif:course:grades:go('/adm/classcalc');:Check Course Grades
+4:1:course:any:grds.gif:my[_1]:grades[_1]:go('/adm/quickgrades');:Show Problem Completeness
+4:1:pvgr:$crs:sprs.gif:course[_4]:grades[_2]:go('/adm/classcalc');:Calculate course grades (Spreadsheet)
 4:2:clear
-4:2:pvgr:$crs:chrt.gif:course:chart:gopost('/adm/statistics','Student Assessment');:Course Assessment Chart
+4:2:pvgr:$crs:chrt.gif:course[_5]:chart[_1]:gopost('/adm/statistics?reportSelected=student_assessment','Student Assessment');:View the course assessment progress chart
 4:3:clear
-4:3:pvgr:$crs:stat.gif:course:stats:gopost('/adm/statistics','Problem Statistics');:Course Assessment Statistics
+4:3:pvgr:$crs:stat.gif:course[_6]:stats[_1]:gopost('/adm/statistics','Problem Statistics');:View course assessment statistics
 5:1:clear
-5:1:pcst:$crs:enrl.gif:course:enroll:go('/adm/dropadd');:Drop/Add Students
+5:1:courseenv_student_classlist_view:any:clst.gif:course[_12]:roster[_1]:go('/adm/viewclasslist');:View course roster
+5:1:pcst:$crs:enrl.gif:course[_7]:enroll[_1]:go('/adm/dropadd');:Drop/Add students in this course
+5:1:pmky:$requested_domain:keys.gif:manage[_1]:acc keys[_1]:go('/adm/managekeys');:Manage Access Keys
 5:2:clear
-5:2:pcst:$crs:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pcca:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pmau:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
+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
+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
+5:2:pcdc:/:cprv.gif:user[_1]:roles[_1]:go('/adm/createuser');:Create a user or modify the roles and privileges of a user
+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
 5:3:clear
-5:3:pccc:$requested_domain:ccrs.gif:create:course:go('/adm/createcourse');:Create New Course
-5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set Parameters/Deadlines/etc
-6:1:clear
-6:1:author:any:cstr.gif:con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter Construction Space
-6:1:author:rca:cstr.gif:co con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter Co-Construction Space
+5:3:pccc:$requested_domain:ccrs.gif:create[_1]:course[_8]:go('/adm/createcourse');:Create a new course
+5:3:popa:$crs:parm.gif:course[_9]:parms[_1]:go('/adm/parmset');:Set deadlines and other assessment parameters, as well as modify course environment
+6:1:any:any:port.gif:port-[_1]:folio[_1]:go('/adm/portfolio');:Enter my portfolio space
+6:1:author:rau:cstr.gif:con-[_1]:struct[_1]:go('/priv/$uname/');:Enter my resource construction space
+6:1:author:rca:cstr.gif:co con-[_1]:struct[_2]:go('/priv/$caname/');:Enter construction space as a co-author
 6:2:clear
-6:2:author:any:res.gif:resource:space:go('/res/$udom/$uname/?launch=1');:Browse Published Resources
-6:2:author:rca:res.gif:co res:space:go('/res/$udom/$uname/?launch=1');:Browse Published Resources
+6:2:pbre:$requested_domain:res.gif:resource[_1]:space[_1]:go('/res/$udom/?launch=1');:Browse published resources
+6:2:author:rau:res.gif:resource[_1]:space[_1]:go('/res/$udom/$uname/?launch=1');:Browse published resources
+6:2:author:rca:res.gif:co res[_1]:space[_2]:go('/res/$udom/$uname/?launch=1');:Browse published resources
 6:3:clear
+6:3:pccc:$requested_domain:mcrs.gif:modify:course:go('/adm/modifycourse');:Modify course settings
+7:1:clear
+7:1:pgan:$crs:new.gif:what is[_1]:new[_2]:go('/adm/whatsnew');:What's new?
 7:2:clear
-7:2:adv:rcm:egrd.gif:enter:grades:go('/adm/grades');:Enter Grades
+7:2:adv:rcm:egrd.gif:enter[_1]:grades[_2]:go('/adm/grades');:Enter grades from check-out assessment resources
+7:2:pusc:$requested_domain:sctr.gif:send[_1]:scantron[_1]:gocmd('/adm/grades','scantronupload');:Send Scantron data to a course
+9:2:any:any:vbkm.gif:view[_1]:bookmark[_1]:edit_bookmarks():Use or edit my bookmark collection
 10:1:clear
-10:1:any:any:anno.gif:calendar:announce:go('/adm/announcements');:Announcements and Calendar
-10:2:any:any:com.gif:commu-:nication:go('/adm/communicate');:Communicate/Messages
+10:1:any:any:anno.gif:calendar[_1]:announce[_1]:go('/adm/announcements');:Course announcements and my calendar
+10:2:any:any:com.gif:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and receive messages
 10:3:clear
-10:3:course:any:bchat.gif:course:chat:go('/res/adm/pages/chatroom.html');:Chat
-11:1:adv:any:src.gif:search:library:go('/adm/searchcat');:Search Published Resources
-11:2:any:any:pref.gif:prefer-:ences:go('/adm/preferences');:Set Preferences
-11:3:any:any:logout.gif:exit::go('/adm/logout');:Exit
+10:3:ppsa:$requested_domain:mail.gif:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail
+10:3:course_plc:any:bchat.gif:course[_10]:chat[_1]:chat_win();:Enter the chatroom for the course
+11:1:clear
+11:1:course:any:src.gif:search[_1]:course[_11]:go('/adm/searchcat');:Search the contents of this course
+11:1:pbre:$requested_domain:src.gif:search[_2]:library[_1]:go('/adm/searchcat');:Search the database of published resources
+11:2:any:any:pref.gif:prefer-[_1]:ences[_1]:go('/adm/preferences');:Set my user preferences
+11:3:any:any:logout.gif:exit[_1]: [_1]:go('/adm/logout');:Exit LON-CAPA