--- loncom/interface/loncommon.pm	2010/10/11 16:00:57	1.925.2.16
+++ loncom/interface/loncommon.pm	2010/11/09 00:08:06	1.925.2.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.16 2010/10/11 16:00:57 raeburn Exp $
+# $Id: loncommon.pm,v 1.925.2.17 2010/11/09 00:08:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4491,16 +4491,20 @@ sub bodytag {
 # realm
     if ($env{'request.course.id'}) {
         if ($env{'request.role'} !~ /^cr/) {
-            if (($custommenu) && ($role eq 'cm')) {
+            if (($custommenu) && (($role eq 'cm') || ($env{'form.context'} eq 'requestcrs'))) {
                 undef($role);
             } else {
                 $role = &Apache::lonnet::plaintext($role,&course_type());
             }
         }
-        if ($env{'request.course.sec'}) {
+        if (defined($role) && $env{'request.course.sec'}) {
             $role .= (' 'x2).'- '.&mt('section:').' '.$env{'request.course.sec'};
-        }   
-	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+        }
+        if ($env{'form.context'} eq 'requestcrs') {
+            undef($realm);
+        } else {
+	    $realm = $env{'course.'.$env{'request.course.id'}.'.description'};
+        }
     } else {
         if (($custommenu) && ($role eq 'cm')) {
             undef($role);
@@ -4558,7 +4562,8 @@ sub bodytag {
         #    }
 
         my $role_selector;
-        if (($custommenu) && ($env{'request.course.id'}) && 
+        if (($custommenu) && !($env{'form.context'} eq 'requestcrs') && 
+            ($env{'request.course.id'}) && 
             ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest')) {
             $role_selector = &Apache::lonmenu::roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
@@ -4573,7 +4578,9 @@ sub bodytag {
                            gci_1H96711d710194bfegcil1 => 'submit',
                            gci_5422913620b814c90gcil1 => 'tutorial',
                          );
-        if (($custommenu && $cid && !$gcicourses{$cid}) || ($env{'user.domain'} eq 'gcitest')) {
+        if (($custommenu && $cid && !$gcicourses{$cid}) && 
+             !($env{'form.context'} eq 'requestcrs') ||
+             ($env{'user.domain'} eq 'gcitest')) {
             my $role = 'st';
             if ($custommenu) {
                 $role = 'cc';
@@ -4626,10 +4633,15 @@ ENDSCRIPT
                 <em>$realm</em> $dc_info</div>|;
             return $bodytag;
         }
+        if ($env{'request.noversionuri'} eq '/adm/navmaps' &&
+                $env{'environment.remotenavmap'} eq 'on') {
+            return $bodytag;
+        }
 
         if ($cid && $gcicourses{$cid} eq 'tutorial') {
             $bodytag .= '<div class="LC_page_header">';
-        } 
+        }
+ 
         $bodytag .= qq|<div id="LC_nav_bar">$name $role $role_selector</div>|;
 
         $bodytag .= Apache::lonhtmlcommon::scripttag(
@@ -4662,9 +4674,12 @@ ENDSCRIPT
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
             } elsif ($custommenu && $env{'request.course.id'} && 
                      &Apache::lonnet::allowed('mdc', $env{'request.course.id'})) {
-                if (($env{'request.noversionuri'} eq '/adm/navmaps') ||
-                    ($env{'request.noversionuri'} eq '/adm/coursedocs') ||
-                    ($env{'request.noversionuri'} eq '/adm/createuser') ||
+                if ((($env{'request.noversionuri'} eq '/adm/navmaps') && 
+                    ($env{'request.noversionuri'} ne 'on')) ||
+                    (($env{'request.noversionuri'} eq '/adm/coursedocs') &&
+                     (!($env{'form.context'} eq 'requestcrs'))) ||
+                    (($env{'request.noversionuri'} eq '/adm/createuser') &&
+                     (!($env{'form.context'} eq 'requestcrs'))) ||
                     ($env{'request.noversionuri'} eq '/adm/whatsnew') ||
                     ($env{'request.noversionuri'} eq '/cgi-bin/printout.pl') ||
                     ($env{'request.noversionuri'} eq '/adm/printout') ||
@@ -6554,6 +6569,10 @@ a#LC_content_toolbar_changefolder_toggle
   background-image:url(/res/adm/pages/open-all-folders.gif);
 }
 
+a#LC_content_toolbar_management {
+  background-image:url(/res/adm/pages/conf.png);
+}
+
 ul#LC_toolbar li a:hover {
   background-position: bottom center;
 }
@@ -6944,9 +6963,9 @@ sub start_page {
 		if(exists($args->{'bread_crumbs_component'})){
 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
 		} elsif (exists($args->{'bread_crumbs_menulink'})) {
-                	$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$args->{'bread_crumbs_menulink'});
+			$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$args->{'bread_crumbs_menulink'});
                 } else {
-                	$result .= &Apache::lonhtmlcommon::breadcrumbs(); 
+			$result .= &Apache::lonhtmlcommon::breadcrumbs(); 
 		}
     }
     return $result;