--- loncom/interface/loncommon.pm	2010/10/04 18:01:31	1.925.2.14
+++ loncom/interface/loncommon.pm	2010/11/30 06:28:17	1.925.2.19
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.14 2010/10/04 18:01:31 raeburn Exp $
+# $Id: loncommon.pm,v 1.925.2.19 2010/11/30 06:28:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4463,6 +4463,11 @@ sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+        $public = 1;
+    }
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
 
     $function = &get_users_function() if (!$function);
@@ -4491,16 +4496,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);
@@ -4524,7 +4533,7 @@ sub bodytag {
     } 
 
     my $name = &plainname($env{'user.name'},$env{'user.domain'});
-    if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+    if ($public) {
 	undef($role);
     } else {
 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
@@ -4545,7 +4554,7 @@ sub bodytag {
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
-    if ($env{'environment.remote'} eq 'off') {
+    if ($env{'environment.remote'} ne 'on') {
         # No Remote
         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
             return $bodytag; 
@@ -4558,7 +4567,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 +4583,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 +4638,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(
@@ -4646,11 +4663,11 @@ ENDSCRIPT
         }
 
         #don't show menus for public users
-        if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
+        if(!$public){
             if (($custommenu) && 
                 ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
                 $bodytag .= &Apache::lonmenu::gci_secondary_menu();
-            } else { 
+            } elsif ($env{'request.role'} ne 'cm' || &check_for_gci_dc()) {    
                 $bodytag .= Apache::lonmenu::secondary_menu();
             }
             $bodytag .= Apache::lonmenu::serverform();
@@ -4662,8 +4679,19 @@ 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') {
+                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') ||
+                    ($env{'request.noversionuri'} eq '/adm/statistics')) {
+
                     my @advtools = &concept_test_manager();
+                    &Apache::lonhtmlcommon::clear_breadcrumbs();
                     &Apache::lonhtmlcommon::add_breadcrumb_tool(
                                       'advtools',@advtools);
                     my $advlinks;
@@ -6158,6 +6186,11 @@ ol.LC_primary_menu {
   margin: 0.2em 0 0 0;
 }
 
+span.LC_new_message{
+  font-weight:bold;
+  color: darkred;
+}
+
 ol#LC_PathBreadcrumbs {
   margin: 0;
 }
@@ -6541,6 +6574,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/navtomenu.png);
+}
+
 ul#LC_toolbar li a:hover {
   background-position: bottom center;
 }
@@ -6615,7 +6652,7 @@ ul.LC_funclist li {
 }
 #gciheader ul {
   margin:0;
-  padding:10px 5px 0;
+  padding:10px 10px 0;
   list-style:none;
 }
 #gciheader li {
@@ -6930,8 +6967,10 @@ sub start_page {
 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
 		if(exists($args->{'bread_crumbs_component'})){
 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
-		} else {
-                	$result .= &Apache::lonhtmlcommon::breadcrumbs(); 
+		} elsif (exists($args->{'bread_crumbs_menulink'})) {
+			$result .= &Apache::lonhtmlcommon::breadcrumbs('','',$args->{'bread_crumbs_menulink'});
+                } else {
+			$result .= &Apache::lonhtmlcommon::breadcrumbs(); 
 		}
     }
     return $result;
@@ -11027,7 +11066,7 @@ sub existing_gcitest_courses {
         } else {
             next;
         }
-        my ($tstart,$tend) = split('.',$env{$envkey});
+        my ($tstart,$tend) = split(/\./,$env{$envkey});
         if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) {
             my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'};
             if ($descr ne '') {