--- loncom/interface/lonmenu.pm	2010/03/29 00:53:52	1.323
+++ loncom/interface/lonmenu.pm	2010/04/12 15:05:45	1.325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.323 2010/03/29 00:53:52 raeburn Exp $
+# $Id: lonmenu.pm,v 1.325 2010/04/12 15:05:45 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,7 +177,7 @@ sub prep_menuitem {
     return '<li><a' 
            # highlighting for new messages
            . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') 
-           . qq| href="$$menuitem[0]">$link</a></li>|;
+           . qq| href="$$menuitem[0]" target="_top">$link</a></li>|;
 }
 
 # primary_menu() evaluates @primary_menu and returns XHTML for the menu
@@ -216,11 +216,11 @@ sub primary_menu {
         if ($$menuitem[3] eq 'Help') { # special treatment for helplink
             $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
         } else {
-            my @items = @{$menuitem};
-            $items[0] = 'javascript:'.$menuitem->[0].';';
-            $menu .= &prep_menuitem(\@items);
+            $menu .= prep_menuitem($menuitem);
         }
     }
+    $menu =~ s/\[domain\]/$env{'user.domain'}/g;
+    $menu =~ s/\[user\]/$env{'user.name'}/g;
 
     return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";
 }
@@ -336,10 +336,13 @@ sub innerregister {
 #SD
 #course_type only Course and Community?
 #
-        my @crumbs = ({text  => Apache::loncommon::course_type() 
+        my @crumbs;
+        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
+                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+            @crumbs = ({text  => Apache::loncommon::course_type() 
                                 . ' Contents', 
-                       href  => "Javascript:gopost('/adm/navmaps','')"});
-
+                        href  => "Javascript:gopost('/adm/navmaps','')"});
+        }
         if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
             push(@crumbs, {text  => '...',
                            no_mt => 1});
@@ -671,10 +674,6 @@ sub edit_course_upload {
 
 # ================================================================== Raw Config
 
-#SD
-#this is called by
-#lonmenu
-#
 sub clear {
     my ($row,$col)=@_;
     $inlineremote[10*$row+$col]='';
@@ -1065,12 +1064,6 @@ function go(url) {
    }
 }
 
-function gotop(url) {
-    if (url!='' && url!= null) {
-        top.location.href = url;
-    }
-}
-
 function gopost(url,postdata) {
    if (url!='') {
       this.document.server.action=url;