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

[raeburn]

raeburn		Thu Aug  6 04:09:45 2009 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  - Move "Request Courses" link in Main Menu to "My Roles"/My "Courses".
  - Suppress "Request Courses" link if user has mky priv in domain (as position 7.3 is also used for the DC's Make Keys function).
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.277 loncom/interface/lonmenu.pm:1.278
--- loncom/interface/lonmenu.pm:1.277	Wed Aug  5 11:01:38 2009
+++ loncom/interface/lonmenu.pm	Thu Aug  6 04:09:45 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.277 2009/08/05 11:01:38 bisitz Exp $
+# $Id: lonmenu.pm,v 1.278 2009/08/06 04:09:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1271,9 +1271,16 @@
                     $output.=&clear($row,$col);
                     next;
                 }
-            } elsif ($prt eq 'reqcrs') {
+            } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
+                next if (&Apache::lonnet::allowed('mky',$requested_domain));
+                if (($prt eq 'reqcrsnsc') && ($show_course))   {
+                    next;
+                }
+                if (($prt eq 'reqcrsshc') && (!$show_course)) {
+                    next;
+                }
                 my $showreqcrs = 0;
-                foreach my $type ('official','unofficial') {
+                foreach my $type ('official','unofficial','community') {
                     if (&Apache::lonnet::usertools_access($env{'user.name'},
                                                     $env{'user.domain'},
                                                     $type,undef,'requestcourses')) {
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.109 loncom/interface/mydesk.tab:1.110
--- loncom/interface/mydesk.tab:1.109	Mon Jul 13 08:24:21 2009
+++ loncom/interface/mydesk.tab	Thu Aug  6 04:09:45 2009
@@ -111,7 +111,8 @@
 7:2:adv:rcm:egrd.gif:enter[_1]:grades[_3]:go('/adm/grades');:Enter grades from check-out assessment resources:oth
 7:2:pusc:$requested_domain:sctr.gif:send bub[_1]:blesheet[_1]:gocmd('/adm/grades','scantronupload');:Send bubblesheet data to a course:oth
 7:3:clear
-7:3:tools:reqcrs:rcrs.gif:request[_1]:course[_16]:go('/adm/requestcourse');:Request creation of a new course:oth
+7:3:tools:reqcrsshc:rcrs.gif:request[_1]:course[_16]:go('/adm/requestcourse');:Course requests:rcr
+7:3:tools:reqcrsnsc:rcrs.gif:request[_1]:course[_16]:go('/adm/requestcourse');:Course requests:rol
 7:3:pmky:$requested_domain:keys.gif:manage[_1]:acc keys[_1]:go('/adm/managekeys');:Manage Access Keys:dom
 9:2:any:any:vbkm.gif:view[_1]:bookmark[_1]:edit_bookmarks():Use or edit my bookmark collection:set
 10:1:clear