--- loncom/interface/lonmenu.pm	2010/03/16 19:55:49	1.318
+++ 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.318 2010/03/16 19:55:49 droeschl 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()
 
@@ -194,6 +189,11 @@ sub primary_menu {
     my $menu;
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition)
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
+        $public = 1;
+    }
     foreach my $menuitem (@primary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)       ne 'ARRAY';    #
@@ -201,12 +201,12 @@ sub primary_menu {
                 && &Apache::lonmsg::mynewmail();       # whether a new msg 
         next if    $$menuitem[4]        eq 'newmsg'    # arrived or not
                 && !&Apache::lonmsg::mynewmail();      # 
-        next if    $$menuitem[4]        !~ /public/    ##we've a public user, 
-                && $env{'user.name'}    eq 'public'    ##who should not see all 
-                && $env{'user.domain'}  eq 'public';   ##links
+        next if    $$menuitem[4]        !~ /public/    ##we've a public user,
+                && $public;                            ##who should not see all
+                                                       ##links
         next if    $$menuitem[4]        eq 'onlypublic'# hide links which are 
-                && $env{'user.name'}    ne 'public'    # only visible to public
-                && $env{'user.domain'}  ne 'public';   # users
+                && !$public;                           # only visible to public
+                                                       # users
         next if    $$menuitem[4]        eq 'roles'     ##show links depending on
                 && &Apache::loncommon::show_course();  ##term 'Courses' or 
         next if    $$menuitem[4]        eq 'courses'   ##'Roles' wanted
@@ -309,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;
 
@@ -340,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  => '...',
@@ -565,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.=(<<ENDREALRES);
 s&6&3&catalog.png&catalog[_2]&info[_1]&catalog_info()&Show Metadata
@@ -623,9 +616,10 @@ ENDMENUITEMS
                      'tools', @inlineremote[63]);
             }
             
-
-            Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'advtools', @inlineremote[61,71,72,73,92]);
+            unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
+                Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'advtools', @inlineremote[61,71,72,73,92]);
+            }
         }
     }
 
@@ -696,7 +690,7 @@ sub switch {
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
-# Inline Remote
+# Inline Menu
     if ($nobreak==2) { return ''; }
     my $text=$top.' '.$bot;
     $text=~s/\s*\-\s*//gs;