--- loncom/interface/lonmenu.pm 2010/03/17 19:35:56 1.319 +++ loncom/interface/lonmenu.pm 2010/03/25 17:38:43 1.322 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.319 2010/03/17 19:35:56 raeburn Exp $ +# $Id: lonmenu.pm,v 1.322 2010/03/25 17:38:43 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -109,14 +109,9 @@ Same as primary_menu() but operates on @ =item show_return_link() -=item registerurl() - -This gets called in the header section - =item innerregister() -This gets called in order to register a URL, both with the Remote -and in the body of the document +This gets called in order to register a URL in the body of the document =item clear() @@ -314,15 +309,8 @@ sub show_return_link { )); } - -sub registerurl { - if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - return Apache::lonxml::display_title(); -} - sub innerregister { - my ($forcereg,$titletable,$bread_crumbs) = @_; - my ($uname,$thisdisfn); + my ($forcereg,$bread_crumbs) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -345,7 +333,7 @@ sub innerregister { # my @crumbs = ({text => Apache::loncommon::course_type() . ' Contents', - href => "Javascript:gonav('/adm/navmaps')"}); + href => "Javascript:gopost('/adm/navmaps','')"}); if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { push(@crumbs, {text => '...', @@ -570,7 +558,7 @@ if(length($annotation) > 0){ $menuitems.="&anno-[_1]&tations[_1]&annotate()&"; $menuitems.="Make notes and annotations about this resource&&1\n"; - unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { + unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist)(\?|$)/) { if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) { $menuitems.=(<