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

[www]

www		Thu Jan 13 19:43:12 2011 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  For 3.0: adapt secondary menu
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.340 loncom/interface/lonmenu.pm:1.341
--- loncom/interface/lonmenu.pm:1.340	Thu Dec  2 06:00:12 2010
+++ loncom/interface/lonmenu.pm	Thu Jan 13 19:43:12 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.340 2010/12/02 06:00:12 raeburn Exp $
+# $Id: lonmenu.pm,v 1.341 2011/01/13 19:43:12 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,7 +272,8 @@
     my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec); 
     my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); 
     my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec); 
-    my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec); 
+    my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
+    my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec); 
     my $author        = getauthor();
 
     my $showlink = &show_return_link();
@@ -292,10 +293,10 @@
                 && !($env{'request.state'} eq 'construct');
         next if    $$menuitem[4]   =~ /^mdc/
                 && !$canedit;
-        next if    $$menuitem[4]  eq 'mdcCourse'
-                && $crstype eq 'Community';
-        next if    $$menuitem[4]  eq 'mdcCommunity'
-                && $crstype ne 'Community';
+        next if    $$menuitem[4]  eq 'nvgr'
+                && $canvgr;
+        next if    $$menuitem[4]  eq 'vgr'
+                && !$canvgr;
         next if    $$menuitem[4]   eq 'cst'
                 && !$canmodifyuser;
         next if    $$menuitem[4]   eq 'whn'
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.141 loncom/interface/mydesk.tab:1.142
--- loncom/interface/mydesk.tab:1.141	Fri Dec  3 22:00:28 2010
+++ loncom/interface/mydesk.tab	Thu Jan 13 19:43:12 2011
@@ -40,21 +40,20 @@
 #   possible conditions:
 #   - empty: 
 #   - showreturn: link is displayed if return link is wanted
-#   - mdcCommunity: user can modify course contents and course is of type Community
-#   - mdcCourse: user can modify course contents and course is a regular course
 #   - showgroups: user is member of a group
 #   - always: show this link even if user hasn't selected a role
 #   - whn: access what's new
 #   - cst: Grant/revoke role of Student:Grant/revoke role of Member 
 #   - opa: Set assessment parameters
+#   - nvgr: cannot view other people's grades 
 #   - author: authors (au, ca, aa)
 # prim:link:icon:alt:text:condition
 scnd:/adm/whatsnew:::What's New:whn
 scnd:/adm/navmaps?postdata=[url]&postsymb=[symb]:::Contents:
 scnd:/adm/createuser:::People:cst
 scnd:/adm/coursegroups:::Groups:showgroups
-scnd:/adm/coursedocs:::Course Editor:mdcCourse
-scnd:/adm/coursedocs:::Community Editor:mdcCommunity
+scnd:/adm/quickgrades:::Grades:nvgr
+scnd:/adm/grades:::Grades:vgr
 scnd:/adm/courseprefs:::Settings:opa
 scnd:/adm/roles:::Roles:
 scnd:/adm/flip?postdata=return%3a:::Return to Last Location:showreturn