--- loncom/interface/lonnavdisplay.pm	2010/12/30 21:36:50	1.13.4.4
+++ loncom/interface/lonnavdisplay.pm	2010/12/05 21:59:28	1.13.6.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavdisplay.pm,v 1.13.4.4 2010/12/30 21:36:50 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.13.6.4 2010/12/05 21:59:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,7 +139,7 @@ MENU
     $r->send_http_header;
 
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
     
 # ----------------------------------------------------- Force menu registration
     my $body_only='';
@@ -156,34 +156,35 @@ MENU
     # Header
     my $course_type = &Apache::loncommon::course_type();
     my ($title,$breadcrumb_text,$start_page,$args);
-    if ($course_type eq 'Community') {
-        $title = 'Community Contents';
-        $breadcrumb_text = &mt('Community Contents');
-    } else {
-        $title = 'Course Contents';
-        $breadcrumb_text = &mt('Course Contents');
-    }
+    $title = 'Contents';
+    $breadcrumb_text = &mt('Contents');
     if ($env{'form.register'}) {
         $args = {'force_register' => $env{'form.register'}};
-        if ($body_only && $env{'environment.remote'} eq 'on') {
-            $args->{only_body} = 1;
-        }
+        my $brcrum = [{href    => '/adm/navmaps',
+                       text    => $breadcrumb_text,
+                       no_mt   => 1,},
+                     ];
+        $args = {'bread_crumbs' => $brcrum,
+                 'only_body'    => $body_only};
         $start_page = &Apache::loncommon::start_page($title,$js,$args);
     } else {
-        my $brcrum = [{href => '/adm/navmaps',
-                       text => $breadcrumb_text,
-                       no_mt => 1},
+        my $nomenu = 0;
+        if ((&Apache::loncommon::needs_gci_custom()) || 
+            ($env{'user.domain'} =~ /^\w+citest$/ && $env{'request.course.id'})) {
+            $nomenu = 1;
+        }
+        my $brcrum = [{href    => '/adm/navmaps',
+                       text    => $breadcrumb_text,
+                       no_mt   => 1,
+                       _nomenu => $nomenu,},
                      ];
-        unless ($env{'environment.remotenavmap'} eq 'on') {
-            $args = {'bread_crumbs' => $brcrum};
-        }
-        if ($body_only && $env{'environment.remote'} eq 'on') {
-            $args->{only_body} = 1;
-        }
+        $args = {'bread_crumbs' => $brcrum,
+                 'only_body'    => $body_only};
         $start_page = &Apache::loncommon::start_page($title,$js,$args);
     }
     $r->print($start_page.
               '<script type="text/javascript">window.focus();</script>');
+     
     $r->rflush();
 
     # Check that it's defined
@@ -284,7 +285,7 @@ MENU
     } else {
         my $link = 'navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'}; 
+            $link .= '&amp;register='.$env{'form.register'};
         }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
 					  'location.href="'.$link.'"',
@@ -334,7 +335,7 @@ MENU
                        <option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
                        <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>
                        <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
-                     </select>
+                    </select>
                     <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>
                </form>');