--- loncom/interface/lonmenu.pm 2013/05/06 15:02:49 1.413 +++ loncom/interface/lonmenu.pm 2013/05/09 05:24:36 1.414 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.413 2013/05/06 15:02:49 raeburn Exp $ +# $Id: lonmenu.pm,v 1.414 2013/05/09 05:24:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -333,12 +333,17 @@ sub secondary_menu { $showsyllabus = 1; $showfeeds = 1; } else { - unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum",'syllabus')) { - $showsyllabus = 1; + 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'}) || + ($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) || + ($env{'request.course.syllabustime'})) { + $showsyllabus = 1; + } + } + if ($env{'request.course.feeds'}) { + $showfeeds = 1; } - if ($env{'course.'.$env{'request.course.id'}.'.feeds'}) { - $showfeeds = 1; - } } } @@ -403,6 +408,17 @@ sub secondary_menu { ); $menu .= $switcher; } else { + if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) { + my $url = $$menuitem[0]; + $url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum}; + if (&Apache::lonnet::is_on_map($url)) { + unless ($$menuitem[0] =~ /\?register=1/) { + $$menuitem[0] .= '?register=1'; + } + } else { + $$menuitem[0] =~ s{\?register=1}{}; + } + } $menu .= &prep_menuitem(\@$menuitem); } }