--- loncom/interface/lonnavdisplay.pm	2009/09/08 20:56:47	1.13
+++ 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 2009/09/08 20:56:47 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='';
@@ -155,20 +155,35 @@ MENU
 
     # Header
     my $course_type = &Apache::loncommon::course_type();
-    my ($title,$breadcrumb_text);
-    if ($course_type eq 'Community') {
-        $title = 'Community Contents';
-        $breadcrumb_text = &mt('Community Contents');
+    my ($title,$breadcrumb_text,$start_page,$args);
+    $title = 'Contents';
+    $breadcrumb_text = &mt('Contents');
+    if ($env{'form.register'}) {
+        $args = {'force_register' => $env{'form.register'}};
+        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 {
-        $title = 'Course Contents';
-        $breadcrumb_text = &mt('Course Contents');
+        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,},
+                     ];
+        $args = {'bread_crumbs' => $brcrum,
+                 'only_body'    => $body_only};
+        $start_page = &Apache::loncommon::start_page($title,$js,$args);
     }
-    $r->print(&Apache::loncommon::start_page($title,
-                         $js,
-                         {'only_body'       => $body_only,
-                          'force_register'  => $env{'form.register'},
-                          'bread_crumbs'    => [{text => $breadcrumb_text }],}));
-    $r->print('<script type="text/javascript">window.focus();</script>');
+    $r->print($start_page.
+              '<script type="text/javascript">window.focus();</script>');
      
     $r->rflush();
 
@@ -268,8 +283,12 @@ MENU
                      ."</span>");
         }
     } else {
+        my $link = 'navmaps?jumpToFirstHomework';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
-					  'location.href="navmaps?jumpToFirstHomework"',
+					  'location.href="'.$link.'"',
 					  "Show my first due problem");
     }
 
@@ -285,33 +304,41 @@ MENU
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
+        my $link = 'navmaps?sort='.$env{'form.sort'};
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
-					  'location.href="navmaps?sort='.$env{'form.sort'}.'"',
+					  'location.href="'.$link.'"',
 					  "Show everything");
         $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
+        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'};
+        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
-					  'location.href="navmaps?sort='.$env{'form.sort'}.
-					  '&showOnlyHomework=1"',
+					  'location.href="'.$link.'"',
 					  "Show only uncompleted problems");
     }
 
     my %selected=($env{'form.sort'} => ' selected="selected"');
-    my $sort_html=("<form name=\"sortForm\">
-                 <span class=\"LC_nobreak\">
-                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
-                    ".&mt('Sort by:')."
-                    <select name=\"sort\" onChange=\"document.sortForm.submit()\">
-                       <option value=\"default\"$selected{'default'}>".&mt('Default')."</option>
-                       <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>
+    my $sort_html=('<form name="sortForm" action="">
+                 <span class="LC_nobreak">
+                    <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
+                    '.&mt('Sort by:').'
+                    <select name="sort" onchange="document.sortForm.submit()">
+                       <option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
+                       <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>
+                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>
-               </form>");
+               </form>');
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $env{'form.sort'},