--- loncom/interface/lonmenu.pm 2013/05/12 17:51:47 1.369.2.40 +++ loncom/interface/lonmenu.pm 2013/05/13 20:37:58 1.369.2.41 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.40 2013/05/12 17:51:47 raeburn Exp $ +# $Id: lonmenu.pm,v 1.369.2.41 2013/05/13 20:37:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -349,10 +349,7 @@ sub secondary_menu { if ($env{'request.course.id'}) { $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - if ($canedit) { - $showsyllabus = 1; - $showfeeds = 1; - } else { + unless ($canedit) { unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) { if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) || ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) || @@ -440,12 +437,13 @@ sub secondary_menu { next if ($item->[2] eq 'cst' && !$canmodifyuser); next if ($item->[2] eq 'mgr' && !$canmgr); next if ($item->[2] eq 'vcg' && !$canviewgrps); + next if ($item->[2] eq 'mdc' && !$canedit); push(@scndsub,$item); } } if (@scndsub > 0) { $menu .= &create_submenu($link,$target,$title,\@scndsub); - } elsif ($link) { + } elsif ($link ne '#') { $menu .= '
  • '.&mt($title).'
  • '; } } @@ -492,7 +490,7 @@ sub secondary_menu { } $menu =~ s/\[uname\]/$$author{user}/g; $menu =~ s/\[udom\]/$$author{dom}/g; - if ($showsyllabus || $showfeeds) { + if ($env{'request.course.id'}) { $menu =~ s/\[cnum\]/$cnum/g; $menu =~ s/\[cdom\]/$cdom/g; }