--- loncom/interface/lonmenu.pm	2009/10/15 20:48:16	1.286
+++ loncom/interface/lonmenu.pm	2009/10/16 00:46:01	1.289
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.286 2009/10/15 20:48:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.289 2009/10/16 00:46:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -113,11 +113,6 @@ The javascript is usually similar to "go
 
 =item get_nav_status()
 
-=item convert_menu_function()
-
-FIXME this needs to move into mydesktab and the other locations 
-the text is generated
-
 =item hidden_button_check()
 
 =item roles_selector()
@@ -524,7 +519,7 @@ sub innerregister {
         $newmail= 'swmenu.setstatus("you have","messages");';
     } 
 
-    my $breadcrumb;
+    my ($breadcrumb,$separator);
     if ($noremote
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
@@ -534,10 +529,13 @@ sub innerregister {
 
         my $maptitle = &Apache::lonnet::gettitle($mapurl);
         my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        my @crumbs = ({text  => "Course Content", 
-                       href  => "Javascript:gonav('/adm/navmaps')"}, 
-                      {text  => '...',
-                       no_mt => 1});
+        my @crumbs = ({text  => "Course Contents", 
+                       href  => "Javascript:gonav('/adm/navmaps')"});
+
+        if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
+            push(@crumbs, {text  => '...',
+                           no_mt => 1});
+        }
 
         push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
                                                    && $maptitle ne 'default.sequence' 
@@ -548,6 +546,11 @@ sub innerregister {
         Apache::lonhtmlcommon::clear_breadcrumbs();
         Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
         $breadcrumb .= Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
+	unless (($env{'request.state'} eq 'edit') || ($newmail) ||
+		($env{'request.state'} eq 'construct') ||
+		($env{'form.register'})) {
+            $separator = &Apache::loncommon::head_subbox();
+        }
         #
     }
     if ($env{'request.state'} eq 'construct') {
@@ -836,6 +839,7 @@ $tablestart
 $inlinebuttons
 $tableend
 $newmail
+$separator
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -1322,9 +1326,6 @@ sub rawconfig {
         $prt=~s/\$requested_domain/$requested_domain/g;
         if ($category_names{$cat}!~/\w/) { $cat='oth'; }
         my $type = &Apache::loncommon::course_type();
-#        if ($type eq 'Group') {
-#            $desc = &convert_menu_function($desc,$type);
-#        }
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {