[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm mydesk.tab

[www]

www		Mon Aug 19 17:14:08 2002 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  BUGFIX: NAV button for cross-domain courses, student role. Should go
  into version 0.5.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.25 loncom/interface/lonmenu.pm:1.26
--- loncom/interface/lonmenu.pm:1.25	Thu Aug  8 15:33:09 2002
+++ loncom/interface/lonmenu.pm	Mon Aug 19 17:14:08 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.25 2002/08/08 19:33:09 matthew Exp $
+# $Id: lonmenu.pm,v 1.26 2002/08/19 21:14:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -155,6 +155,10 @@
 	    if (&Apache::lonnet::allowed($1,$prt)) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act);
             }
+        } elsif ($pro eq 'course') {
+            if ($ENV{'request.course.fn'}) {
+               $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act);
+	    }
         } elsif ($pro eq 'author') {
             if ($author) {
                 if (($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) {
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.26 loncom/interface/mydesk.tab:1.27
--- loncom/interface/mydesk.tab:1.26	Fri Aug 16 17:42:09 2002
+++ loncom/interface/mydesk.tab	Mon Aug 19 17:14:08 2002
@@ -8,6 +8,9 @@
 # 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 ???
+# course         allowed if in course
+# 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
@@ -15,11 +18,11 @@
 1:2:any:any:com.gif:commu-:nication:go('/adm/communicate');:Communicate/Messages
 2:1:clear
 2:2:clear
-2:2:pbre:$crs:nav.gif:navigate:contents:gopost('/adm/navmaps',currentURL);:Navigate Contents
+2:2:course:any:nav.gif:navigate:contents:gopost('/adm/navmaps',currentURL);:Navigate Contents
 2:3:clear
 3:1:clear
 4:1:clear
-4:1:pbre:$crs:grds.gif:my:grades:go('/adm/studentcalc');:Check My Grades
+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:2:clear
 4:2:pvgr:$crs:chrt.gif:course:chart:gopost('/adm/statistics','Student Assessment');:Course Assessment Chart
@@ -46,9 +49,9 @@
 10:1:clear
 10:1:any:any:anno.gif:calendar:announce:go('/adm/announcements');:Announcements and Calendar
 10:2:clear
-#10:2:pbre:$crs:docs.gif:course:docs:go('/adm/coursedocs');:Course Documents
+#10:2:course:any:docs.gif:course:docs:go('/adm/coursedocs');:Course Documents
 10:3:clear
-10:3:pbre:$crs:bchat.gif:course:chat:go('/res/adm/pages/chatroom.html');:Chat
+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